From f561120295d392678a19d5a8a578da272a082bc0 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 7 Jan 2023 23:40:02 +0100
Subject: [PATCH 0001/2100] Remove info labels, since they are no longer
 present in this component in thew new design

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 356 ++++++++++++++++++
 1 file changed, 356 insertions(+)
 create mode 100644 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
new file mode 100644
index 0000000000..4d1a2133fd
--- /dev/null
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -0,0 +1,356 @@
+// Copyright (c) ppy Pty Ltd <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;
+using osuTK;
+using osuTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Select
+{
+    public partial class BeatmapInfoWedgeV2 : VisibilityContainer
+    {
+        public const float BORDER_THICKNESS = 2.5f;
+        private const float shear_width = 36.75f;
+
+        private const float transition_duration = 250;
+
+        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGE_HEIGHT, 0);
+
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
+        protected Container DisplayedContent { get; private set; }
+
+        protected WedgeInfoText Info { get; private set; }
+
+        public BeatmapInfoWedgeV2()
+        {
+            Shear = wedged_container_shear;
+            Masking = true;
+            BorderColour = new Color4(221, 255, 255, 255);
+            BorderThickness = BORDER_THICKNESS;
+            Alpha = 0;
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = new Color4(130, 204, 255, 150),
+                Radius = 20,
+                Roundness = 15,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            ruleset.BindValueChanged(_ => updateDisplay());
+        }
+
+        private const double animation_duration = 800;
+
+        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);
+        }
+
+        private WorkingBeatmap beatmap;
+
+        public WorkingBeatmap Beatmap
+        {
+            get => beatmap;
+            set
+            {
+                if (beatmap == value) return;
+
+                beatmap = value;
+
+                updateDisplay();
+            }
+        }
+
+        public override bool IsPresent => base.IsPresent || DisplayedContent == null; // Visibility is updated in the LoadComponentAsync callback
+
+        private Container loadingInfo;
+
+        private void updateDisplay()
+        {
+            Scheduler.AddOnce(perform);
+
+            void perform()
+            {
+                void removeOldInfo()
+                {
+                    State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
+
+                    DisplayedContent?.FadeOut(transition_duration);
+                    DisplayedContent?.Expire();
+                    DisplayedContent = null;
+                }
+
+                if (beatmap == null)
+                {
+                    removeOldInfo();
+                    return;
+                }
+
+                LoadComponentAsync(loadingInfo = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Shear = -Shear,
+                    Depth = DisplayedContent?.Depth + 1 ?? 0,
+                    Children = new Drawable[]
+                    {
+                        new BeatmapInfoWedgeBackground(beatmap),
+                        Info = new WedgeInfoText(beatmap),
+                    }
+                }, loaded =>
+                {
+                    // ensure we are the most recent loaded wedge.
+                    if (loaded != loadingInfo) return;
+
+                    removeOldInfo();
+                    Add(DisplayedContent = loaded);
+                });
+            }
+        }
+
+        public partial class WedgeInfoText : Container
+        {
+            public OsuSpriteText VersionLabel { get; private set; }
+            public OsuSpriteText TitleLabel { get; private set; }
+            public OsuSpriteText ArtistLabel { get; private set; }
+            public FillFlowContainer MapperContainer { get; private set; }
+
+            private Container difficultyColourBar;
+            private StarRatingDisplay starRatingDisplay;
+
+            private ILocalisedBindableString titleBinding;
+            private ILocalisedBindableString artistBinding;
+
+            private readonly WorkingBeatmap working;
+
+            [Resolved]
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+
+            [Resolved]
+            private BeatmapDifficultyCache difficultyCache { get; set; }
+
+            [Resolved]
+            private OsuColour colours { get; set; }
+
+            private ModSettingChangeTracker settingChangeTracker;
+
+            public WedgeInfoText(WorkingBeatmap working)
+            {
+                this.working = working;
+            }
+
+            private CancellationTokenSource cancellationSource;
+            private IBindable<StarDifficulty?> starDifficulty;
+
+            [BackgroundDependencyLoader]
+            private void load(LocalisationManager localisation)
+            {
+                var beatmapInfo = working.BeatmapInfo;
+                var metadata = beatmapInfo.Metadata;
+
+                RelativeSizeAxes = Axes.Both;
+
+                titleBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
+                artistBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
+
+                const float top_height = 0.7f;
+
+                Children = new Drawable[]
+                {
+                    difficultyColourBar = new Container
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 20f,
+                        Children = new[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Width = top_height,
+                            },
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RelativePositionAxes = Axes.Both,
+                                Alpha = 0.5f,
+                                X = top_height,
+                                Width = 1 - top_height,
+                            }
+                        }
+                    },
+                    new FillFlowContainer
+                    {
+                        Name = "Topleft-aligned metadata",
+                        Anchor = Anchor.TopLeft,
+                        Origin = Anchor.TopLeft,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding { Top = 10, Left = 25, Right = shear_width * 2.5f },
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Children = new Drawable[]
+                        {
+                            VersionLabel = new OsuSpriteText
+                            {
+                                Text = beatmapInfo.DifficultyName,
+                                Font = OsuFont.GetFont(size: 24, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                                Truncate = true,
+                            },
+                        }
+                    },
+                    new FillFlowContainer
+                    {
+                        Name = "Topright-aligned metadata",
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
+                        AutoSizeAxes = Axes.Both,
+                        Shear = wedged_container_shear,
+                        Spacing = new Vector2(0f, 5f),
+                        Children = new Drawable[]
+                        {
+                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                Alpha = 0f,
+                            },
+                            new BeatmapSetOnlineStatusPill
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                TextSize = 11,
+                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
+                                Status = beatmapInfo.Status,
+                                Alpha = string.IsNullOrEmpty(beatmapInfo.DifficultyName) ? 0 : 1
+                            }
+                        }
+                    },
+                    new FillFlowContainer
+                    {
+                        Name = "Centre-aligned metadata",
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.TopLeft,
+                        Y = -7,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding { Left = 25, Right = shear_width },
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Children = new Drawable[]
+                        {
+                            TitleLabel = new OsuSpriteText
+                            {
+                                Current = { BindTarget = titleBinding },
+                                Font = OsuFont.GetFont(size: 28, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                                Truncate = true,
+                            },
+                            ArtistLabel = new OsuSpriteText
+                            {
+                                Current = { BindTarget = artistBinding },
+                                Font = OsuFont.GetFont(size: 17, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                                Truncate = true,
+                            },
+                            MapperContainer = new FillFlowContainer
+                            {
+                                Margin = new MarginPadding { Top = 10 },
+                                Direction = FillDirection.Horizontal,
+                                AutoSizeAxes = Axes.Both,
+                                Child = getMapper(metadata),
+                            }
+                        }
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                starRatingDisplay.DisplayedStars.BindValueChanged(s =>
+                {
+                    difficultyColourBar.Colour = colours.ForStarDifficulty(s.NewValue);
+                }, true);
+
+                starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+                starDifficulty.BindValueChanged(s =>
+                {
+                    starRatingDisplay.Current.Value = s.NewValue ?? default;
+
+                    // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
+                    if (!starRatingDisplay.IsPresent)
+                        starRatingDisplay.FinishTransforms(true);
+
+                    starRatingDisplay.FadeIn(transition_duration);
+                });
+
+                mods.BindValueChanged(m =>
+                {
+                    settingChangeTracker?.Dispose();
+
+                    settingChangeTracker = new ModSettingChangeTracker(m.NewValue);
+                }, true);
+            }
+
+            private Drawable getMapper(BeatmapMetadata metadata)
+            {
+                if (string.IsNullOrEmpty(metadata.Author.Username))
+                    return Empty();
+
+                return new LinkFlowContainer(s =>
+                {
+                    s.Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 15);
+                }).With(d =>
+                {
+                    d.AutoSizeAxes = Axes.Both;
+                    d.AddText("mapped by ");
+                    d.AddUserLink(metadata.Author);
+                });
+            }
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                settingChangeTracker?.Dispose();
+                cancellationSource?.Cancel();
+            }
+        }
+    }
+}

From c646f8479b35cc7d66b1075ad5c5ba8ab46434ad Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 7 Jan 2023 23:53:19 +0100
Subject: [PATCH 0002/2100] Move stardifficulty logic to main BeatmapInfoWedge
 class instead of text subclass ( for use by background star rating colour bar
 )

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 4d1a2133fd..104fa8787b 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -37,10 +37,16 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
+        [Resolved]
+        private BeatmapDifficultyCache difficultyCache { get; set; }
+
         protected Container DisplayedContent { get; private set; }
 
         protected WedgeInfoText Info { get; private set; }
 
+        private IBindable<StarDifficulty?> starDifficulty;
+        private CancellationTokenSource cancellationSource;
+
         public BeatmapInfoWedgeV2()
         {
             Shear = wedged_container_shear;
@@ -98,6 +104,19 @@ namespace osu.Game.Screens.Select
 
         private Container loadingInfo;
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            cancellationSource?.Cancel();
+        }
+
         private void updateDisplay()
         {
             Scheduler.AddOnce(perform);
@@ -127,7 +146,7 @@ namespace osu.Game.Screens.Select
                     Children = new Drawable[]
                     {
                         new BeatmapInfoWedgeBackground(beatmap),
-                        Info = new WedgeInfoText(beatmap),
+                        Info = new WedgeInfoText(beatmap, starDifficulty),
                     }
                 }, loaded =>
                 {
@@ -154,26 +173,22 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString artistBinding;
 
             private readonly WorkingBeatmap working;
+            private readonly IBindable<StarDifficulty?> starDifficulty;
 
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
-            [Resolved]
-            private BeatmapDifficultyCache difficultyCache { get; set; }
-
             [Resolved]
             private OsuColour colours { get; set; }
 
             private ModSettingChangeTracker settingChangeTracker;
 
-            public WedgeInfoText(WorkingBeatmap working)
+            public WedgeInfoText(WorkingBeatmap working, IBindable<StarDifficulty?> starDifficulty)
             {
                 this.working = working;
+                this.starDifficulty = starDifficulty;
             }
 
-            private CancellationTokenSource cancellationSource;
-            private IBindable<StarDifficulty?> starDifficulty;
-
             [BackgroundDependencyLoader]
             private void load(LocalisationManager localisation)
             {
@@ -309,7 +324,6 @@ namespace osu.Game.Screens.Select
                     difficultyColourBar.Colour = colours.ForStarDifficulty(s.NewValue);
                 }, true);
 
-                starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
@@ -349,7 +363,6 @@ namespace osu.Game.Screens.Select
             {
                 base.Dispose(isDisposing);
                 settingChangeTracker?.Dispose();
-                cancellationSource?.Cancel();
             }
         }
     }

From 0199c19f74705c2d5c0dd10f3c61c0c8325ef224 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 8 Jan 2023 01:24:47 +0100
Subject: [PATCH 0003/2100] Add a test scene and move colour bar to back and
 adjust positioning of it

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 187 ++++++++++++++++++
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 131 +++---------
 2 files changed, 217 insertions(+), 101 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
new file mode 100644
index 0000000000..98e9d803ca
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -0,0 +1,187 @@
+// Copyright (c) ppy Pty Ltd <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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Screens.Select;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    [TestFixture]
+    public partial class TestSceneBeatmapInfoWedgeV2 : OsuTestScene
+    {
+        private RulesetStore rulesets;
+        private TestBeatmapInfoWedgeV2 infoWedge;
+        private readonly List<IBeatmap> beatmaps = new List<IBeatmap>();
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            this.rulesets = rulesets;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Add(infoWedge = new TestBeatmapInfoWedgeV2
+            {
+                Size = new Vector2(0.6f, 120),
+                RelativeSizeAxes = Axes.X,
+                Margin = new MarginPadding { Top = 20 }
+            });
+
+            AddStep("show", () => infoWedge.Show());
+
+            selectBeatmap(Beatmap.Value.Beatmap);
+
+            AddWaitStep("wait for select", 3);
+
+            AddStep("hide", () => { infoWedge.Hide(); });
+
+            AddWaitStep("wait for hide", 3);
+
+            AddStep("show", () => { infoWedge.Show(); });
+
+            AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
+            {
+                foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
+                    hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
+            });
+
+            foreach (var rulesetInfo in rulesets.AvailableRulesets)
+            {
+                var instance = rulesetInfo.CreateInstance();
+                var testBeatmap = createTestBeatmap(rulesetInfo);
+
+                beatmaps.Add(testBeatmap);
+
+                setRuleset(rulesetInfo);
+
+                selectBeatmap(testBeatmap);
+
+                testBeatmapLabels(instance);
+            }
+        }
+
+        private void testBeatmapLabels(Ruleset ruleset)
+        {
+            AddAssert("check title", () => infoWedge.Info.TitleLabel.Current.Value == $"{ruleset.ShortName}Title");
+            AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist");
+        }
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("reset mods", () => SelectedMods.SetDefault());
+        }
+
+        [Test]
+        public void TestTruncation()
+        {
+            selectBeatmap(createLongMetadata());
+        }
+
+        private void setRuleset(RulesetInfo rulesetInfo)
+        {
+            Container containerBefore = null;
+
+            AddStep("set ruleset", () =>
+            {
+                // wedge content is only refreshed if the ruleset changes, so only wait for load in that case.
+                if (!rulesetInfo.Equals(Ruleset.Value))
+                    containerBefore = infoWedge.DisplayedContent;
+
+                Ruleset.Value = rulesetInfo;
+            });
+
+            AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);
+        }
+
+        private void selectBeatmap([CanBeNull] IBeatmap b)
+        {
+            Container containerBefore = null;
+
+            AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
+            {
+                containerBefore = infoWedge.DisplayedContent;
+                infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
+            });
+
+            AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);
+        }
+
+        private IBeatmap createTestBeatmap(RulesetInfo ruleset)
+        {
+            List<HitObject> objects = new List<HitObject>();
+            for (double i = 0; i < 50000; i += 1000)
+                objects.Add(new TestHitObject { StartTime = i });
+
+            return new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Author = { Username = $"{ruleset.ShortName}Author" },
+                        Artist = $"{ruleset.ShortName}Artist",
+                        Source = $"{ruleset.ShortName}Source",
+                        Title = $"{ruleset.ShortName}Title"
+                    },
+                    Ruleset = ruleset,
+                    StarRating = 6,
+                    DifficultyName = $"{ruleset.ShortName}Version",
+                    Difficulty = new BeatmapDifficulty()
+                },
+                HitObjects = objects
+            };
+        }
+
+        private IBeatmap createLongMetadata()
+        {
+            return new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Author = { Username = "WWWWWWWWWWWWWWW" },
+                        Artist = "Verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Artist",
+                        Source = "Verrrrry long Source",
+                        Title = "Verrrrry long Title"
+                    },
+                    DifficultyName = "Verrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Version",
+                    Status = BeatmapOnlineStatus.Graveyard,
+                },
+            };
+        }
+
+        private partial class TestBeatmapInfoWedgeV2 : BeatmapInfoWedgeV2
+        {
+            public new Container DisplayedContent => base.DisplayedContent;
+
+            public new WedgeInfoText Info => base.Info;
+        }
+
+        private class TestHitObject : ConvertHitObject, IHasPosition
+        {
+            public float X => 0;
+            public float Y => 0;
+            public Vector2 Position { get; } = Vector2.Zero;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 104fa8787b..5583ad11f7 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using osuTK;
-using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -16,18 +15,16 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select
 {
+    [Cached]
     public partial class BeatmapInfoWedgeV2 : VisibilityContainer
     {
-        public const float BORDER_THICKNESS = 2.5f;
         private const float shear_width = 36.75f;
 
         private const float transition_duration = 250;
@@ -44,22 +41,25 @@ namespace osu.Game.Screens.Select
 
         protected WedgeInfoText Info { get; private set; }
 
-        private IBindable<StarDifficulty?> starDifficulty;
+        private IBindable<StarDifficulty?> starDifficulty = new Bindable<StarDifficulty?>();
         private CancellationTokenSource cancellationSource;
 
+        private readonly Container difficultyColourBar;
+
         public BeatmapInfoWedgeV2()
         {
+            CornerRadius = 10;
             Shear = wedged_container_shear;
             Masking = true;
-            BorderColour = new Color4(221, 255, 255, 255);
-            BorderThickness = BORDER_THICKNESS;
             Alpha = 0;
-            EdgeEffect = new EdgeEffectParameters
+            Child = difficultyColourBar = new Container
             {
-                Type = EdgeEffectType.Glow,
-                Colour = new Color4(130, 204, 255, 150),
-                Radius = 20,
-                Roundness = 15,
+                Depth = float.MaxValue,
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                RelativeSizeAxes = Axes.Y,
+                Width = 40,
+                Child = new Box { RelativeSizeAxes = Axes.Both }
             };
         }
 
@@ -95,6 +95,7 @@ namespace osu.Game.Screens.Select
                 if (beatmap == value) return;
 
                 beatmap = value;
+                starDifficulty = difficultyCache.GetBindableDifficulty(value.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
 
                 updateDisplay();
             }
@@ -104,12 +105,6 @@ namespace osu.Game.Screens.Select
 
         private Container loadingInfo;
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -140,13 +135,15 @@ namespace osu.Game.Screens.Select
 
                 LoadComponentAsync(loadingInfo = new Container
                 {
+                    Masking = true,
+                    X = -30,
+                    CornerRadius = 10,
                     RelativeSizeAxes = Axes.Both,
-                    Shear = -Shear,
                     Depth = DisplayedContent?.Depth + 1 ?? 0,
                     Children = new Drawable[]
                     {
-                        new BeatmapInfoWedgeBackground(beatmap),
-                        Info = new WedgeInfoText(beatmap, starDifficulty),
+                        new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
+                        Info = new WedgeInfoText(beatmap, starDifficulty) { Shear = -Shear }
                     }
                 }, loaded =>
                 {
@@ -161,12 +158,9 @@ namespace osu.Game.Screens.Select
 
         public partial class WedgeInfoText : Container
         {
-            public OsuSpriteText VersionLabel { get; private set; }
             public OsuSpriteText TitleLabel { get; private set; }
             public OsuSpriteText ArtistLabel { get; private set; }
-            public FillFlowContainer MapperContainer { get; private set; }
 
-            private Container difficultyColourBar;
             private StarRatingDisplay starRatingDisplay;
 
             private ILocalisedBindableString titleBinding;
@@ -178,6 +172,9 @@ namespace osu.Game.Screens.Select
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
+            [Resolved]
+            private BeatmapInfoWedgeV2 wedge { get; set; }
+
             [Resolved]
             private OsuColour colours { get; set; }
 
@@ -200,51 +197,8 @@ namespace osu.Game.Screens.Select
                 titleBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
                 artistBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
 
-                const float top_height = 0.7f;
-
                 Children = new Drawable[]
                 {
-                    difficultyColourBar = new Container
-                    {
-                        RelativeSizeAxes = Axes.Y,
-                        Width = 20f,
-                        Children = new[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Width = top_height,
-                            },
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                RelativePositionAxes = Axes.Both,
-                                Alpha = 0.5f,
-                                X = top_height,
-                                Width = 1 - top_height,
-                            }
-                        }
-                    },
-                    new FillFlowContainer
-                    {
-                        Name = "Topleft-aligned metadata",
-                        Anchor = Anchor.TopLeft,
-                        Origin = Anchor.TopLeft,
-                        Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Top = 10, Left = 25, Right = shear_width * 2.5f },
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Children = new Drawable[]
-                        {
-                            VersionLabel = new OsuSpriteText
-                            {
-                                Text = beatmapInfo.DifficultyName,
-                                Font = OsuFont.GetFont(size: 24, italics: true),
-                                RelativeSizeAxes = Axes.X,
-                                Truncate = true,
-                            },
-                        }
-                    },
                     new FillFlowContainer
                     {
                         Name = "Topright-aligned metadata",
@@ -279,12 +233,10 @@ namespace osu.Game.Screens.Select
                     },
                     new FillFlowContainer
                     {
-                        Name = "Centre-aligned metadata",
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.TopLeft,
-                        Y = -7,
+                        Name = "Top-left aligned metadata",
                         Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Left = 25, Right = shear_width },
+                        Position = new Vector2(50, 12),
+                        Width = .8f,
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
@@ -292,23 +244,17 @@ namespace osu.Game.Screens.Select
                             TitleLabel = new OsuSpriteText
                             {
                                 Current = { BindTarget = titleBinding },
-                                Font = OsuFont.GetFont(size: 28, italics: true),
+                                Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true,
+                                Truncate = true
                             },
                             ArtistLabel = new OsuSpriteText
                             {
                                 Current = { BindTarget = artistBinding },
-                                Font = OsuFont.GetFont(size: 17, italics: true),
+                                //Not sure if this should be semi bold or medium
+                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true,
-                            },
-                            MapperContainer = new FillFlowContainer
-                            {
-                                Margin = new MarginPadding { Top = 10 },
-                                Direction = FillDirection.Horizontal,
-                                AutoSizeAxes = Axes.Both,
-                                Child = getMapper(metadata),
+                                Truncate = true
                             }
                         }
                     }
@@ -321,9 +267,8 @@ namespace osu.Game.Screens.Select
 
                 starRatingDisplay.DisplayedStars.BindValueChanged(s =>
                 {
-                    difficultyColourBar.Colour = colours.ForStarDifficulty(s.NewValue);
+                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                 }, true);
-
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
@@ -343,22 +288,6 @@ namespace osu.Game.Screens.Select
                 }, true);
             }
 
-            private Drawable getMapper(BeatmapMetadata metadata)
-            {
-                if (string.IsNullOrEmpty(metadata.Author.Username))
-                    return Empty();
-
-                return new LinkFlowContainer(s =>
-                {
-                    s.Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 15);
-                }).With(d =>
-                {
-                    d.AutoSizeAxes = Axes.Both;
-                    d.AddText("mapped by ");
-                    d.AddUserLink(metadata.Author);
-                });
-            }
-
             protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);

From 61caabaa8ee4002c7d96859f0937b3fb8b997c82 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 8 Jan 2023 01:47:22 +0100
Subject: [PATCH 0004/2100] Add coloured star counter

---
 .../Graphics/UserInterface/StarCounter.cs     |  6 ++-
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 51 +++++++++++++++----
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index d7d088d798..7adb482188 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -32,6 +32,11 @@ namespace osu.Game.Graphics.UserInterface
 
         private const float star_spacing = 4;
 
+        public virtual FillDirection Direction
+        {
+            set => stars.Direction = value;
+        }
+
         private float current;
 
         /// <summary>
@@ -66,7 +71,6 @@ namespace osu.Game.Graphics.UserInterface
                 stars = new FillFlowContainer<Star>
                 {
                     AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(star_spacing),
                     ChildrenEnumerable = Enumerable.Range(0, StarCount).Select(_ => CreateStar())
                 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 5583ad11f7..07fcb42fff 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -3,7 +3,9 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using osuTK;
 using osu.Framework.Allocation;
@@ -17,6 +19,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 
@@ -25,11 +28,12 @@ namespace osu.Game.Screens.Select
     [Cached]
     public partial class BeatmapInfoWedgeV2 : VisibilityContainer
     {
-        private const float shear_width = 36.75f;
+        private const float shear_width = 21;
+        private const int wedge_height = 120;
 
         private const float transition_duration = 250;
 
-        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGE_HEIGHT, 0);
+        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / wedge_height, 0);
 
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
@@ -45,6 +49,7 @@ namespace osu.Game.Screens.Select
         private CancellationTokenSource cancellationSource;
 
         private readonly Container difficultyColourBar;
+        private readonly StarCounter starCounter;
 
         public BeatmapInfoWedgeV2()
         {
@@ -52,14 +57,27 @@ namespace osu.Game.Screens.Select
             Shear = wedged_container_shear;
             Masking = true;
             Alpha = 0;
-            Child = difficultyColourBar = new Container
+
+            Children = new Drawable[]
             {
-                Depth = float.MaxValue,
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                RelativeSizeAxes = Axes.Y,
-                Width = 40,
-                Child = new Box { RelativeSizeAxes = Axes.Both }
+                difficultyColourBar = new Container
+                {
+                    Depth = float.MaxValue,
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 40,
+                    Child = new Box { RelativeSizeAxes = Axes.Both }
+                },
+                starCounter = new StarCounter
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(0.4f),
+                    Shear = -wedged_container_shear,
+                    X = -15,
+                    Direction = FillDirection.Vertical
+                }
             };
         }
 
@@ -67,6 +85,15 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             ruleset.BindValueChanged(_ => updateDisplay());
+
+            float starAngle = (float)(Math.Atan(shear_width / wedge_height) * (180 / Math.PI));
+
+            //Applying the rotation directly to the StarCounter distorts the stars, hence it is applied to the child container
+            starCounter.Children.First().Rotation = starAngle;
+
+            //Makes sure the stars center themselves properly in the colour bar
+            starCounter.Children.First().Anchor = Anchor.Centre;
+            starCounter.Children.First().Origin = Anchor.Centre;
         }
 
         private const double animation_duration = 800;
@@ -267,8 +294,12 @@ namespace osu.Game.Screens.Select
 
                 starRatingDisplay.DisplayedStars.BindValueChanged(s =>
                 {
-                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
+                    wedge.starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
+                    wedge.starCounter.Current = (float)s.NewValue;
+
+                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue), 750, Easing.OutQuint);
                 }, true);
+
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;

From 1698272eb88b3937228783d3df8d04db993d5da5 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 8 Jan 2023 12:03:02 +0100
Subject: [PATCH 0005/2100] Simplify passing data from BeatmapInfoWedgeV2.cs to
 subclass wedgeinfotext

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 07fcb42fff..1056d9478b 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -60,17 +60,22 @@ namespace osu.Game.Screens.Select
 
             Children = new Drawable[]
             {
+                //These elements can't be grouped with the rest of the content, due to being present either outside or under the backgrounds area
                 difficultyColourBar = new Container
                 {
+                    Colour = Colour4.Transparent,
                     Depth = float.MaxValue,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Y,
+
+                    //By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
                     Width = 40,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
                 starCounter = new StarCounter
                 {
+                    Colour = Colour4.Transparent,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.Centre,
                     Scale = new Vector2(0.4f),
@@ -170,7 +175,7 @@ namespace osu.Game.Screens.Select
                     Children = new Drawable[]
                     {
                         new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
-                        Info = new WedgeInfoText(beatmap, starDifficulty) { Shear = -Shear }
+                        Info = new WedgeInfoText { Shear = -Shear }
                     }
                 }, loaded =>
                 {
@@ -193,9 +198,6 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
 
-            private readonly WorkingBeatmap working;
-            private readonly IBindable<StarDifficulty?> starDifficulty;
-
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
@@ -207,17 +209,11 @@ namespace osu.Game.Screens.Select
 
             private ModSettingChangeTracker settingChangeTracker;
 
-            public WedgeInfoText(WorkingBeatmap working, IBindable<StarDifficulty?> starDifficulty)
-            {
-                this.working = working;
-                this.starDifficulty = starDifficulty;
-            }
-
             [BackgroundDependencyLoader]
             private void load(LocalisationManager localisation)
             {
-                var beatmapInfo = working.BeatmapInfo;
-                var metadata = beatmapInfo.Metadata;
+                var beatmapInfo = wedge.Beatmap.BeatmapInfo;
+                var metadata = wedge.beatmap.Metadata;
 
                 RelativeSizeAxes = Axes.Both;
 
@@ -262,7 +258,7 @@ namespace osu.Game.Screens.Select
                     {
                         Name = "Top-left aligned metadata",
                         Direction = FillDirection.Vertical,
-                        Position = new Vector2(50, 12),
+                        Position = new Vector2(80, 12),
                         Width = .8f,
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
@@ -270,6 +266,7 @@ namespace osu.Game.Screens.Select
                         {
                             TitleLabel = new OsuSpriteText
                             {
+                                Shadow = true,
                                 Current = { BindTarget = titleBinding },
                                 Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
@@ -277,6 +274,7 @@ namespace osu.Game.Screens.Select
                             },
                             ArtistLabel = new OsuSpriteText
                             {
+                                Shadow = true,
                                 Current = { BindTarget = artistBinding },
                                 //Not sure if this should be semi bold or medium
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
@@ -297,10 +295,10 @@ namespace osu.Game.Screens.Select
                     wedge.starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
                     wedge.starCounter.Current = (float)s.NewValue;
 
-                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue), 750, Easing.OutQuint);
+                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                 }, true);
 
-                starDifficulty.BindValueChanged(s =>
+                wedge.starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
 

From 65c30d2c2e0a322d0d75003905fd44b4e5969d32 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 8 Jan 2023 12:56:32 +0100
Subject: [PATCH 0006/2100] Remove nullability disabling

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 62 +++++++++----------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 1056d9478b..da7cfc6613 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -36,17 +34,11 @@ namespace osu.Game.Screens.Select
         private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / wedge_height, 0);
 
         [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
-        [Resolved]
-        private BeatmapDifficultyCache difficultyCache { get; set; }
+        protected Container? DisplayedContent { get; private set; }
 
-        protected Container DisplayedContent { get; private set; }
-
-        protected WedgeInfoText Info { get; private set; }
-
-        private IBindable<StarDifficulty?> starDifficulty = new Bindable<StarDifficulty?>();
-        private CancellationTokenSource cancellationSource;
+        protected WedgeInfoText? Info { get; private set; }
 
         private readonly Container difficultyColourBar;
         private readonly StarCounter starCounter;
@@ -117,9 +109,9 @@ namespace osu.Game.Screens.Select
             this.FadeOut(transition_duration * 2, Easing.In);
         }
 
-        private WorkingBeatmap beatmap;
+        private WorkingBeatmap? beatmap;
 
-        public WorkingBeatmap Beatmap
+        public WorkingBeatmap? Beatmap
         {
             get => beatmap;
             set
@@ -127,7 +119,6 @@ namespace osu.Game.Screens.Select
                 if (beatmap == value) return;
 
                 beatmap = value;
-                starDifficulty = difficultyCache.GetBindableDifficulty(value.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
 
                 updateDisplay();
             }
@@ -135,14 +126,7 @@ namespace osu.Game.Screens.Select
 
         public override bool IsPresent => base.IsPresent || DisplayedContent == null; // Visibility is updated in the LoadComponentAsync callback
 
-        private Container loadingInfo;
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            cancellationSource?.Cancel();
-        }
+        private Container? loadingInfo;
 
         private void updateDisplay()
         {
@@ -190,30 +174,36 @@ namespace osu.Game.Screens.Select
 
         public partial class WedgeInfoText : Container
         {
-            public OsuSpriteText TitleLabel { get; private set; }
-            public OsuSpriteText ArtistLabel { get; private set; }
+            public OsuSpriteText TitleLabel { get; private set; } = null!;
+            public OsuSpriteText ArtistLabel { get; private set; } = null!;
 
-            private StarRatingDisplay starRatingDisplay;
+            private StarRatingDisplay starRatingDisplay = null!;
 
-            private ILocalisedBindableString titleBinding;
-            private ILocalisedBindableString artistBinding;
+            private ILocalisedBindableString titleBinding = null!;
+            private ILocalisedBindableString artistBinding = null!;
 
             [Resolved]
-            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
             [Resolved]
-            private BeatmapInfoWedgeV2 wedge { get; set; }
+            private BeatmapInfoWedgeV2 wedge { get; set; } = null!;
 
             [Resolved]
-            private OsuColour colours { get; set; }
+            private OsuColour colours { get; set; } = null!;
 
-            private ModSettingChangeTracker settingChangeTracker;
+            [Resolved]
+            private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
+
+            private ModSettingChangeTracker? settingChangeTracker;
+
+            private IBindable<StarDifficulty?>? starDifficulty;
+            private CancellationTokenSource? cancellationSource;
 
             [BackgroundDependencyLoader]
             private void load(LocalisationManager localisation)
             {
-                var beatmapInfo = wedge.Beatmap.BeatmapInfo;
-                var metadata = wedge.beatmap.Metadata;
+                var beatmapInfo = wedge.Beatmap!.BeatmapInfo;
+                var metadata = wedge.beatmap!.Metadata;
 
                 RelativeSizeAxes = Axes.Both;
 
@@ -274,6 +264,7 @@ namespace osu.Game.Screens.Select
                             },
                             ArtistLabel = new OsuSpriteText
                             {
+                                //figma design has a diffused shadow, instead of the solid one present here.
                                 Shadow = true,
                                 Current = { BindTarget = artistBinding },
                                 //Not sure if this should be semi bold or medium
@@ -298,7 +289,8 @@ namespace osu.Game.Screens.Select
                     wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                 }, true);
 
-                wedge.starDifficulty.BindValueChanged(s =>
+                starDifficulty = difficultyCache.GetBindableDifficulty(wedge.beatmap!.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+                starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
 
@@ -320,6 +312,8 @@ namespace osu.Game.Screens.Select
             protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);
+
+                cancellationSource?.Cancel();
                 settingChangeTracker?.Dispose();
             }
         }

From 9afdfd7f067c786f236748c84e7028e0c294ff76 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 8 Jan 2023 15:42:42 +0100
Subject: [PATCH 0007/2100] small tweaks, container edge - effect addition..

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index da7cfc6613..ced6931e1f 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
@@ -27,9 +28,9 @@ namespace osu.Game.Screens.Select
     public partial class BeatmapInfoWedgeV2 : VisibilityContainer
     {
         private const float shear_width = 21;
-        private const int wedge_height = 120;
-
+        private const float wedge_height = 120;
         private const float transition_duration = 250;
+        private const float corner_radius = 10;
 
         private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / wedge_height, 0);
 
@@ -45,14 +46,20 @@ namespace osu.Game.Screens.Select
 
         public BeatmapInfoWedgeV2()
         {
-            CornerRadius = 10;
             Shear = wedged_container_shear;
             Masking = true;
-            Alpha = 0;
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Colour = Colour4.Black.Opacity(.25f),
+                Type = EdgeEffectType.Shadow,
+                Radius = corner_radius,
+                Roundness = corner_radius
+            };
+            CornerRadius = corner_radius;
 
             Children = new Drawable[]
             {
-                //These elements can't be grouped with the rest of the content, due to being present either outside or under the backgrounds area
+                // These elements can't be grouped with the rest of the content, due to being present either outside or under the backgrounds area
                 difficultyColourBar = new Container
                 {
                     Colour = Colour4.Transparent,
@@ -61,7 +68,7 @@ namespace osu.Game.Screens.Select
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Y,
 
-                    //By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
+                    // By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
                     Width = 40,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
@@ -70,7 +77,7 @@ namespace osu.Game.Screens.Select
                     Colour = Colour4.Transparent,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.Centre,
-                    Scale = new Vector2(0.4f),
+                    Scale = new Vector2(0.35f),
                     Shear = -wedged_container_shear,
                     X = -15,
                     Direction = FillDirection.Vertical
@@ -85,10 +92,10 @@ namespace osu.Game.Screens.Select
 
             float starAngle = (float)(Math.Atan(shear_width / wedge_height) * (180 / Math.PI));
 
-            //Applying the rotation directly to the StarCounter distorts the stars, hence it is applied to the child container
+            // Applying the rotation directly to the StarCounter distorts the stars, hence it is applied to the child container
             starCounter.Children.First().Rotation = starAngle;
 
-            //Makes sure the stars center themselves properly in the colour bar
+            // Makes sure the stars center themselves properly in the colour bar
             starCounter.Children.First().Anchor = Anchor.Centre;
             starCounter.Children.First().Origin = Anchor.Centre;
         }
@@ -153,13 +160,13 @@ namespace osu.Game.Screens.Select
                 {
                     Masking = true,
                     X = -30,
-                    CornerRadius = 10,
+                    CornerRadius = corner_radius,
                     RelativeSizeAxes = Axes.Both,
                     Depth = DisplayedContent?.Depth + 1 ?? 0,
                     Children = new Drawable[]
                     {
                         new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
-                        Info = new WedgeInfoText { Shear = -Shear }
+                        Info = new WedgeInfoText(beatmap) { Shear = -Shear }
                     }
                 }, loaded =>
                 {
@@ -182,11 +189,10 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding = null!;
             private ILocalisedBindableString artistBinding = null!;
 
-            [Resolved]
-            private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
+            private readonly WorkingBeatmap working;
 
             [Resolved]
-            private BeatmapInfoWedgeV2 wedge { get; set; } = null!;
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
             [Resolved]
             private OsuColour colours { get; set; } = null!;
@@ -194,16 +200,24 @@ namespace osu.Game.Screens.Select
             [Resolved]
             private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
+            [Resolved]
+            private BeatmapInfoWedgeV2 wedge { get; set; } = null!;
+
             private ModSettingChangeTracker? settingChangeTracker;
 
             private IBindable<StarDifficulty?>? starDifficulty;
             private CancellationTokenSource? cancellationSource;
 
+            public WedgeInfoText(WorkingBeatmap working)
+            {
+                this.working = working;
+            }
+
             [BackgroundDependencyLoader]
             private void load(LocalisationManager localisation)
             {
-                var beatmapInfo = wedge.Beatmap!.BeatmapInfo;
-                var metadata = wedge.beatmap!.Metadata;
+                var beatmapInfo = working.BeatmapInfo;
+                var metadata = working.Metadata;
 
                 RelativeSizeAxes = Axes.Both;
 
@@ -249,7 +263,7 @@ namespace osu.Game.Screens.Select
                         Name = "Top-left aligned metadata",
                         Direction = FillDirection.Vertical,
                         Position = new Vector2(80, 12),
-                        Width = .8f,
+                        Width = .7f,
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
@@ -289,7 +303,7 @@ namespace osu.Game.Screens.Select
                     wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                 }, true);
 
-                starDifficulty = difficultyCache.GetBindableDifficulty(wedge.beatmap!.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+                starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;

From 2a82f618ed9a69dd28613dfc8f04189ceecd702f Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 10 Jan 2023 17:34:47 +0100
Subject: [PATCH 0008/2100] Add TODO for text margin const, added pertinent
 comments to known "issues"

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index ced6931e1f..ce07a59a0c 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -32,6 +32,9 @@ namespace osu.Game.Screens.Select
         private const float transition_duration = 250;
         private const float corner_radius = 10;
 
+        /// Todo: move this const out to song select when more new design elements are implemented for the beatmap details area, since it applies to text alignment of various elements
+        private const float text_margin = 62;
+
         private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / wedge_height, 0);
 
         [Resolved]
@@ -159,18 +162,21 @@ namespace osu.Game.Screens.Select
                 LoadComponentAsync(loadingInfo = new Container
                 {
                     Masking = true,
+                    // We offset this by the portion of the colour bar underneath we wish to show
                     X = -30,
                     CornerRadius = corner_radius,
                     RelativeSizeAxes = Axes.Both,
                     Depth = DisplayedContent?.Depth + 1 ?? 0,
                     Children = new Drawable[]
                     {
+                        // TODO: New wedge design uses a coloured horizontal gradient for its background, however this lacks implementation information in the figma draft.
+                        // pending https://www.figma.com/file/DXKwqZhD5yyb1igc3mKo1P?node-id=2980:3361#340801912 being answered.
                         new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
                         Info = new WedgeInfoText(beatmap) { Shear = -Shear }
                     }
                 }, loaded =>
                 {
-                    // ensure we are the most recent loaded wedge.
+                    // Ensure we are the most recent loaded wedge.
                     if (loaded != loadingInfo) return;
 
                     removeOldInfo();
@@ -262,7 +268,7 @@ namespace osu.Game.Screens.Select
                     {
                         Name = "Top-left aligned metadata",
                         Direction = FillDirection.Vertical,
-                        Position = new Vector2(80, 12),
+                        Position = new Vector2(text_margin + shear_width, 12),
                         Width = .7f,
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
@@ -278,10 +284,10 @@ namespace osu.Game.Screens.Select
                             },
                             ArtistLabel = new OsuSpriteText
                             {
-                                //figma design has a diffused shadow, instead of the solid one present here.
+                                // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
                                 Shadow = true,
                                 Current = { BindTarget = artistBinding },
-                                //Not sure if this should be semi bold or medium
+                                // Not sure if this should be semi bold or medium
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
                                 Truncate = true
@@ -297,8 +303,8 @@ namespace osu.Game.Screens.Select
 
                 starRatingDisplay.DisplayedStars.BindValueChanged(s =>
                 {
-                    wedge.starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
                     wedge.starCounter.Current = (float)s.NewValue;
+                    wedge.starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
 
                     wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                 }, true);

From 8bfe24ced0c9163c1e1017b76d1f1669d57a160c Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 10 Jan 2023 17:49:33 +0100
Subject: [PATCH 0009/2100] Remove nullable disable in test.

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 98e9d803ca..193acc8a7b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.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.Collections.Generic;
-using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -24,8 +21,8 @@ namespace osu.Game.Tests.Visual.SongSelect
     [TestFixture]
     public partial class TestSceneBeatmapInfoWedgeV2 : OsuTestScene
     {
-        private RulesetStore rulesets;
-        private TestBeatmapInfoWedgeV2 infoWedge;
+        private RulesetStore rulesets = null!;
+        private TestBeatmapInfoWedgeV2 infoWedge = null!;
         private readonly List<IBeatmap> beatmaps = new List<IBeatmap>();
 
         [BackgroundDependencyLoader]
@@ -80,8 +77,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void testBeatmapLabels(Ruleset ruleset)
         {
-            AddAssert("check title", () => infoWedge.Info.TitleLabel.Current.Value == $"{ruleset.ShortName}Title");
-            AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist");
+            AddAssert("check title", () => infoWedge.Info!.TitleLabel.Current.Value == $"{ruleset.ShortName}Title");
+            AddAssert("check artist", () => infoWedge.Info!.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist");
         }
 
         [SetUpSteps]
@@ -98,7 +95,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void setRuleset(RulesetInfo rulesetInfo)
         {
-            Container containerBefore = null;
+            Container? containerBefore = null;
 
             AddStep("set ruleset", () =>
             {
@@ -112,9 +109,9 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);
         }
 
-        private void selectBeatmap([CanBeNull] IBeatmap b)
+        private void selectBeatmap(IBeatmap? b)
         {
-            Container containerBefore = null;
+            Container? containerBefore = null;
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
@@ -172,9 +169,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private partial class TestBeatmapInfoWedgeV2 : BeatmapInfoWedgeV2
         {
-            public new Container DisplayedContent => base.DisplayedContent;
+            public new Container? DisplayedContent => base.DisplayedContent;
 
-            public new WedgeInfoText Info => base.Info;
+            public new WedgeInfoText? Info => base.Info;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition

From 880428046a17606b200750c6f8bdec254fd7e4e1 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 10 Jan 2023 18:03:28 +0100
Subject: [PATCH 0010/2100] Fix margins on top right aligned elements.

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index ce07a59a0c..1497bed121 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -238,7 +238,7 @@ namespace osu.Game.Screens.Select
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
                         Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
+                        Padding = new MarginPadding { Top = 3, Right = 8 },
                         AutoSizeAxes = Axes.Both,
                         Shear = wedged_container_shear,
                         Spacing = new Vector2(0f, 5f),

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 0011/2100] 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 0012/2100] 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 0013/2100] 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 0014/2100] 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 7510201804aab33e90d805b8a34b9883f9ff390f Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 16 Jan 2023 22:24:21 +0100
Subject: [PATCH 0015/2100] Add back null beatmap test

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 193acc8a7b..a2935fb218 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -93,6 +94,15 @@ namespace osu.Game.Tests.Visual.SongSelect
             selectBeatmap(createLongMetadata());
         }
 
+        [Test]
+        public void TestNullBeatmap()
+        {
+            selectBeatmap(null);
+            AddAssert("check default title", () => infoWedge.Info!.TitleLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Title);
+            AddAssert("check default artist", () => infoWedge.Info!.ArtistLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Artist);
+            AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Any());
+        }
+
         private void setRuleset(RulesetInfo rulesetInfo)
         {
             Container? containerBefore = null;

From 74b72e4ac0d6c34df51bf8d27c24d4625a9f8039 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 16 Jan 2023 22:46:18 +0100
Subject: [PATCH 0016/2100] Address issues that joehuu brought up

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs  |  2 +-
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs         | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index a2935fb218..4904e2a723 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             Add(infoWedge = new TestBeatmapInfoWedgeV2
             {
-                Size = new Vector2(0.6f, 120),
+                Width = 0.6f,
                 RelativeSizeAxes = Axes.X,
                 Margin = new MarginPadding { Top = 20 }
             });
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 1497bed121..02d640fc0d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Screens.Select
         private const float wedge_height = 120;
         private const float transition_duration = 250;
         private const float corner_radius = 10;
+        private const float colour_bar_width = 30;
 
         /// Todo: move this const out to song select when more new design elements are implemented for the beatmap details area, since it applies to text alignment of various elements
         private const float text_margin = 62;
@@ -49,6 +50,7 @@ namespace osu.Game.Screens.Select
 
         public BeatmapInfoWedgeV2()
         {
+            Height = wedge_height;
             Shear = wedged_container_shear;
             Masking = true;
             EdgeEffect = new EdgeEffectParameters
@@ -72,7 +74,7 @@ namespace osu.Game.Screens.Select
                     RelativeSizeAxes = Axes.Y,
 
                     // By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
-                    Width = 40,
+                    Width = colour_bar_width + corner_radius,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
                 starCounter = new StarCounter
@@ -82,7 +84,7 @@ namespace osu.Game.Screens.Select
                     Origin = Anchor.Centre,
                     Scale = new Vector2(0.35f),
                     Shear = -wedged_container_shear,
-                    X = -15,
+                    X = -colour_bar_width / 2,
                     Direction = FillDirection.Vertical
                 }
             };
@@ -163,7 +165,7 @@ namespace osu.Game.Screens.Select
                 {
                     Masking = true,
                     // We offset this by the portion of the colour bar underneath we wish to show
-                    X = -30,
+                    X = -colour_bar_width,
                     CornerRadius = corner_radius,
                     RelativeSizeAxes = Axes.Both,
                     Depth = DisplayedContent?.Depth + 1 ?? 0,
@@ -268,8 +270,7 @@ namespace osu.Game.Screens.Select
                     {
                         Name = "Top-left aligned metadata",
                         Direction = FillDirection.Vertical,
-                        Position = new Vector2(text_margin + shear_width, 12),
-                        Width = .7f,
+                        Padding = new MarginPadding { Horizontal = text_margin + shear_width, Top = 12 },
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]

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 0017/2100] 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 0ac7cd7409e1c61cc0f8df03c1fa0b780adb43da Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Wed, 18 Jan 2023 13:55:52 +0100
Subject: [PATCH 0018/2100] Expose star difficulty to wedge to allow updating
 starcounter and background colour internally.

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 02d640fc0d..d90c002953 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -24,7 +24,6 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.Select
 {
-    [Cached]
     public partial class BeatmapInfoWedgeV2 : VisibilityContainer
     {
         private const float shear_width = 21;
@@ -41,6 +40,9 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         protected Container? DisplayedContent { get; private set; }
 
         protected WedgeInfoText? Info { get; private set; }
@@ -183,6 +185,14 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     Add(DisplayedContent = loaded);
+
+                    Info.StarRatingDisplay.DisplayedStars.BindValueChanged(s =>
+                    {
+                        starCounter.Current = (float)s.NewValue;
+                        starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
+
+                        difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
+                    }, true);
                 });
             }
         }
@@ -192,7 +202,7 @@ namespace osu.Game.Screens.Select
             public OsuSpriteText TitleLabel { get; private set; } = null!;
             public OsuSpriteText ArtistLabel { get; private set; } = null!;
 
-            private StarRatingDisplay starRatingDisplay = null!;
+            public StarRatingDisplay StarRatingDisplay = null!;
 
             private ILocalisedBindableString titleBinding = null!;
             private ILocalisedBindableString artistBinding = null!;
@@ -202,15 +212,9 @@ namespace osu.Game.Screens.Select
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
-            [Resolved]
-            private OsuColour colours { get; set; } = null!;
-
             [Resolved]
             private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
-            [Resolved]
-            private BeatmapInfoWedgeV2 wedge { get; set; } = null!;
-
             private ModSettingChangeTracker? settingChangeTracker;
 
             private IBindable<StarDifficulty?>? starDifficulty;
@@ -246,7 +250,7 @@ namespace osu.Game.Screens.Select
                         Spacing = new Vector2(0f, 5f),
                         Children = new Drawable[]
                         {
-                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
+                            StarRatingDisplay = new StarRatingDisplay(default, animated: true)
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
@@ -302,24 +306,16 @@ namespace osu.Game.Screens.Select
             {
                 base.LoadComplete();
 
-                starRatingDisplay.DisplayedStars.BindValueChanged(s =>
-                {
-                    wedge.starCounter.Current = (float)s.NewValue;
-                    wedge.starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
-
-                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
-                }, true);
-
                 starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
                 starDifficulty.BindValueChanged(s =>
                 {
-                    starRatingDisplay.Current.Value = s.NewValue ?? default;
+                    StarRatingDisplay.Current.Value = s.NewValue ?? default;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
-                    if (!starRatingDisplay.IsPresent)
-                        starRatingDisplay.FinishTransforms(true);
+                    if (!StarRatingDisplay.IsPresent)
+                        StarRatingDisplay.FinishTransforms(true);
 
-                    starRatingDisplay.FadeIn(transition_duration);
+                    StarRatingDisplay.FadeIn(transition_duration);
                 });
 
                 mods.BindValueChanged(m =>

From 655242371b2858371c82970d9fe316eb7d26cd6d Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 23 Jan 2023 17:00:46 +0100
Subject: [PATCH 0019/2100] Buffer wedge content to avoid opacity issues when
 showing / hiding

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 66 +++++++++++--------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index d90c002953..63e414d6ad 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -49,6 +49,7 @@ namespace osu.Game.Screens.Select
 
         private readonly Container difficultyColourBar;
         private readonly StarCounter starCounter;
+        private readonly BufferedContainer bufferedContent;
 
         public BeatmapInfoWedgeV2()
         {
@@ -64,30 +65,35 @@ namespace osu.Game.Screens.Select
             };
             CornerRadius = corner_radius;
 
-            Children = new Drawable[]
+            // We want to buffer the wedge to avoid weird transparency overlaps between the colour bar and the background.
+            Child = bufferedContent = new BufferedContainer
             {
-                // These elements can't be grouped with the rest of the content, due to being present either outside or under the backgrounds area
-                difficultyColourBar = new Container
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    Colour = Colour4.Transparent,
-                    Depth = float.MaxValue,
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    RelativeSizeAxes = Axes.Y,
+                    // These elements can't be grouped with the rest of the content, due to being present either outside or under the backgrounds area
+                    difficultyColourBar = new Container
+                    {
+                        Colour = Colour4.Transparent,
+                        Depth = float.MaxValue,
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        RelativeSizeAxes = Axes.Y,
 
-                    // By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
-                    Width = colour_bar_width + corner_radius,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }
-                },
-                starCounter = new StarCounter
-                {
-                    Colour = Colour4.Transparent,
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(0.35f),
-                    Shear = -wedged_container_shear,
-                    X = -colour_bar_width / 2,
-                    Direction = FillDirection.Vertical
+                        // By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
+                        Width = colour_bar_width + corner_radius,
+                        Child = new Box { RelativeSizeAxes = Axes.Both }
+                    },
+                    starCounter = new StarCounter
+                    {
+                        Colour = Colour4.Transparent,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(0.35f),
+                        Shear = -wedged_container_shear,
+                        X = -colour_bar_width / 2,
+                        Direction = FillDirection.Vertical
+                    }
                 }
             };
         }
@@ -184,9 +190,9 @@ namespace osu.Game.Screens.Select
                     if (loaded != loadingInfo) return;
 
                     removeOldInfo();
-                    Add(DisplayedContent = loaded);
+                    bufferedContent.Add(DisplayedContent = loaded);
 
-                    Info.StarRatingDisplay.DisplayedStars.BindValueChanged(s =>
+                    Info.DisplayedStars.BindValueChanged(s =>
                     {
                         starCounter.Current = (float)s.NewValue;
                         starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
@@ -202,13 +208,15 @@ namespace osu.Game.Screens.Select
             public OsuSpriteText TitleLabel { get; private set; } = null!;
             public OsuSpriteText ArtistLabel { get; private set; } = null!;
 
-            public StarRatingDisplay StarRatingDisplay = null!;
+            private StarRatingDisplay starRatingDisplay = null!;
 
             private ILocalisedBindableString titleBinding = null!;
             private ILocalisedBindableString artistBinding = null!;
 
             private readonly WorkingBeatmap working;
 
+            public IBindable<double> DisplayedStars => starRatingDisplay.DisplayedStars;
+
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
@@ -250,7 +258,7 @@ namespace osu.Game.Screens.Select
                         Spacing = new Vector2(0f, 5f),
                         Children = new Drawable[]
                         {
-                            StarRatingDisplay = new StarRatingDisplay(default, animated: true)
+                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
@@ -309,13 +317,13 @@ namespace osu.Game.Screens.Select
                 starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
                 starDifficulty.BindValueChanged(s =>
                 {
-                    StarRatingDisplay.Current.Value = s.NewValue ?? default;
+                    starRatingDisplay.Current.Value = s.NewValue ?? default;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
-                    if (!StarRatingDisplay.IsPresent)
-                        StarRatingDisplay.FinishTransforms(true);
+                    if (!starRatingDisplay.IsPresent)
+                        starRatingDisplay.FinishTransforms(true);
 
-                    StarRatingDisplay.FadeIn(transition_duration);
+                    starRatingDisplay.FadeIn(transition_duration);
                 });
 
                 mods.BindValueChanged(m =>

From c7d49bdc82c4ab48ab60040cdd0e161a481fdf94 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 30 Jan 2023 13:13:57 +0100
Subject: [PATCH 0020/2100] Update ```BeatmapInfoWedgeV2.cs``` animation to be
 similar to exit transition in ```SongSelect.cs``

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 63e414d6ad..6a1662fd6a 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -113,20 +113,18 @@ namespace osu.Game.Screens.Select
             starCounter.Children.First().Origin = Anchor.Centre;
         }
 
-        private const double animation_duration = 800;
+        private const double animation_duration = 600;
 
         protected override void PopIn()
         {
             this.MoveToX(0, animation_duration, Easing.OutQuint);
-            this.RotateTo(0, animation_duration, Easing.OutQuint);
-            this.FadeIn(transition_duration);
+            this.FadeIn(200, Easing.In);
         }
 
         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);
+            this.MoveToX(-150, animation_duration, Easing.OutQuint);
+            this.FadeOut(200, Easing.OutQuint);
         }
 
         private WorkingBeatmap? beatmap;

From 92690afa5fecd750583924c5917fc3b877b73041 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 30 Jan 2023 16:12:26 +0100
Subject: [PATCH 0021/2100] de-nest ```removeOldInfo()```

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 6a1662fd6a..41fe9d8d50 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -152,15 +152,6 @@ namespace osu.Game.Screens.Select
 
             void perform()
             {
-                void removeOldInfo()
-                {
-                    State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
-
-                    DisplayedContent?.FadeOut(transition_duration);
-                    DisplayedContent?.Expire();
-                    DisplayedContent = null;
-                }
-
                 if (beatmap == null)
                 {
                     removeOldInfo();
@@ -199,6 +190,15 @@ namespace osu.Game.Screens.Select
                     }, true);
                 });
             }
+
+            void removeOldInfo()
+            {
+                State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
+
+                DisplayedContent?.FadeOut(transition_duration);
+                DisplayedContent?.Expire();
+                DisplayedContent = null;
+            }
         }
 
         public partial class WedgeInfoText : Container

From 27c52a45fc079174f29067ae6b7e97529f02cceb Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 30 Jan 2023 16:13:55 +0100
Subject: [PATCH 0022/2100] Use inline lambda for scheduling

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 41fe9d8d50..0cc60e4bba 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -148,9 +148,7 @@ namespace osu.Game.Screens.Select
 
         private void updateDisplay()
         {
-            Scheduler.AddOnce(perform);
-
-            void perform()
+            Scheduler.AddOnce(() =>
             {
                 if (beatmap == null)
                 {
@@ -189,7 +187,7 @@ namespace osu.Game.Screens.Select
                         difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                     }, true);
                 });
-            }
+            });
 
             void removeOldInfo()
             {

From 5fc8f1d1bef944c43f1e9b1ac0456ded7015db72 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Fri, 3 Feb 2023 19:52:01 +0100
Subject: [PATCH 0023/2100] Fix ```BeatmapInfoWedgeV2.cs``` starCounter needing
 janky rotation application

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 0cc60e4bba..48a16d5449 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using osuTK;
 using osu.Framework.Allocation;
@@ -84,15 +83,25 @@ namespace osu.Game.Screens.Select
                         Width = colour_bar_width + corner_radius,
                         Child = new Box { RelativeSizeAxes = Axes.Both }
                     },
-                    starCounter = new StarCounter
+                    new Container
                     {
-                        Colour = Colour4.Transparent,
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.Centre,
-                        Scale = new Vector2(0.35f),
+                        // Applying the shear to this container and nesting the starCounter inside avoids
+                        // the deformation that occurs if the shear is applied to the starCounter whilst rotated
                         Shear = -wedged_container_shear,
                         X = -colour_bar_width / 2,
-                        Direction = FillDirection.Vertical
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = colour_bar_width,
+                        Child = starCounter = new StarCounter
+                        {
+                            Rotation = (float)(Math.Atan(shear_width / wedge_height) * (180 / Math.PI)),
+                            Colour = Colour4.Transparent,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Scale = new Vector2(0.35f),
+                            Direction = FillDirection.Vertical
+                        }
                     }
                 }
             };
@@ -102,15 +111,6 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             ruleset.BindValueChanged(_ => updateDisplay());
-
-            float starAngle = (float)(Math.Atan(shear_width / wedge_height) * (180 / Math.PI));
-
-            // Applying the rotation directly to the StarCounter distorts the stars, hence it is applied to the child container
-            starCounter.Children.First().Rotation = starAngle;
-
-            // Makes sure the stars center themselves properly in the colour bar
-            starCounter.Children.First().Anchor = Anchor.Centre;
-            starCounter.Children.First().Origin = Anchor.Centre;
         }
 
         private const double animation_duration = 600;

From de37a0a000bfb99ad0f56eaadbe9929eb93229ab Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Fri, 3 Feb 2023 19:53:04 +0100
Subject: [PATCH 0024/2100] enable pixelSnapping for the
 ```BufferedContainer``` in BeatmapInfoWedgeV2.cs

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 48a16d5449..a18d4086f7 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Select
             CornerRadius = corner_radius;
 
             // We want to buffer the wedge to avoid weird transparency overlaps between the colour bar and the background.
-            Child = bufferedContent = new BufferedContainer
+            Child = bufferedContent = new BufferedContainer(pixelSnapping: true)
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]

From 38cc47d64ec35313d7cb928ae78a018b5641e2d5 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 4 Feb 2023 16:52:30 +0100
Subject: [PATCH 0025/2100] Remove ```IsPresent``` usages

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index a18d4086f7..fda20dde4d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -142,8 +142,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public override bool IsPresent => base.IsPresent || DisplayedContent == null; // Visibility is updated in the LoadComponentAsync callback
-
         private Container? loadingInfo;
 
         private void updateDisplay()
@@ -316,7 +314,7 @@ namespace osu.Game.Screens.Select
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
-                    if (!starRatingDisplay.IsPresent)
+                    if (starRatingDisplay.Alpha > 0)
                         starRatingDisplay.FinishTransforms(true);
 
                     starRatingDisplay.FadeIn(transition_duration);

From cb679ccc2b95858b0ff85e86bffcd6ee6a27d9dd Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 11 Feb 2023 18:00:17 +0100
Subject: [PATCH 0026/2100] Separate wedge visibility test into its own method

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 4904e2a723..f99950dfb0 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
@@ -49,12 +50,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddWaitStep("wait for select", 3);
 
-            AddStep("hide", () => { infoWedge.Hide(); });
-
-            AddWaitStep("wait for hide", 3);
-
-            AddStep("show", () => { infoWedge.Show(); });
-
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
             {
                 foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
@@ -76,6 +71,26 @@ namespace osu.Game.Tests.Visual.SongSelect
             }
         }
 
+        [Test]
+        public void TestWedgeVisibility()
+        {
+            AddStep("Make shadow red for test visibility", () =>
+            {
+                infoWedge.EdgeEffect = new EdgeEffectParameters
+                {
+                    Colour = Colour4.Red,
+                    Type = EdgeEffectType.Shadow,
+                    Radius = 5,
+                };
+            });
+            AddStep("hide", () => { infoWedge.Hide(); });
+            AddWaitStep("wait for hide", 3);
+            AddAssert("check visibility", () => infoWedge.Alpha == 0);
+            AddStep("show", () => { infoWedge.Show(); });
+            AddWaitStep("wait for show", 1);
+            AddAssert("check visibility", () => infoWedge.Alpha > 0);
+        }
+
         private void testBeatmapLabels(Ruleset ruleset)
         {
             AddAssert("check title", () => infoWedge.Info!.TitleLabel.Current.Value == $"{ruleset.ShortName}Title");

From 468419896a5364252afa23263d9e43d26c4b7edf Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 11 Feb 2023 18:08:50 +0100
Subject: [PATCH 0027/2100] Separate ruleset changing tests into their own
 method.

Add small clarification for edge colouring in visibility test
---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index f99950dfb0..ebd8c008b3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -39,22 +39,25 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             Add(infoWedge = new TestBeatmapInfoWedgeV2
             {
+                State = { Value = Visibility.Visible },
                 Width = 0.6f,
                 RelativeSizeAxes = Axes.X,
                 Margin = new MarginPadding { Top = 20 }
             });
 
-            AddStep("show", () => infoWedge.Show());
-
-            selectBeatmap(Beatmap.Value.Beatmap);
-
-            AddWaitStep("wait for select", 3);
-
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
             {
                 foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
                     hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
             });
+        }
+
+        [Test]
+        public void TestRulesetChange()
+        {
+            selectBeatmap(Beatmap.Value.Beatmap);
+
+            AddWaitStep("wait for select", 3);
 
             foreach (var rulesetInfo in rulesets.AvailableRulesets)
             {
@@ -74,6 +77,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestWedgeVisibility()
         {
+            // Mostly just in case someone runs this test before others,
+            // leading to the shadow being very hard to see if it is black
             AddStep("Make shadow red for test visibility", () =>
             {
                 infoWedge.EdgeEffect = new EdgeEffectParameters

From 09cb6ca3a797e516c3097b48883468be0f85f237 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 11 Feb 2023 18:15:21 +0100
Subject: [PATCH 0028/2100] Clean up formatting and wedge placement in
 testscene a tad,

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index ebd8c008b3..3f3c7441f4 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 State = { Value = Visibility.Visible },
                 Width = 0.6f,
                 RelativeSizeAxes = Axes.X,
-                Margin = new MarginPadding { Top = 20 }
+                Margin = new MarginPadding { Top = 20, Left = -10 }
             });
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             // Mostly just in case someone runs this test before others,
             // leading to the shadow being very hard to see if it is black
-            AddStep("Make shadow red for test visibility", () =>
+            AddStep("make shadow red for test visibility", () =>
             {
                 infoWedge.EdgeEffect = new EdgeEffectParameters
                 {

From 299023fce036d6995ead30d00d1de6364bbcc137 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 21 Feb 2023 16:07:26 +0100
Subject: [PATCH 0029/2100] Improve visibility of wedge shading in test scene
 and fix an issue with excessive roundness on said shadow.

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 25 ++++++++++++++-----
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs |  9 +++----
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 3f3c7441f4..09b93119cc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
@@ -37,12 +38,25 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             base.LoadComplete();
 
-            Add(infoWedge = new TestBeatmapInfoWedgeV2
+            AddRange(new Drawable[]
             {
-                State = { Value = Visibility.Visible },
-                Width = 0.6f,
-                RelativeSizeAxes = Axes.X,
-                Margin = new MarginPadding { Top = 20, Left = -10 }
+                // This exists only to make the wedge more visible in the test scene
+                new Box
+                {
+                    Y = -20,
+                    Colour = Colour4.Cornsilk.Darken(0.2f),
+                    Height = BeatmapInfoWedgeV2.WEDGE_HEIGHT + 40,
+                    Width = 0.65f,
+                    RelativeSizeAxes = Axes.X,
+                    Margin = new MarginPadding { Top = 20, Left = -10 }
+                },
+                infoWedge = new TestBeatmapInfoWedgeV2
+                {
+                    State = { Value = Visibility.Visible },
+                    Width = 0.6f,
+                    RelativeSizeAxes = Axes.X,
+                    Margin = new MarginPadding { Top = 20, Left = -10 }
+                },
             });
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
@@ -200,7 +214,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         private partial class TestBeatmapInfoWedgeV2 : BeatmapInfoWedgeV2
         {
             public new Container? DisplayedContent => base.DisplayedContent;
-
             public new WedgeInfoText? Info => base.Info;
         }
 
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index fda20dde4d..0a35e68c7e 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -25,8 +25,8 @@ namespace osu.Game.Screens.Select
 {
     public partial class BeatmapInfoWedgeV2 : VisibilityContainer
     {
+        public const float WEDGE_HEIGHT = 120;
         private const float shear_width = 21;
-        private const float wedge_height = 120;
         private const float transition_duration = 250;
         private const float corner_radius = 10;
         private const float colour_bar_width = 30;
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Select
         /// Todo: move this const out to song select when more new design elements are implemented for the beatmap details area, since it applies to text alignment of various elements
         private const float text_margin = 62;
 
-        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / wedge_height, 0);
+        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / WEDGE_HEIGHT, 0);
 
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Select
 
         public BeatmapInfoWedgeV2()
         {
-            Height = wedge_height;
+            Height = WEDGE_HEIGHT;
             Shear = wedged_container_shear;
             Masking = true;
             EdgeEffect = new EdgeEffectParameters
@@ -60,7 +60,6 @@ namespace osu.Game.Screens.Select
                 Colour = Colour4.Black.Opacity(.25f),
                 Type = EdgeEffectType.Shadow,
                 Radius = corner_radius,
-                Roundness = corner_radius
             };
             CornerRadius = corner_radius;
 
@@ -95,7 +94,7 @@ namespace osu.Game.Screens.Select
                         Width = colour_bar_width,
                         Child = starCounter = new StarCounter
                         {
-                            Rotation = (float)(Math.Atan(shear_width / wedge_height) * (180 / Math.PI)),
+                            Rotation = (float)(Math.Atan(shear_width / WEDGE_HEIGHT) * (180 / Math.PI)),
                             Colour = Colour4.Transparent,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,

From f21238f517fa8e22a694affd4406bf3b858a8bb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Mar 2023 16:51:57 +0900
Subject: [PATCH 0030/2100] Adjust shadow to look better

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 0a35e68c7e..b7b60cffab 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -57,9 +57,9 @@ namespace osu.Game.Screens.Select
             Masking = true;
             EdgeEffect = new EdgeEffectParameters
             {
-                Colour = Colour4.Black.Opacity(.25f),
+                Colour = Colour4.Black.Opacity(0.2f),
                 Type = EdgeEffectType.Shadow,
-                Radius = corner_radius,
+                Radius = 3,
             };
             CornerRadius = corner_radius;
 

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 0031/2100] 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 3c6141f233d0eb829c831fea7d838f7f2da2ecbd Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Thu, 27 Apr 2023 17:08:29 +0300
Subject: [PATCH 0032/2100] 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 0033/2100] 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 ae85e2a3ff94a6c43282bf7ea084baff1cc060f9 Mon Sep 17 00:00:00 2001
From: Ethan <ethpsa09@gmail.com>
Date: Fri, 28 Apr 2023 19:51:10 +0800
Subject: [PATCH 0034/2100] 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 a6ca0497399d5e83faca452782c49fa74c2c406a Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Tue, 2 May 2023 14:15:33 +0300
Subject: [PATCH 0035/2100] 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 f0d35eb12be0262e892b4fc614128860007107c7 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Wed, 3 May 2023 13:12:11 +0300
Subject: [PATCH 0036/2100] 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 0037/2100] 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 1ac9d900e1f0ea8b66e5722174fc3f7f960b9e6b Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Thu, 4 May 2023 19:24:37 +0300
Subject: [PATCH 0038/2100] 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 54757df51fefc2c8c3a19b7dc340036ceb5b6a29 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 5 May 2023 09:31:27 +0300
Subject: [PATCH 0039/2100] 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 0040/2100] 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 7422b5285ce8e9631111c20ab9a1baf40d81152a Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 5 May 2023 22:41:30 +0300
Subject: [PATCH 0041/2100] 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 0042/2100] 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 0043/2100] 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 0044/2100] 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 4d235105d14d0b1ed91fedae09c6eaea6bdf13bf Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 7 May 2023 15:14:49 +0300
Subject: [PATCH 0045/2100] 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 0046/2100] 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 0047/2100] 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 2467813d8199473f2b37041fb005065c312dd7d2 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Tue, 9 May 2023 16:14:42 +0300
Subject: [PATCH 0048/2100] 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 ca688507304721a799c85a40900c1624976954c7 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Wed, 10 May 2023 19:43:58 +0300
Subject: [PATCH 0049/2100] 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 e5884016ab7ad72fda9be0878afec14bb8363b29 Mon Sep 17 00:00:00 2001
From: John <johntbiddle@gmail.com>
Date: Fri, 12 May 2023 19:07:25 -0700
Subject: [PATCH 0050/2100] 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 0051/2100] 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 0052/2100] 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 6647d95ea7e80e8430c3daa8cd0bae62c2844c42 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 14 May 2023 18:32:16 +0300
Subject: [PATCH 0053/2100] 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 e2633ae993ccd0d470a5684b3cf39ea1c850e0dd Mon Sep 17 00:00:00 2001
From: John <johntbiddle@gmail.com>
Date: Tue, 16 May 2023 21:08:56 -0700
Subject: [PATCH 0054/2100] 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 0055/2100] 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 67bf1b4dfe5117cbf1e7a30b1a98caf271f8d637 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 21 May 2023 11:05:01 +0300
Subject: [PATCH 0056/2100] 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 5ff023113fed2c6ef46454e62e9db2f5e8afcc3d Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 28 May 2023 10:04:26 +0300
Subject: [PATCH 0057/2100] 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 0058/2100] 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 0059/2100] 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 22c6d6c5262a97af2f1a129c2a6a6292ed76bad2 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Mon, 29 May 2023 14:22:40 +0300
Subject: [PATCH 0060/2100] 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 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 0061/2100] 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 ed850196d9b780b4cd30511f8b0c37750a0c30ab Mon Sep 17 00:00:00 2001
From: John <johntbiddle@gmail.com>
Date: Tue, 30 May 2023 01:43:08 -0700
Subject: [PATCH 0062/2100] 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 6e00b21a3200ceb5f416d19ecc6cb41fd62e7b6d Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Wed, 31 May 2023 19:16:16 +0300
Subject: [PATCH 0063/2100] 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 0064/2100] 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 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 0065/2100] 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 0066/2100] 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 0067/2100] 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 0068/2100] 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 325c114c1c9ba4b7f1bfa0630c2d1ab0885d1cf1 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 2 Jun 2023 10:39:27 +0300
Subject: [PATCH 0069/2100] 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 0070/2100] 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 0071/2100] 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 0072/2100] 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 9d4ba5d64ab354b8163efc73a6287ec610a32fa9 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 2 Jun 2023 12:00:03 +0300
Subject: [PATCH 0073/2100] 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 0074/2100] 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 69b640a185a1850159064a2701cba7726c27da44 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 3 Jun 2023 10:47:48 +0300
Subject: [PATCH 0075/2100] 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 32b9e6ec8f0a5a395d2295e0510fa3c40a058e67 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 4 Jun 2023 17:02:46 +0300
Subject: [PATCH 0076/2100] 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 0077/2100] 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 0078/2100] 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 3ebc8014847ed22b189ab1843ad8ae72bd31e8a3 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Mon, 5 Jun 2023 13:49:07 +0300
Subject: [PATCH 0079/2100] 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 0080/2100] 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 4c397085c5203aae8c70f58a63d5a48787cdbc2f Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Tue, 6 Jun 2023 00:04:29 +0200
Subject: [PATCH 0081/2100] 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 0082/2100] 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 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 0083/2100] "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 ba7069df34b65ee70ecf9962d240c3deb05dc68a Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Tue, 6 Jun 2023 16:12:31 +0300
Subject: [PATCH 0084/2100] =?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 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 0085/2100] 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 0086/2100] 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 0087/2100] 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 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 0088/2100] 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 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 0089/2100] 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 0090/2100] 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 0091/2100] 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 0092/2100] 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 0093/2100] 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 0094/2100] 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 0095/2100] 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 0096/2100] 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 0097/2100] 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 0098/2100] 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 0099/2100] 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 0100/2100] 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 0101/2100] 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 0102/2100] 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 0103/2100] 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 0104/2100] 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 0105/2100] 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 0106/2100] 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 0107/2100] 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 0108/2100] 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 0109/2100] 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 0110/2100] 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 0111/2100] 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 0112/2100] 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 0113/2100] 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 0114/2100] 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 0115/2100] 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 0116/2100] 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 0117/2100] 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 0118/2100] 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 0119/2100] 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 0120/2100] 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 0121/2100] 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 0122/2100] 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 0123/2100] 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 0124/2100] 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 0125/2100] 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 0126/2100] 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 0127/2100] 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 0128/2100] 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 0129/2100] 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 0130/2100] 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 0131/2100] 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 0132/2100] 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 0133/2100] 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 0134/2100] 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 0135/2100] 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 0136/2100] 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 0137/2100] 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 0138/2100] 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 0139/2100] 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 0140/2100] 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 0141/2100] 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 0142/2100] 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 0143/2100] 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 0144/2100] 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 0145/2100] 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 0146/2100] 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 0147/2100] 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 0148/2100] 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 0149/2100] 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 0150/2100] 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 0151/2100] 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 0152/2100] 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 0153/2100] 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 0154/2100] 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 0155/2100] 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 0156/2100] 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 0157/2100] 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 0158/2100] 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 0159/2100] 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 0160/2100] 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 0161/2100] 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 0162/2100] 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 0163/2100] 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 0164/2100] 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 0165/2100] 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 0166/2100] 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 0167/2100] 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 0168/2100] 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 0169/2100] 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 0170/2100] 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 0171/2100] 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 0172/2100] 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 0173/2100] 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 0174/2100] 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 0175/2100] 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 0176/2100] 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 0177/2100] 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 0178/2100] 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 0179/2100] 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 0180/2100] 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 0181/2100] 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 0182/2100] 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 0183/2100] 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 0184/2100] 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 0185/2100] 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 0186/2100] 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 0187/2100] 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 0188/2100] 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 0189/2100] 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 0190/2100] 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 0191/2100] 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 0192/2100] 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 0193/2100] 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 0194/2100] 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 0195/2100] 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 0196/2100] 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 0197/2100] 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 0198/2100] 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 0199/2100] 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 0200/2100] 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 0201/2100] 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 0202/2100] 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 0203/2100] 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 0204/2100] 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 0205/2100] 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 0206/2100] 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 0207/2100] 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 0208/2100] 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 0209/2100] 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 0210/2100] 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 0211/2100] 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 0212/2100] 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 0213/2100] 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 0214/2100] 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 0215/2100] 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 0216/2100] 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 0217/2100] 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 0218/2100] 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 0219/2100] 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 0220/2100] 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 0221/2100] 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 0222/2100] 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 0223/2100] 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 0224/2100] 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 0225/2100] 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 0226/2100] 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 0227/2100] 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 0228/2100] 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 0229/2100] 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 0230/2100] 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 0231/2100] 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 0232/2100] 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 0233/2100] 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 0234/2100] 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 0235/2100] 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 0236/2100] 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 0237/2100] 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 0238/2100] 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 0239/2100] 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 0240/2100] 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 0241/2100] 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 0242/2100] 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 0243/2100] 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 0244/2100] 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 0245/2100] 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 0246/2100] 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 0247/2100] 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 0248/2100] 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 0249/2100] 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 0250/2100] 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 0251/2100] 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 0252/2100] 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 0253/2100] 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 0254/2100] 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 0255/2100] 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 0256/2100] 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 0257/2100] 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 0258/2100] 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 0259/2100] 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 0260/2100] 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 0261/2100] 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 0262/2100] 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 0263/2100] 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 0264/2100] 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 0265/2100] 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 0266/2100] 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 0267/2100] 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 0268/2100] 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 0269/2100] 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 0270/2100] 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 0271/2100] 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 0272/2100] 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 0273/2100] 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 0274/2100] 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 0275/2100] 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 0276/2100] 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 0277/2100] 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 0278/2100] 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 0279/2100] 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 0280/2100] 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 0281/2100] 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 0282/2100] 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 0283/2100] 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 0284/2100] 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 0285/2100] 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 0286/2100] 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 0287/2100] 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 0288/2100] 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 0289/2100] 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 0290/2100] 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 0291/2100] 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 0292/2100] 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 0293/2100] 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 0294/2100] 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 0295/2100] 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 0296/2100] 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 0297/2100] 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 0298/2100] 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 0299/2100] 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 0300/2100] 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 0301/2100] 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 0302/2100] 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 0303/2100] 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 0304/2100] 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 0305/2100] 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 0306/2100] 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 0307/2100] 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 0308/2100] 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 0309/2100] 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 0310/2100] 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 0311/2100] 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 0312/2100] 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 0313/2100] 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 0314/2100] 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 0315/2100] 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 0316/2100] 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 0317/2100] 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 0318/2100] 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 0319/2100] 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 0320/2100] 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 0321/2100] 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 0322/2100] 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 0323/2100] 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 0324/2100] 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 0325/2100] 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 0326/2100] 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 0327/2100] 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 0328/2100] 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 0329/2100] 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 0330/2100] 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 0331/2100] 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 0332/2100] 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 0333/2100] 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 0334/2100] 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 0335/2100] 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 0336/2100] 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 0337/2100] 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 0338/2100] 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 0339/2100] 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 0340/2100] 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 0341/2100] 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 0342/2100] 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 0343/2100] 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 0344/2100] 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 0345/2100] 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 0346/2100] 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 0347/2100] 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 0348/2100] 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 0349/2100] 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 0350/2100] 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 0351/2100] 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 0352/2100] 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 0353/2100] 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 0354/2100] 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 0355/2100] 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 0356/2100] 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 0357/2100] 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 0358/2100] 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 0359/2100] 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 0360/2100] 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 0361/2100] 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 0362/2100] 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 0363/2100] 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 0364/2100] 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 0365/2100] 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 0366/2100] 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 0367/2100] 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 0368/2100] 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 0369/2100] 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 0370/2100] 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 0371/2100] 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 0372/2100] 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 0373/2100] 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 0374/2100] 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 0375/2100] 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 0376/2100] 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 0377/2100] 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 0378/2100] 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 0379/2100] 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 0380/2100] 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 0381/2100] 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 0382/2100] 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 0383/2100] 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 0384/2100] 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 0385/2100] 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 0386/2100] 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 0387/2100] 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 0388/2100] 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 0389/2100] 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 0390/2100] 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 0391/2100] 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 0392/2100] 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 0393/2100] 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 0394/2100] 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 0395/2100] 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 0396/2100] 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 0397/2100] 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 0398/2100] 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 0399/2100] 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 0400/2100] 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 0401/2100] 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 0402/2100] 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 0403/2100] 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 0404/2100] 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 0405/2100] 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 0406/2100] 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 0407/2100] 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 0408/2100] 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 0409/2100] 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 0410/2100] 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 0411/2100] 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 0412/2100] 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 0413/2100] 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 0414/2100] 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 0415/2100] 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 0416/2100] 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 0417/2100] 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 0418/2100] 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 0419/2100] 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 0420/2100] 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 0421/2100] 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 0422/2100] 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 0423/2100] 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 0424/2100] 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 0425/2100] 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 0426/2100] 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 0427/2100] 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 0428/2100] 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 0429/2100] 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 0430/2100] 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 0431/2100] 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 0432/2100] 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 0433/2100] 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 0434/2100] 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 0435/2100] 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 0436/2100] 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 0437/2100] 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 0438/2100] 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 0439/2100] 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 0440/2100] 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 0441/2100] 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 0442/2100] 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 0443/2100] 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 0444/2100] 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 0445/2100] 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 0446/2100] 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 0447/2100] 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 0448/2100] 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 0449/2100] 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 0450/2100] 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 0451/2100] 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 0452/2100] 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 0453/2100] 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 0454/2100] 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 0455/2100] 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 0456/2100] 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 0457/2100] 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 0458/2100] 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 0459/2100] 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 0460/2100] 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 0461/2100] 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 0462/2100] 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 0463/2100] 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 0464/2100] 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 0465/2100] 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 0466/2100] 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 0467/2100] 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 0468/2100] 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 0469/2100] 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 0470/2100] 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 0471/2100] 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 0472/2100] 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 0473/2100] 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 0474/2100] 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 0475/2100] 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 0476/2100] 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 0477/2100] 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 0478/2100] 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 0479/2100] 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 0480/2100] 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 0481/2100] 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 0482/2100] 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 0483/2100] 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 0484/2100] 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 0485/2100] 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 0486/2100] 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 0487/2100] 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 0488/2100] 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 0489/2100] 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 0490/2100] 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 0491/2100] 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 5d5e6a5ab750f380393a9c6ffd9cd3028e486f1f Mon Sep 17 00:00:00 2001
From: Hydria <liverpol2222@gmail.com>
Date: Mon, 3 Jul 2023 17:45:30 +0100
Subject: [PATCH 0492/2100] Finalised LN Adjustment Values

Spent a couple days discussing this on the pp rework server about values that were the most acceptable, these seemed to be the best from the community standpoint of top players.
Note: This is more to fix issues with the current system, not to be a final solution.
Related Google Sheets Page: https://docs.google.com/spreadsheets/d/1P0AxfdKvMHwWBQder4ZkFGO1fC9eADSGCryA5-UGriU/edit?usp=sharing
---
 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 06c825e37d..0a4fec3a70 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
     {
         private const double individual_decay_base = 0.125;
         private const double overall_decay_base = 0.30;
-        private const double release_threshold = 24;
+        private const double release_threshold = 30;
 
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 1;
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
             // 0.0 +--------+-+---------------> Release Difference / ms
             //         release_threshold
             if (isOverlapping)
-                holdAddition = 1 / (1 + Math.Exp(0.5 * (release_threshold - closestEndTime)));
+                holdAddition = 1 / (1 + Math.Exp(0.27 * (release_threshold - closestEndTime)));
 
             // Decay and increase individualStrains in own column
             individualStrains[column] = applyDecay(individualStrains[column], startTime - startTimes[column], individual_decay_base);

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 0493/2100] 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 0494/2100] 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 0495/2100] 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 0496/2100] 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 0497/2100] 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 0498/2100] 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 0499/2100] 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 0500/2100] `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 0501/2100] 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 0502/2100] 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 0503/2100] 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 0504/2100] 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 0505/2100] 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 0506/2100] 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 0507/2100] 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 0508/2100] 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 0509/2100] 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 0510/2100] 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 0511/2100] 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 0512/2100] 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 0513/2100] 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 0514/2100] 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 0515/2100] 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 0516/2100] 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 0517/2100] 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 0518/2100] 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 0519/2100] 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 0520/2100] 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 0521/2100] 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 0522/2100] 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 0523/2100] 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 0524/2100] 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 0525/2100] 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 0526/2100] 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 0527/2100] 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 0528/2100] 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 0529/2100] 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 0530/2100] 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 0531/2100] 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 0532/2100] 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 0533/2100] 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 0534/2100] 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 0535/2100] 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 0536/2100] 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 0537/2100] 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 0538/2100] 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 0539/2100] 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 0540/2100] 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 0541/2100] 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 0542/2100] 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 0543/2100] 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 0544/2100] 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 0545/2100] 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 0546/2100] 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 0547/2100] 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 0548/2100] 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 0549/2100] 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 0550/2100] 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 0551/2100] 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 0552/2100] 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 0553/2100] 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 0554/2100] 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 0555/2100] 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 0556/2100] 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 0557/2100] 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 0558/2100] 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 0559/2100] 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 0560/2100] 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 0561/2100] 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 0562/2100] 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 0563/2100] 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 0564/2100] 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 0565/2100] 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 0566/2100] 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 0567/2100] 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 0568/2100] 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 0569/2100] 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 0570/2100] 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 0571/2100] 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 0572/2100] 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 0573/2100] 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 0574/2100] 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 0575/2100] 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 0576/2100] 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 0577/2100] 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 0578/2100] 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 0579/2100] 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 0580/2100] 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 0581/2100] 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 0582/2100] 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 0583/2100] 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 0584/2100] 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 0585/2100] 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 0586/2100] 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 0587/2100] 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 0588/2100] 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 0589/2100] 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 0590/2100] 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 0591/2100] 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 0592/2100] 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 0593/2100] 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 0594/2100] 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 0595/2100] 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 0596/2100] 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 0597/2100] 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 0598/2100] 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 0599/2100] 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 0600/2100] 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 0601/2100] 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 0602/2100] 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 0603/2100] 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 0604/2100] 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 0605/2100] 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 0606/2100] 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 0607/2100] 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 0608/2100] 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 0609/2100] 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 0610/2100] 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 0611/2100] 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 0612/2100] 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 0613/2100] 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 0614/2100] 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 0615/2100] 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 0616/2100] 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 0617/2100] 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 0618/2100] 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 0619/2100] 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 0620/2100] 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 0621/2100] 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 0622/2100] 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 0623/2100] 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 0624/2100] 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 0625/2100] 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 0626/2100] 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 0627/2100] 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 0628/2100] 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 0629/2100] 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 0630/2100] 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 0631/2100] 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 0632/2100] 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 0633/2100] 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 0634/2100] 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 0635/2100] 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 0636/2100] 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 0637/2100] 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 0638/2100] 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 0639/2100] 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 0640/2100] 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 0641/2100] 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 0642/2100] 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 0643/2100] 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 0644/2100] 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 0645/2100] 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 0646/2100] 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 0647/2100] 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 0648/2100] 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 0649/2100] 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 0650/2100] 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 0651/2100] 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 0652/2100] 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 0653/2100] 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 0654/2100] 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 0655/2100] 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 0656/2100] 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 0657/2100] 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 0658/2100] 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 0659/2100] 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 0660/2100] 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 0661/2100] 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 0662/2100] 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 0663/2100] 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 0664/2100] 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 0665/2100] 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 0666/2100] 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 0667/2100] 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 0668/2100] 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 0669/2100] 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 0670/2100] 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 0671/2100] 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 0672/2100] 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 0673/2100] 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 0674/2100] 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 0675/2100] 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 0676/2100] 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 0677/2100] 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 0678/2100] 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 0679/2100] 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 0680/2100] 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 0681/2100] 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 0682/2100] 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 0683/2100] 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 0684/2100] 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 0685/2100] 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 0686/2100] 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 0687/2100] 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 0688/2100] 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 0689/2100] 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 0690/2100] 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 0691/2100] 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 0692/2100] 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 0693/2100] 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 0694/2100] 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 0695/2100] 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 0696/2100] 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 0697/2100] 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 0698/2100] 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 0699/2100] 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 0700/2100] 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 0701/2100] 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 0702/2100] 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 0703/2100] 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 0704/2100] 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 0705/2100] 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 0706/2100] 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 0707/2100] 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 0708/2100] 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 0709/2100] 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 0710/2100] 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 0711/2100] 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 0712/2100] 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 0713/2100] 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 0714/2100] 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 0715/2100] 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 0716/2100] 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 0717/2100] 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 0718/2100] 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 0719/2100] 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 0720/2100] 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 0721/2100] 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 0722/2100] 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 0723/2100] 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 0724/2100] 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 0725/2100] 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 0726/2100] 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 0727/2100] 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 0728/2100] 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 0729/2100] 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 0730/2100] 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 0731/2100] 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 0732/2100] 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 0733/2100] 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 0734/2100] 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 0735/2100] 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 0736/2100] 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 768d7b5e1c30329280447dc452fde063b6e440b3 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Mon, 17 Jul 2023 23:31:21 -0400
Subject: [PATCH 0737/2100] correct implementation of stable notelock

---
 .../TestSceneHitCircle.cs                     |  2 +-
 .../Objects/Drawables/DrawableHitCircle.cs    |  7 ++-
 .../Objects/Drawables/DrawableOsuHitObject.cs | 10 ++--
 .../Objects/Drawables/DrawableSliderHead.cs   |  3 +-
 osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs |  2 +-
 osu.Game.Rulesets.Osu/UI/ClickAction.cs       | 18 +++++++
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs        |  2 +-
 .../UI/ObjectOrderedHitPolicy.cs              | 53 ++++++++++---------
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  2 +-
 .../UI/StartTimeOrderedHitPolicy.cs           |  8 +--
 osu.Game/Rulesets/UI/HitObjectContainer.cs    |  2 +-
 osu.Game/Rulesets/UI/IHitObjectContainer.cs   |  2 +-
 12 files changed, 72 insertions(+), 39 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/UI/ClickAction.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index 0314afc1ac..c818a361df 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (auto && !userTriggered && timeOffset > hitOffset && CheckHittable?.Invoke(this, Time.Current) != false)
+                if (auto && !userTriggered && timeOffset > hitOffset && CheckHittable?.Invoke(this, Time.Current) == ClickAction.Hit)
                 {
                     // force success
                     ApplyResult(r => r.Type = HitResult.Great);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 3458069dd1..09d818def8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osuTK;
@@ -154,13 +155,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             var result = ResultFor(timeOffset);
+            var clickAction = CheckHittable?.Invoke(this, Time.Current);
 
-            if (result == HitResult.None || CheckHittable?.Invoke(this, Time.Current) == false)
+            if (clickAction == ClickAction.Shake || (result == HitResult.None && clickAction != ClickAction.Ignore))
             {
                 Shake();
                 return;
             }
 
+            if (result == HitResult.None)
+                return;
+
             ApplyResult(r =>
             {
                 var circleResult = (OsuHitCircleJudgementResult)r;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index df0ba344d8..a8ce2118c8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Rulesets.Osu.UI;
 using osuTK;
 using osuTK.Graphics;
 
@@ -30,10 +31,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override float SamplePlaybackPosition => CalculateDrawableRelativePosition(this);
 
         /// <summary>
-        /// Whether this <see cref="DrawableOsuHitObject"/> can be hit, given a time value.
-        /// If non-null, judgements will be ignored (resulting in a shake) whilst the function returns false.
+        /// What action this <see cref="DrawableOsuHitObject"/> should take in response to a
+        /// click at the given time value.
+        /// If non-null, judgements will be ignored for return values of <see cref="ClickAction.Ignore"/>
+        /// and <see cref="ClickAction.Shake"/>, and this hit object will be shaken for return values of
+        /// <see cref="ClickAction.Shake"/>.
         /// </summary>
-        public Func<DrawableHitObject, double, bool> CheckHittable;
+        public Func<DrawableHitObject, double, ClickAction> CheckHittable;
 
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index b8a1efabe0..a4cf69ee31 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -8,6 +8,7 @@ using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -60,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             pathVersion.BindTo(DrawableSlider.PathVersion);
 
-            CheckHittable = (d, t) => DrawableSlider.CheckHittable?.Invoke(d, t) ?? true;
+            CheckHittable = (d, t) => DrawableSlider.CheckHittable?.Invoke(d, t) ?? ClickAction.Hit;
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
index afa54c2dfb..7503c43e0b 100644
--- a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
-        public bool IsHittable(DrawableHitObject hitObject, double time) => true;
+        public ClickAction CheckHittable(DrawableHitObject hitObject, double time) => ClickAction.Hit;
 
         public void HandleHit(DrawableHitObject hitObject)
         {
diff --git a/osu.Game.Rulesets.Osu/UI/ClickAction.cs b/osu.Game.Rulesets.Osu/UI/ClickAction.cs
new file mode 100644
index 0000000000..2b00f5acce
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/ClickAction.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.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    /// <summary>
+    /// An action that an <see cref="IHitPolicy"/> recommends be taken in response to a click
+    /// on a <see cref="DrawableOsuHitObject"/>.
+    /// </summary>
+    public enum ClickAction
+    {
+        Ignore,
+        Shake,
+        Hit
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
index b509796742..9820b8c188 100644
--- a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.UI
         /// <param name="hitObject">The <see cref="DrawableHitObject"/> to check.</param>
         /// <param name="time">The time to check.</param>
         /// <returns>Whether <paramref name="hitObject"/> can be hit at the given <paramref name="time"/>.</returns>
-        bool IsHittable(DrawableHitObject hitObject, double time);
+        ClickAction CheckHittable(DrawableHitObject hitObject, double time);
 
         /// <summary>
         /// Handles a <see cref="HitObject"/> being hit.
diff --git a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
index 6330208d37..07942954e1 100644
--- a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
@@ -3,8 +3,7 @@
 
 #nullable disable
 
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -22,35 +21,41 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
-        public bool IsHittable(DrawableHitObject hitObject, double time) => enumerateHitObjectsUpTo(hitObject.HitObject.StartTime).All(obj => obj.AllJudged);
-
         public void HandleHit(DrawableHitObject hitObject)
         {
         }
 
-        private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
+        public ClickAction CheckHittable(DrawableHitObject hitObject, double time)
         {
-            foreach (var obj in HitObjectContainer.AliveObjects)
+            int index = HitObjectContainer.AliveObjects.IndexOf(hitObject);
+
+            if (index > 0)
             {
-                if (obj.HitObject.StartTime >= targetTime)
-                    yield break;
-
-                switch (obj)
-                {
-                    case DrawableSpinner:
-                        continue;
-
-                    case DrawableSlider slider:
-                        yield return slider.HeadCircle;
-
-                        break;
-
-                    default:
-                        yield return obj;
-
-                        break;
-                }
+                var previousHitObject = (DrawableOsuHitObject)HitObjectContainer.AliveObjects[index - 1];
+                if (previousHitObject.HitObject.StackHeight > 0 && !previousHitObject.AllJudged)
+                    return ClickAction.Ignore;
             }
+
+            foreach (DrawableHitObject testObject in HitObjectContainer.AliveObjects)
+            {
+                if (testObject.AllJudged)
+                    continue;
+
+                // if we found the object being checked, we can move on to the final timing test.
+                if (testObject == hitObject)
+                    break;
+
+                // for all other objects, we check for validity and block the hit if any are still valid.
+                // 3ms of extra leniency to account for slightly unsnapped objects.
+                if (testObject.HitObject.GetEndTime() + 3 < hitObject.HitObject.StartTime)
+                    return ClickAction.Shake;
+            }
+
+            // stable has `const HitObjectManager.HITTABLE_RANGE = 400;`, which is only used for notelock code.
+            // probably not a coincidence that this is equivalent to lazer's OsuHitWindows.MISS_WINDOW.
+
+            // TODO stable compares to 200 when autopilot is enabled, instead of 400.
+            return Math.Abs(hitObject.HitObject.StartTime - time) < 400 ? ClickAction.Hit : ClickAction.Shake;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index ed02284a4b..15ca0a90de 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override void OnNewDrawableHitObject(DrawableHitObject drawable)
         {
-            ((DrawableOsuHitObject)drawable).CheckHittable = hitPolicy.IsHittable;
+            ((DrawableOsuHitObject)drawable).CheckHittable = hitPolicy.CheckHittable;
 
             Debug.Assert(!drawable.IsLoaded, $"Already loaded {nameof(DrawableHitObject)} is added to {nameof(OsuPlayfield)}");
             drawable.OnLoadComplete += onDrawableHitObjectLoaded;
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index edc3ba0818..f33ca58aef 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
-        public bool IsHittable(DrawableHitObject hitObject, double time)
+        public ClickAction CheckHittable(DrawableHitObject hitObject, double time)
         {
             DrawableHitObject blockingObject = null;
 
@@ -36,13 +36,13 @@ namespace osu.Game.Rulesets.Osu.UI
 
             // If there is no previous hitobject, allow the hit.
             if (blockingObject == null)
-                return true;
+                return ClickAction.Hit;
 
             // A hit is allowed if:
             // 1. The last blocking hitobject has been judged.
             // 2. The current time is after the last hitobject's start time.
             // Hits at exactly the same time as the blocking hitobject are allowed for maps that contain simultaneous hitobjects (e.g. /b/372245).
-            return blockingObject.Judged || time >= blockingObject.HitObject.StartTime;
+            return (blockingObject.Judged || time >= blockingObject.HitObject.StartTime) ? ClickAction.Hit : ClickAction.Shake;
         }
 
         public void HandleHit(DrawableHitObject hitObject)
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
 
-            if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
+            if (CheckHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset) != ClickAction.Hit)
                 throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
 
             // Miss all hitobjects prior to the hit one.
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 099be486b3..454a83bcda 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.UI
     {
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
-        public IEnumerable<DrawableHitObject> AliveObjects => AliveEntries.Select(pair => pair.Drawable).OrderBy(h => h.HitObject.StartTime);
+        public IList<DrawableHitObject> AliveObjects => AliveEntries.Select(pair => pair.Drawable).OrderBy(h => h.HitObject.StartTime).ToList();
 
         /// <summary>
         /// Invoked when a <see cref="DrawableHitObject"/> is judged.
diff --git a/osu.Game/Rulesets/UI/IHitObjectContainer.cs b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
index 6dcb0944be..bb4806206d 100644
--- a/osu.Game/Rulesets/UI/IHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
@@ -19,6 +19,6 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="IHitObjectContainer"/> uses pooled objects, this is equivalent to <see cref="Objects"/>.
         /// </remarks>
-        IEnumerable<DrawableHitObject> AliveObjects { get; }
+        IList<DrawableHitObject> AliveObjects { get; }
     }
 }

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 0738/2100] 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 0739/2100] 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 0740/2100] 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 0741/2100] 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 0742/2100] 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 0743/2100] 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 0744/2100] 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 0745/2100] 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 0746/2100] 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 0747/2100] 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 0748/2100] 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 0749/2100] 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 0750/2100] 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 0751/2100] 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 0752/2100] 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 0753/2100] 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 15af85226ce9c15c6bdb18d1c727cd257683d4e1 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 19 Jul 2023 02:06:29 -0400
Subject: [PATCH 0754/2100] adjust test for correct stable notelock

stable actually allows for hitobjs to be hit in the middle of sliders, as long as it doesn't interfere with the end time of the slider.
---
 .../TestSceneObjectOrderedHitPolicy.cs                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index ee70441688..be2affa50f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -213,10 +213,10 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         /// <summary>
-        /// Tests clicking a future circle after a slider's start time, but hitting all slider ticks.
+        /// Tests clicking a future circle after a slider's start time, but hitting the slider head and all slider ticks.
         /// </summary>
         [Test]
-        public void TestMissSliderHeadAndHitAllSliderTicks()
+        public void TestHitCircleBeforeSliderHead()
         {
             const double time_slider = 1500;
             const double time_circle = 1510;
@@ -248,7 +248,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Time = time_slider + 10, Position = positionSlider, Actions = { OsuAction.RightButton } }
             });
 
-            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Great);
             addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);

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 0755/2100] 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 0756/2100] 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 0757/2100] 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 0758/2100] 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 0759/2100] 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 0760/2100] 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 0761/2100] 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 0762/2100] 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 0763/2100] 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 0764/2100] 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 0765/2100] 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 0766/2100] 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 0767/2100] 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 0768/2100] 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 0769/2100] 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 2c97ac74107c975f8f37e6a840caff06bef08fc8 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 19 Jul 2023 14:28:04 -0400
Subject: [PATCH 0770/2100] convert AliveObjects to list in hit policy instead
 of globally

---
 osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs | 8 +++++---
 osu.Game/Rulesets/UI/HitObjectContainer.cs         | 2 +-
 osu.Game/Rulesets/UI/IHitObjectContainer.cs        | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
index 07942954e1..172e5a39d8 100644
--- a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Linq;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -27,16 +28,17 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public ClickAction CheckHittable(DrawableHitObject hitObject, double time)
         {
-            int index = HitObjectContainer.AliveObjects.IndexOf(hitObject);
+            var aliveObjects = HitObjectContainer.AliveObjects.ToList();
+            int index = aliveObjects.IndexOf(hitObject);
 
             if (index > 0)
             {
-                var previousHitObject = (DrawableOsuHitObject)HitObjectContainer.AliveObjects[index - 1];
+                var previousHitObject = (DrawableOsuHitObject)aliveObjects[index - 1];
                 if (previousHitObject.HitObject.StackHeight > 0 && !previousHitObject.AllJudged)
                     return ClickAction.Ignore;
             }
 
-            foreach (DrawableHitObject testObject in HitObjectContainer.AliveObjects)
+            foreach (DrawableHitObject testObject in aliveObjects)
             {
                 if (testObject.AllJudged)
                     continue;
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 454a83bcda..099be486b3 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.UI
     {
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
-        public IList<DrawableHitObject> AliveObjects => AliveEntries.Select(pair => pair.Drawable).OrderBy(h => h.HitObject.StartTime).ToList();
+        public IEnumerable<DrawableHitObject> AliveObjects => AliveEntries.Select(pair => pair.Drawable).OrderBy(h => h.HitObject.StartTime);
 
         /// <summary>
         /// Invoked when a <see cref="DrawableHitObject"/> is judged.
diff --git a/osu.Game/Rulesets/UI/IHitObjectContainer.cs b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
index bb4806206d..6dcb0944be 100644
--- a/osu.Game/Rulesets/UI/IHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
@@ -19,6 +19,6 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="IHitObjectContainer"/> uses pooled objects, this is equivalent to <see cref="Objects"/>.
         /// </remarks>
-        IList<DrawableHitObject> AliveObjects { get; }
+        IEnumerable<DrawableHitObject> AliveObjects { get; }
     }
 }

From 6a8123029854e79f9124ea90f88c41e0245fda16 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 19 Jul 2023 14:44:28 -0400
Subject: [PATCH 0771/2100] rename ObjectOrderedHitPolicy to LegacyHitPolicy

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs                     | 2 +-
 .../UI/{ObjectOrderedHitPolicy.cs => LegacyHitPolicy.cs}        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Rulesets.Osu/UI/{ObjectOrderedHitPolicy.cs => LegacyHitPolicy.cs} (97%)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 250d97c537..229f80c2bd 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             var osuRuleset = (DrawableOsuRuleset)drawableRuleset;
 
             if (ClassicNoteLock.Value)
-                osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
+                osuRuleset.Playfield.HitPolicy = new LegacyHitPolicy();
 
             usingHiddenFading = drawableRuleset.Mods.OfType<OsuModHidden>().SingleOrDefault()?.OnlyFadeApproachCircles.Value == false;
         }
diff --git a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
similarity index 97%
rename from osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
rename to osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
index 172e5a39d8..c35d4a1b56 100644
--- a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// Hits will be blocked until the previous <see cref="HitObject"/>s have been judged.
     /// </remarks>
     /// </summary>
-    public class ObjectOrderedHitPolicy : IHitPolicy
+    public class LegacyHitPolicy : IHitPolicy
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 

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 0772/2100] 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 0773/2100] 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 0774/2100] 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 0775/2100] 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 0776/2100] 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 0777/2100] 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 0778/2100] 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 0779/2100] 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 0780/2100] 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 0781/2100] 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 0782/2100] 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 0783/2100] 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 0784/2100] 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 0785/2100] 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 0786/2100] 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 0787/2100] 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 0788/2100] 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 0789/2100] 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 0790/2100] 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 0791/2100] 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 0792/2100] 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 0793/2100] 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 0794/2100] 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 0795/2100] 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 0796/2100] 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 0797/2100] 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 0798/2100] 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 0799/2100] 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 0800/2100] 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 0801/2100] 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 0802/2100] 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 0803/2100] 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 0804/2100] 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 0805/2100] 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 0806/2100] 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 0807/2100] 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 0808/2100] 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 0809/2100] 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 0810/2100] 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 0811/2100] 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 0812/2100] 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 0813/2100] 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 0814/2100] 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 0815/2100] 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 0816/2100] 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 0817/2100] 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 0818/2100] 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 0819/2100] 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 0820/2100] 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 0821/2100] 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 0822/2100] 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 0823/2100] 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 0824/2100] 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 0825/2100] 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 ef2134a92a32f0607d0f69bc04c8dbfd2a477acd Mon Sep 17 00:00:00 2001
From: Hydria <liverpol2222@gmail.com>
Date: Sat, 22 Jul 2023 10:45:48 +0100
Subject: [PATCH 0826/2100] Fix issue with processing LN orders

Related Issue: https://github.com/ppy/osu/issues/22756

The trigger in question happens when
(1) in a chord: a longer LN, then a shorter LN is processed respectively.
(2) in a chord: a long LN, then a note is processed respectively.

however, given the opposite processing step, it will fail to trigger.

We observe that both situations have the same pattern, however has undeterministic results, which only depends on the order the mapper placed each note.
---
 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 0a4fec3a70..7d8d010da0 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -53,7 +53,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
                 isOverlapping |= Precision.DefinitelyBigger(endTimes[i], startTime, 1) && Precision.DefinitelyBigger(endTime, endTimes[i], 1);
 
                 // We give a slight bonus to everything if something is held meanwhile
-                if (Precision.DefinitelyBigger(endTimes[i], endTime, 1))
+                if (Precision.DefinitelyBigger(endTimes[i], endTime, 1) &&
+                    Precision.DefinitelyBigger(startTime, startTimes[i], 1))
                     holdFactor = 1.25;
 
                 closestEndTime = Math.Min(closestEndTime, Math.Abs(endTime - endTimes[i]));

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 0827/2100] 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 0828/2100] 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 0829/2100] 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 0830/2100] 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 0831/2100] 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 0832/2100] 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 1e19def1538d718421e4d7c6802045011616d21e Mon Sep 17 00:00:00 2001
From: Hydria <liverpol2222@gmail.com>
Date: Sat, 22 Jul 2023 16:44:01 +0100
Subject: [PATCH 0833/2100] 2nd fix to cover all scenarios

---
 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 7d8d010da0..a24fcaad8d 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -50,7 +50,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
             for (int i = 0; i < endTimes.Length; ++i)
             {
                 // The current note is overlapped if a previous note or end is overlapping the current note body
-                isOverlapping |= Precision.DefinitelyBigger(endTimes[i], startTime, 1) && Precision.DefinitelyBigger(endTime, endTimes[i], 1);
+                isOverlapping |= Precision.DefinitelyBigger(endTimes[i], startTime, 1) &&
+                                 Precision.DefinitelyBigger(endTime, endTimes[i], 1) &&
+                                 Precision.DefinitelyBigger(startTime, startTimes[i], 1);
 
                 // We give a slight bonus to everything if something is held meanwhile
                 if (Precision.DefinitelyBigger(endTimes[i], endTime, 1) &&

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 0834/2100] 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 0835/2100] 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 0836/2100] 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 0837/2100] 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 0838/2100] 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 0839/2100] 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 0840/2100] 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 0841/2100] 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 0842/2100] 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 0843/2100] 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 0844/2100] 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 0845/2100] 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 0846/2100] 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 0847/2100] 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 0848/2100] 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 0849/2100] 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 0850/2100] 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 0851/2100] 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 0852/2100] 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 0853/2100] 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 0854/2100] 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 0855/2100] 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 0856/2100] 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 0857/2100] 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 0858/2100] 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 0859/2100] 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 0860/2100] 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 0861/2100] 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 0862/2100] 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 0863/2100] 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 0864/2100] 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 0865/2100] 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 0866/2100] 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 0867/2100] 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 0868/2100] 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 0869/2100] 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 0870/2100] 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 0871/2100] 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 0872/2100] 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 0873/2100] 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 0874/2100] 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 0875/2100] 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 0876/2100] 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 0877/2100] 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 0878/2100] 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 0879/2100] 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 0880/2100] 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 0881/2100] 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 0882/2100] 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 0883/2100] 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 0884/2100] 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 0885/2100] 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 0886/2100] 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 0887/2100] 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 0888/2100] 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 0889/2100] 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 0890/2100] 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 0891/2100] 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 0892/2100] 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 0893/2100] 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 0894/2100] 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 0bd34a4f13eb79a0dba578f5a17c20e872976a09 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 25 Jul 2023 21:14:21 -0700
Subject: [PATCH 0895/2100] Always show supporter-only playlist durations

---
 osu.Game/Localisation/OnlinePlayStrings.cs    | 19 +++++++
 .../Match/Components/RoomSettingsOverlay.cs   |  5 +-
 .../Playlists/PlaylistsRoomSettingsOverlay.cs | 55 +++++++++++++------
 3 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Localisation/OnlinePlayStrings.cs

diff --git a/osu.Game/Localisation/OnlinePlayStrings.cs b/osu.Game/Localisation/OnlinePlayStrings.cs
new file mode 100644
index 0000000000..e9f17cddc0
--- /dev/null
+++ b/osu.Game/Localisation/OnlinePlayStrings.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.Localisation
+{
+    public static class OnlinePlayStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.OnlinePlay";
+
+        /// <summary>
+        /// "This duration is only available for osu!supporters."
+        /// </summary>
+        public static LocalisableString SupporterOnlyDurationNotice => new TranslatableString(getKey(@"supporter_only_duration_notice"), @"This duration is only available for osu!supporters.");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
index 05232fe0e2..916b799d50 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
         protected partial class Section : Container
         {
-            private readonly Container content;
+            private readonly ReverseChildIDFillFlowContainer<Drawable> content;
 
             protected override Container<Drawable> Content => content;
 
@@ -135,10 +135,11 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
                             Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
                             Text = title.ToUpperInvariant(),
                         },
-                        content = new Container
+                        content = new ReverseChildIDFillFlowContainer<Drawable>
                         {
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
+                            Direction = FillDirection.Vertical
                         },
                     },
                 };
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
index e93f56c2e2..c69ccb7b1c 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
@@ -23,6 +23,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osuTK;
+using osu.Game.Localisation;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
@@ -80,6 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             private IBindable<APIUser> localUser = null!;
 
             private readonly Room room;
+            private OsuSpriteText durationNoticeText = null!;
 
             public MatchSettings(Room room)
             {
@@ -141,14 +143,22 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                         },
                                                         new Section("Duration")
                                                         {
-                                                            Child = new Container
+                                                            Children = new Drawable[]
                                                             {
-                                                                RelativeSizeAxes = Axes.X,
-                                                                Height = 40,
-                                                                Child = DurationField = new DurationDropdown
+                                                                new Container
                                                                 {
-                                                                    RelativeSizeAxes = Axes.X
-                                                                }
+                                                                    RelativeSizeAxes = Axes.X,
+                                                                    Height = 40,
+                                                                    Child = DurationField = new DurationDropdown
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X
+                                                                    },
+                                                                },
+                                                                durationNoticeText = new OsuSpriteText
+                                                                {
+                                                                    Alpha = 0,
+                                                                    Colour = colours.Yellow,
+                                                                },
                                                             }
                                                         },
                                                         new Section("Allowed attempts (across all playlist items)")
@@ -305,6 +315,17 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 MaxAttempts.BindValueChanged(count => MaxAttemptsField.Text = count.NewValue?.ToString(), true);
                 Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true);
 
+                DurationField.Current.BindValueChanged(duration =>
+                {
+                    if (selectedAvailableDuration)
+                        durationNoticeText.Hide();
+                    else
+                    {
+                        durationNoticeText.Show();
+                        durationNoticeText.Text = OnlinePlayStrings.SupporterOnlyDurationNotice;
+                    }
+                });
+
                 localUser = api.LocalUser.GetBoundCopy();
                 localUser.BindValueChanged(populateDurations, true);
 
@@ -314,6 +335,10 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
             private void populateDurations(ValueChangedEvent<APIUser> user)
             {
+                // roughly correct (see https://github.com/Humanizr/Humanizer/blob/18167e56c082449cc4fe805b8429e3127a7b7f93/readme.md?plain=1#L427)
+                // if we want this to be more accurate we might consider sending an actual end time, not a time span. probably not required though.
+                const int days_in_month = 31;
+
                 DurationField.Items = new[]
                 {
                     TimeSpan.FromMinutes(30),
@@ -326,18 +351,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     TimeSpan.FromDays(3),
                     TimeSpan.FromDays(7),
                     TimeSpan.FromDays(14),
+                    TimeSpan.FromDays(days_in_month),
+                    TimeSpan.FromDays(days_in_month * 3),
                 };
-
-                // TODO: show these in the interface at all times.
-                if (user.NewValue.IsSupporter)
-                {
-                    // roughly correct (see https://github.com/Humanizr/Humanizer/blob/18167e56c082449cc4fe805b8429e3127a7b7f93/readme.md?plain=1#L427)
-                    // if we want this to be more accurate we might consider sending an actual end time, not a time span. probably not required though.
-                    const int days_in_month = 31;
-
-                    DurationField.AddDropdownItem(TimeSpan.FromDays(days_in_month));
-                    DurationField.AddDropdownItem(TimeSpan.FromDays(days_in_month * 3));
-                }
             }
 
             protected override void Update()
@@ -352,7 +368,10 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             private void onPlaylistChanged(object? sender, NotifyCollectionChangedEventArgs e) =>
                 playlistLength.Text = $"Length: {Playlist.GetTotalDuration()}";
 
-            private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0;
+            private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0
+                                             && selectedAvailableDuration;
+
+            private bool selectedAvailableDuration => DurationField.Current.Value < TimeSpan.FromDays(31) || localUser.Value.IsSupporter;
 
             private void apply()
             {

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 0896/2100] 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 0897/2100] 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 30e0e00c520d8072eb9cfe8fca2c0e2a14fd06e9 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 25 Jul 2023 22:57:01 -0700
Subject: [PATCH 0898/2100] Rename `selectedAvailableDuration` to
 `hasValidDuration`

---
 .../OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
index c69ccb7b1c..f7bd7fc530 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
@@ -317,7 +317,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
                 DurationField.Current.BindValueChanged(duration =>
                 {
-                    if (selectedAvailableDuration)
+                    if (hasValidDuration)
                         durationNoticeText.Hide();
                     else
                     {
@@ -369,9 +369,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 playlistLength.Text = $"Length: {Playlist.GetTotalDuration()}";
 
             private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0
-                                             && selectedAvailableDuration;
+                                             && hasValidDuration;
 
-            private bool selectedAvailableDuration => DurationField.Current.Value < TimeSpan.FromDays(31) || localUser.Value.IsSupporter;
+            private bool hasValidDuration => DurationField.Current.Value < TimeSpan.FromDays(31) || localUser.Value.IsSupporter;
 
             private void apply()
             {

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 0899/2100] 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 0900/2100] 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 0901/2100] 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 c1ba8fe175c9bff9e018f2409fbc3cfa041e4902 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 16:07:45 +0900
Subject: [PATCH 0902/2100] Rename `BackgroundBeatmapProcessor` to
 `BackgroundDataStoreProcessor`

---
 ...orTests.cs => BackgroundDataStoreProcessorTests.cs} |  8 ++++----
 ...mapProcessor.cs => BackgroundDataStoreProcessor.cs} | 10 +++++++---
 osu.Game/OsuGame.cs                                    |  2 +-
 osu.Game/Scoring/ScoreInfo.cs                          |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename osu.Game.Tests/Database/{BackgroundBeatmapProcessorTests.cs => BackgroundDataStoreProcessorTests.cs} (92%)
 rename osu.Game/{BackgroundBeatmapProcessor.cs => BackgroundDataStoreProcessor.cs} (97%)

diff --git a/osu.Game.Tests/Database/BackgroundBeatmapProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
similarity index 92%
rename from osu.Game.Tests/Database/BackgroundBeatmapProcessorTests.cs
rename to osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index c876316be4..15bb0fc09c 100644
--- a/osu.Game.Tests/Database/BackgroundBeatmapProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -15,7 +15,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Database
 {
     [HeadlessTest]
-    public partial class BackgroundBeatmapProcessorTests : OsuTestScene, ILocalUserPlayInfo
+    public partial class BackgroundDataStoreProcessorTests : OsuTestScene, ILocalUserPlayInfo
     {
         public IBindable<bool> IsPlaying => isPlaying;
 
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Database
 
             AddStep("Run background processor", () =>
             {
-                Add(new TestBackgroundBeatmapProcessor());
+                Add(new TestBackgroundDataStoreProcessor());
             });
 
             AddUntilStep("wait for difficulties repopulated", () =>
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Database
 
             AddStep("Run background processor", () =>
             {
-                Add(new TestBackgroundBeatmapProcessor());
+                Add(new TestBackgroundDataStoreProcessor());
             });
 
             AddWaitStep("wait some", 500);
@@ -124,7 +124,7 @@ namespace osu.Game.Tests.Database
             });
         }
 
-        public partial class TestBackgroundBeatmapProcessor : BackgroundBeatmapProcessor
+        public partial class TestBackgroundDataStoreProcessor : BackgroundDataStoreProcessor
         {
             protected override int TimeToSleepDuringGameplay => 10;
         }
diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
similarity index 97%
rename from osu.Game/BackgroundBeatmapProcessor.cs
rename to osu.Game/BackgroundDataStoreProcessor.cs
index b553fee503..c475a07c79 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -24,7 +24,10 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game
 {
-    public partial class BackgroundBeatmapProcessor : Component
+    /// <summary>
+    /// Performs background updating of data stores at startup.
+    /// </summary>
+    public partial class BackgroundDataStoreProcessor : Component
     {
         [Resolved]
         private RulesetStore rulesetStore { get; set; } = null!;
@@ -61,7 +64,8 @@ namespace osu.Game
 
             Task.Factory.StartNew(() =>
             {
-                Logger.Log("Beginning background beatmap processing..");
+                Logger.Log("Beginning background data store processing..");
+
                 checkForOutdatedStarRatings();
                 processBeatmapSetsWithMissingMetrics();
                 processScoresWithMissingStatistics();
@@ -74,7 +78,7 @@ namespace osu.Game
                     return;
                 }
 
-                Logger.Log("Finished background beatmap processing!");
+                Logger.Log("Finished background data store processing!");
             });
         }
 
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1a40bb8e3d..c60bff9e4c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1025,7 +1025,7 @@ namespace osu.Game
 
             loadComponentSingleFile(CreateHighPerformanceSession(), Add);
 
-            loadComponentSingleFile(new BackgroundBeatmapProcessor(), Add);
+            loadComponentSingleFile(new BackgroundDataStoreProcessor(), Add);
 
             Add(difficultyRecommender);
             Add(externalLinkOpener = new ExternalLinkOpener());
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index c6f4433824..a3bbb2c09e 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Scoring
         /// 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.
+        /// See <see cref="BackgroundDataStoreProcessor"/>'s conversion logic.
         /// </summary>
         /// <remarks>
         /// This may not match the version stored in the replay files.

From 30baac0f3db82d4df246c75bb458113be90c210e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 16:08:02 +0900
Subject: [PATCH 0903/2100] Avoid reprocessing scores which already failed an
 upgrade previously

Closes https://github.com/ppy/osu/issues/24301.
---
 osu.Game/BackgroundDataStoreProcessor.cs | 6 ++++--
 osu.Game/Database/RealmAccess.cs         | 3 ++-
 osu.Game/Scoring/ScoreInfo.cs            | 9 +++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index c475a07c79..ae9e9527de 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -186,7 +186,7 @@ namespace osu.Game
 
             realmAccess.Run(r =>
             {
-                foreach (var score in r.All<ScoreInfo>())
+                foreach (var score in r.All<ScoreInfo>().Where(s => !s.TotalScoreUpgradeFailed))
                 {
                     if (score.BeatmapInfo != null
                         && score.Statistics.Sum(kvp => kvp.Value) > 0
@@ -225,6 +225,7 @@ namespace osu.Game
                 catch (Exception e)
                 {
                     Logger.Log(@$"Failed to populate maximum statistics for {id}: {e}");
+                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.TotalScoreUpgradeFailed = true);
                 }
             }
         }
@@ -234,7 +235,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.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
+                                                                             .Where(s => !s.TotalScoreUpgradeFailed && s.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
                                                                              .AsEnumerable().Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
@@ -283,6 +284,7 @@ namespace osu.Game
                 catch (Exception e)
                 {
                     Logger.Log($"Failed to convert total score for {id}: {e}");
+                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.TotalScoreUpgradeFailed = true);
                     ++failedCount;
                 }
             }
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index f32b161bb6..04a4b28fa4 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -82,8 +82,9 @@ namespace osu.Game.Database
         /// 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.
+        /// 33   2023-07-26    Add TotalScoreUpgradeFailed flag to ScoreInfo to track upgrade failures.
         /// </summary>
-        private const int schema_version = 32;
+        private const int schema_version = 33;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index a3bbb2c09e..c3a45332e4 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -81,6 +81,15 @@ namespace osu.Game.Scoring
         /// </remarks>
         public long? LegacyTotalScore { get; set; }
 
+        /// <summary>
+        /// If an reprocess of total score failed to update this score to the latest version, this flag will become <c>true</c>.
+        /// Should be used to ensure we don't repeatedly attempt to update the same scores each startup even though we already know they will fail.
+        /// </summary>
+        /// <remarks>
+        /// See https://github.com/ppy/osu/issues/24301 for one example of how this can occur(missing beatmap file on disk).
+        /// </remarks>
+        public bool TotalScoreUpgradeFailed { get; set; }
+
         public int MaxCombo { get; set; }
 
         public double Accuracy { get; set; }

From a2f1ced5a224e6ff1c239c430be62793b3b24fe0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 16:22:21 +0900
Subject: [PATCH 0904/2100] Add test coverage of failed-to-upgrade flag

---
 .../BackgroundDataStoreProcessorTests.cs      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index 15bb0fc09c..d7ec572026 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -8,6 +8,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Tests.Visual;
@@ -124,6 +127,32 @@ namespace osu.Game.Tests.Database
             });
         }
 
+        [Test]
+        public void TestScoreUpgradeFailed()
+        {
+            ScoreInfo scoreInfo = null!;
+
+            AddStep("Add score which requires upgrade (but has no beatmap)", () =>
+            {
+                Realm.Write(r =>
+                {
+                    r.Add(scoreInfo = new ScoreInfo(ruleset: r.All<RulesetInfo>().First(), beatmap: new BeatmapInfo
+                    {
+                        BeatmapSet = new BeatmapSetInfo(),
+                        Ruleset = r.All<RulesetInfo>().First(),
+                    })
+                    {
+                        TotalScoreVersion = 30000002,
+                        IsLegacyScore = true,
+                    });
+                });
+            });
+
+            AddStep("Run background processor", () => Add(new TestBackgroundDataStoreProcessor()));
+
+            AddUntilStep("Score marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed));
+        }
+
         public partial class TestBackgroundDataStoreProcessor : BackgroundDataStoreProcessor
         {
             protected override int TimeToSleepDuringGameplay => 10;

From 235cb2d73fcc64ffb2c85d1dafb2a03486557276 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 16:28:38 +0900
Subject: [PATCH 0905/2100] Add test coverage of upgrade success for good
 measure

---
 .../BackgroundDataStoreProcessorTests.cs      | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index d7ec572026..23b88b7395 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -127,6 +127,30 @@ namespace osu.Game.Tests.Database
             });
         }
 
+        [Test]
+        public void TestScoreUpgradeSuccess()
+        {
+            ScoreInfo scoreInfo = null!;
+
+            AddStep("Add score which requires upgrade (but has no beatmap)", () =>
+            {
+                Realm.Write(r =>
+                {
+                    r.Add(scoreInfo = new ScoreInfo(ruleset: r.All<RulesetInfo>().First(), beatmap: r.All<BeatmapInfo>().First())
+                    {
+                        TotalScoreVersion = 30000002,
+                        LegacyTotalScore = 123456,
+                        IsLegacyScore = true,
+                    });
+                });
+            });
+
+            AddStep("Run background processor", () => Add(new TestBackgroundDataStoreProcessor()));
+
+            AddUntilStep("Score version upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(LegacyScoreEncoder.LATEST_VERSION));
+            AddAssert("Score not marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed), () => Is.False);
+        }
+
         [Test]
         public void TestScoreUpgradeFailed()
         {
@@ -150,7 +174,8 @@ namespace osu.Game.Tests.Database
 
             AddStep("Run background processor", () => Add(new TestBackgroundDataStoreProcessor()));
 
-            AddUntilStep("Score marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed));
+            AddUntilStep("Score marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed), () => Is.True);
+            AddAssert("Score version not upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(30000002));
         }
 
         public partial class TestBackgroundDataStoreProcessor : BackgroundDataStoreProcessor

From 9d87ff2986f3430b4c44b03d895720f5c8b57bd3 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 26 Jul 2023 01:37:55 -0700
Subject: [PATCH 0906/2100] Improve supporter-only duration notice and fix max
 duration of non-supporter

See https://github.com/ppy/osu-web/blob/3c542292569b336c4dff38e2b52a823149ec1a81/.env.example#L230. Might have more duration options in the future.
---
 osu.Game/Localisation/OnlinePlayStrings.cs                    | 4 ++--
 .../OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Localisation/OnlinePlayStrings.cs b/osu.Game/Localisation/OnlinePlayStrings.cs
index e9f17cddc0..1853cb753a 100644
--- a/osu.Game/Localisation/OnlinePlayStrings.cs
+++ b/osu.Game/Localisation/OnlinePlayStrings.cs
@@ -10,9 +10,9 @@ namespace osu.Game.Localisation
         private const string prefix = @"osu.Game.Resources.Localisation.OnlinePlay";
 
         /// <summary>
-        /// "This duration is only available for osu!supporters."
+        /// "Playlist durations longer than 2 weeks require an active osu!supporter tag."
         /// </summary>
-        public static LocalisableString SupporterOnlyDurationNotice => new TranslatableString(getKey(@"supporter_only_duration_notice"), @"This duration is only available for osu!supporters.");
+        public static LocalisableString SupporterOnlyDurationNotice => new TranslatableString(getKey(@"supporter_only_duration_notice"), @"Playlist durations longer than 2 weeks require an active osu!supporter tag.");
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
index f7bd7fc530..84e419d67a 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
@@ -371,7 +371,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0
                                              && hasValidDuration;
 
-            private bool hasValidDuration => DurationField.Current.Value < TimeSpan.FromDays(31) || localUser.Value.IsSupporter;
+            private bool hasValidDuration => DurationField.Current.Value <= TimeSpan.FromDays(14) || localUser.Value.IsSupporter;
 
             private void apply()
             {

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 0907/2100] 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 0908/2100] 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 0909/2100] 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 0910/2100] 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 0911/2100] 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 0912/2100] 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 0913/2100] 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 0914/2100] 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 0915/2100] 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 0916/2100] 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 0917/2100] 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 0918/2100] 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 0919/2100] 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 0920/2100] 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 06fe5583cb9ecd4915aad3835b09ae732dfc1aff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 15:47:57 +0900
Subject: [PATCH 0921/2100] Expose a new SSDQ from playfield for skinnable area
 bounds

---
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs | 17 +++++++++++++++++
 osu.Game/Rulesets/UI/Playfield.cs            | 11 +++++++++++
 2 files changed, 28 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index e3ebadc836..7b00447238 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
@@ -25,6 +26,22 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly List<Stage> stages = new List<Stage>();
 
+        public override Quad SkinnableComponentScreenSpaceDrawQuad
+        {
+            get
+            {
+                if (Stages.Count == 1)
+                    return Stages.First().ScreenSpaceDrawQuad;
+
+                RectangleF area = RectangleF.Empty;
+
+                foreach (var stage in Stages)
+                    area = RectangleF.Union(area, stage.ScreenSpaceDrawQuad.AABBFloat);
+
+                return area;
+            }
+        }
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => stages.Any(s => s.ReceivePositionalInputAt(screenSpacePos));
 
         public ManiaPlayfield(List<StageDefinition> stageDefinitions)
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 3f263aba63..e9c35555c8 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -23,6 +23,7 @@ using osu.Game.Skinning;
 using osuTK;
 using osu.Game.Rulesets.Objects.Pooling;
 using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics.Primitives;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -94,6 +95,16 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public readonly BindableBool DisplayJudgements = new BindableBool(true);
 
+        /// <summary>
+        /// A screen space draw quad which resembles the edges of the playfield for skinning purposes.
+        /// This will allow users / components to snap objects to the "edge" of the playfield.
+        /// </summary>
+        /// <remarks>
+        /// Rulesets which reduce the visible area further than the full relative playfield space itself
+        /// should retarget this to the ScreenSpaceDrawQuad of the appropriate container.
+        /// </remarks>
+        public virtual Quad SkinnableComponentScreenSpaceDrawQuad => ScreenSpaceDrawQuad;
+
         [Resolved(CanBeNull = true)]
         [CanBeNull]
         protected IReadOnlyList<Mod> Mods { get; private set; }

From 5bd06832d0a4e35bbbd52eea2ffb3970764e6d0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 15:48:40 +0900
Subject: [PATCH 0922/2100] Fix skin component toolbox not working correctly
 for ruleset matching

Until now, the only usage of ruleset layers was where there is both a
ruleset specific and non-ruleset-specific layer present. The matching
code was making assumptions about this.

As I tried to add a new playfield layer which breaks this assumption,
non-ruleset-specifc components were not being displayed in the toolbox.
This turned out to be due to a `target` of `null` being provided due to
the weird `getTarget` matching (that happened to *just* do what we
wanted previously due to the equals implementation, but only because
there was a container without the ruleset present in the available
targets).

I've changed this to be a more appropriate lookup method, where the
target for dependency sourcing is provided separately from the ruleset
filter.
---
 .../Overlays/SkinEditor/SkinComponentToolbox.cs | 17 +++++++++++++----
 osu.Game/Overlays/SkinEditor/SkinEditor.cs      |  4 ++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinComponentToolbox.cs b/osu.Game/Overlays/SkinEditor/SkinComponentToolbox.cs
index 1ce253d67c..a476fc1a6d 100644
--- a/osu.Game/Overlays/SkinEditor/SkinComponentToolbox.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinComponentToolbox.cs
@@ -13,6 +13,7 @@ using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Skinning;
 using osuTK;
@@ -23,14 +24,22 @@ namespace osu.Game.Overlays.SkinEditor
     {
         public Action<Type>? RequestPlacement;
 
-        private readonly SkinComponentsContainer? target;
+        private readonly SkinComponentsContainer target;
+
+        private readonly RulesetInfo? ruleset;
 
         private FillFlowContainer fill = null!;
 
-        public SkinComponentToolbox(SkinComponentsContainer? target = null)
-            : base(target?.Lookup.Ruleset == null ? SkinEditorStrings.Components : LocalisableString.Interpolate($"{SkinEditorStrings.Components} ({target.Lookup.Ruleset.Name})"))
+        /// <summary>
+        /// Create a new component toolbox for the specified taget.
+        /// </summary>
+        /// <param name="target">The target. This is mainly used as a dependency source to find candidate components.</param>
+        /// <param name="ruleset">A ruleset to filter components by. If null, only components which are not ruleset-specific will be included.</param>
+        public SkinComponentToolbox(SkinComponentsContainer target, RulesetInfo? ruleset)
+            : base(ruleset == null ? SkinEditorStrings.Components : LocalisableString.Interpolate($"{SkinEditorStrings.Components} ({ruleset.Name})"))
         {
             this.target = target;
+            this.ruleset = ruleset;
         }
 
         [BackgroundDependencyLoader]
@@ -51,7 +60,7 @@ namespace osu.Game.Overlays.SkinEditor
         {
             fill.Clear();
 
-            var skinnableTypes = SerialisedDrawableInfo.GetAllAvailableDrawables(target?.Lookup.Ruleset);
+            var skinnableTypes = SerialisedDrawableInfo.GetAllAvailableDrawables(ruleset);
             foreach (var type in skinnableTypes)
                 attemptAddComponent(type);
         }
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index 2b23ce290f..67cf0eab18 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -366,14 +366,14 @@ namespace osu.Game.Overlays.SkinEditor
             // If the new target has a ruleset, let's show ruleset-specific items at the top, and the rest below.
             if (target.NewValue.Ruleset != null)
             {
-                componentsSidebar.Add(new SkinComponentToolbox(skinComponentsContainer)
+                componentsSidebar.Add(new SkinComponentToolbox(skinComponentsContainer, target.NewValue.Ruleset)
                 {
                     RequestPlacement = requestPlacement
                 });
             }
 
             // Remove the ruleset from the lookup to get base components.
-            componentsSidebar.Add(new SkinComponentToolbox(getTarget(new SkinComponentsContainerLookup(target.NewValue.Target)))
+            componentsSidebar.Add(new SkinComponentToolbox(skinComponentsContainer, null)
             {
                 RequestPlacement = requestPlacement
             });

From 6cf065f6d1c92ddcdf36efa97fbe4634ee3cd9f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 15:48:21 +0900
Subject: [PATCH 0923/2100] Add playfield layer to skin editor

---
 osu.Game/Screens/Play/HUDOverlay.cs                | 14 ++++++++++++--
 osu.Game/Skinning/SkinComponentsContainerLookup.cs |  5 ++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index d11171e3fe..6696332307 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -12,6 +12,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
 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;
@@ -103,10 +104,11 @@ namespace osu.Game.Screens.Play
 
         private readonly List<Drawable> hideTargets;
 
+        private readonly Drawable playfieldComponents;
+
         public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods, bool alwaysShowLeaderboard = true)
         {
             Drawable rulesetComponents;
-
             this.drawableRuleset = drawableRuleset;
             this.mods = mods;
 
@@ -123,6 +125,9 @@ namespace osu.Game.Screens.Play
                 rulesetComponents = drawableRuleset != null
                     ? new HUDComponentsContainer(drawableRuleset.Ruleset.RulesetInfo) { AlwaysPresent = true, }
                     : Empty(),
+                playfieldComponents = drawableRuleset != null
+                    ? new SkinComponentsContainer(new SkinComponentsContainerLookup(SkinComponentsContainerLookup.TargetArea.Playfield, drawableRuleset.Ruleset.RulesetInfo)) { AlwaysPresent = true, }
+                    : Empty(),
                 topRightElements = new FillFlowContainer
                 {
                     Anchor = Anchor.TopRight,
@@ -162,7 +167,7 @@ namespace osu.Game.Screens.Play
                 },
             };
 
-            hideTargets = new List<Drawable> { mainComponents, rulesetComponents, topRightElements };
+            hideTargets = new List<Drawable> { mainComponents, rulesetComponents, playfieldComponents, topRightElements };
 
             if (!alwaysShowLeaderboard)
                 hideTargets.Add(LeaderboardFlow);
@@ -230,6 +235,11 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
+            Quad playfieldScreenSpaceDrawQuad = drawableRuleset.Playfield.SkinnableComponentScreenSpaceDrawQuad;
+
+            playfieldComponents.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+            playfieldComponents.Size = ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+
             float? lowestTopScreenSpaceLeft = null;
             float? lowestTopScreenSpaceRight = null;
 
diff --git a/osu.Game/Skinning/SkinComponentsContainerLookup.cs b/osu.Game/Skinning/SkinComponentsContainerLookup.cs
index fbc0ab58ad..34358c3f06 100644
--- a/osu.Game/Skinning/SkinComponentsContainerLookup.cs
+++ b/osu.Game/Skinning/SkinComponentsContainerLookup.cs
@@ -68,7 +68,10 @@ namespace osu.Game.Skinning
             MainHUDComponents,
 
             [Description("Song select")]
-            SongSelect
+            SongSelect,
+
+            [Description("Playfield")]
+            Playfield
         }
     }
 }

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 0924/2100] 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 0925/2100] 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 0926/2100] 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 0927/2100] 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 0928/2100] 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 0929/2100] 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 26c128a09323cb0ee00cdb3c93d0463367b2f451 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Fri, 28 Jul 2023 14:39:30 -0400
Subject: [PATCH 0930/2100] added keybind and localization string

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs       | 6 +++++-
 osu.Game/Localisation/GlobalActionKeyBindingStrings.cs | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 01c454e3f9..3d24afbb16 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -116,9 +116,10 @@ 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(InputKey.Tab, GlobalAction.ToggleInGameLeaderboard),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
             new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
-            new KeyBinding(InputKey.Tab, GlobalAction.ToggleChatFocus),
+            new KeyBinding(InputKey.Enter, GlobalAction.ToggleChatFocus),
             new KeyBinding(InputKey.F1, GlobalAction.SaveReplay),
             new KeyBinding(InputKey.F2, GlobalAction.ExportReplay),
         };
@@ -285,6 +286,9 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameInterface))]
         ToggleInGameInterface,
 
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameLeaderboard))]
+        ToggleInGameLeaderboard,
+
         // Song select keybindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleModSelection))]
         ToggleModSelection,
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index f93d86225c..ceefc27968 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -219,6 +219,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ToggleInGameInterface => new TranslatableString(getKey(@"toggle_in_game_interface"), @"Toggle in-game interface");
 
+        /// <summary>
+        /// "Toggle in-game leaderboard"
+        /// </summary>
+        public static LocalisableString ToggleInGameLeaderboard => new TranslatableString(getKey(@"toggle_in_game_leaderboard"), @"Toggle in-game leaderboard");
+
         /// <summary>
         /// "Toggle mod select"
         /// </summary>

From a4065486c198fd49fd538ba779f7e6cfb08fe79e Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Fri, 28 Jul 2023 14:39:41 -0400
Subject: [PATCH 0931/2100] bound bind during gameplay

---
 osu.Game/Screens/Play/HUDOverlay.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index d11171e3fe..9c001b3db3 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -78,6 +78,7 @@ namespace osu.Game.Screens.Play
         public Bindable<bool> ShowHud { get; } = new BindableBool();
 
         private Bindable<HUDVisibilityMode> configVisibilityMode;
+        private Bindable<bool> configLeaderboardVisibility;
         private Bindable<bool> configSettingsOverlay;
 
         private readonly BindableBool replayLoaded = new BindableBool();
@@ -179,6 +180,7 @@ namespace osu.Game.Screens.Play
             ModDisplay.Current.Value = mods;
 
             configVisibilityMode = config.GetBindable<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode);
+            configLeaderboardVisibility = config.GetBindable<bool>(OsuSetting.GameplayLeaderboard);
             configSettingsOverlay = config.GetBindable<bool>(OsuSetting.ReplaySettingsOverlay);
 
             if (configVisibilityMode.Value == HUDVisibilityMode.Never && !hasShownNotificationOnce)
@@ -381,6 +383,10 @@ namespace osu.Game.Screens.Play
                     }
 
                     return true;
+
+                case GlobalAction.ToggleInGameLeaderboard:
+                    configLeaderboardVisibility.Value = !configLeaderboardVisibility.Value;
+                    return true;
             }
 
             return false;

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 0932/2100] 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 0933/2100] 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 0934/2100] 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 aca8310cd1df87a131e1e1dfc7d0bc047101c578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 28 Jul 2023 23:36:57 +0200
Subject: [PATCH 0935/2100] Fix non-compiling test

To be fair, currently the test is a bit pointless (as it has no reason
to be a `SkinnableTestScene`, it gains precisely nothing from it - all
that is shown there is some generic components on song select). But that
is no worse then `master`, so look away for now.
---
 .../Visual/Gameplay/TestSceneSkinEditorComponentsList.cs     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
index 515bc09bbb..b7b2a6c175 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
@@ -8,6 +8,7 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.SkinEditor;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -19,7 +20,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestToggleEditor()
         {
-            AddStep("show available components", () => SetContents(_ => new SkinComponentToolbox
+            var skinComponentsContainer = new SkinComponentsContainer(new SkinComponentsContainerLookup(SkinComponentsContainerLookup.TargetArea.SongSelect));
+
+            AddStep("show available components", () => SetContents(_ => new SkinComponentToolbox(skinComponentsContainer, null)
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,

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 0936/2100] 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 1fd4a6dc96fe5b87ee9c616a2518775a731a765e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Jul 2023 01:07:08 +0200
Subject: [PATCH 0937/2100] Fix tests crashing due to `HUDOverlay` not finding
 `DrawableRuleset` in `Update()`

---
 osu.Game/Screens/Play/HUDOverlay.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 6696332307..536d3ac146 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -70,7 +70,9 @@ namespace osu.Game.Screens.Play
 
         public Bindable<bool> ShowHealthBar = new Bindable<bool>(true);
 
+        [CanBeNull]
         private readonly DrawableRuleset drawableRuleset;
+
         private readonly IReadOnlyList<Mod> mods;
 
         /// <summary>
@@ -106,7 +108,7 @@ namespace osu.Game.Screens.Play
 
         private readonly Drawable playfieldComponents;
 
-        public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods, bool alwaysShowLeaderboard = true)
+        public HUDOverlay([CanBeNull] DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods, bool alwaysShowLeaderboard = true)
         {
             Drawable rulesetComponents;
             this.drawableRuleset = drawableRuleset;
@@ -235,10 +237,13 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            Quad playfieldScreenSpaceDrawQuad = drawableRuleset.Playfield.SkinnableComponentScreenSpaceDrawQuad;
+            if (drawableRuleset != null)
+            {
+                Quad playfieldScreenSpaceDrawQuad = drawableRuleset.Playfield.SkinnableComponentScreenSpaceDrawQuad;
 
-            playfieldComponents.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
-            playfieldComponents.Size = ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+                playfieldComponents.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+                playfieldComponents.Size = ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+            }
 
             float? lowestTopScreenSpaceLeft = null;
             float? lowestTopScreenSpaceRight = null;

From a3301dc7ffb0a6e4958065f8b8210a3b98c1fdc4 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Fri, 28 Jul 2023 23:22:28 -0700
Subject: [PATCH 0938/2100] Fix accuracy break info decimal separator being
 incorrect in certain languages

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index 7261155c94..b8696352e8 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Play.Break
 
         private void currentValueChanged(ValueChangedEvent<T> e)
         {
-            string newText = prefix + Format(e.NewValue);
+            LocalisableString newText = LocalisableString.Interpolate($"{prefix}{Format(e.NewValue)}");
 
             if (valueText.Text == newText)
                 return;

From 8a06914438fd3d1d8bdcc462c5fe196891bee2c7 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 25 Jul 2023 20:50:55 +0900
Subject: [PATCH 0939/2100] remove #nullable disable in tournament

---
 .../NonVisual/LadderInfoSerialisationTest.cs  |  5 +-
 .../Screens/TestSceneLadderEditorScreen.cs    |  2 +-
 .../Screens/TestSceneSeedingEditorScreen.cs   |  3 +-
 .../Screens/TestSceneTeamIntroScreen.cs       |  2 +-
 .../Screens/TestSceneTeamWinScreen.cs         |  2 +-
 .../TournamentTestScene.cs                    |  9 +--
 .../Components/DrawableTeamFlag.cs            | 10 ++-
 .../Components/DrawableTeamTitle.cs           |  8 +--
 .../Components/DrawableTournamentTeam.cs      | 11 ++--
 osu.Game.Tournament/Components/SongBar.cs     |  8 +--
 .../Components/TournamentBeatmapPanel.cs      | 18 +++--
 .../Components/TournamentMatchChatDisplay.cs  |  4 +-
 .../Components/TourneyVideo.cs                |  6 +-
 osu.Game.Tournament/IPC/FileBasedIPC.cs       | 65 +++++++++----------
 osu.Game.Tournament/JsonPointConverter.cs     |  9 +--
 osu.Game.Tournament/Models/LadderInfo.cs      |  6 +-
 osu.Game.Tournament/Models/RoundBeatmap.cs    |  1 -
 osu.Game.Tournament/Models/StableInfo.cs      |  6 +-
 osu.Game.Tournament/Models/TournamentMatch.cs | 22 +++----
 osu.Game.Tournament/Models/TournamentTeam.cs  |  9 ++-
 .../Screens/Drawings/Components/Group.cs      |  4 +-
 .../Components/ScrollingTeamContainer.cs      | 27 ++++----
 .../Components/StorageBackedTeamList.cs       |  6 +-
 .../Components/VisualiserContainer.cs         |  4 +-
 .../Screens/Drawings/DrawingsScreen.cs        | 28 ++++----
 .../Screens/Editors/LadderEditorScreen.cs     | 64 ++++++++----------
 .../Gameplay/Components/MatchHeader.cs        |  8 +--
 .../Gameplay/Components/TeamDisplay.cs        |  2 +-
 .../Gameplay/Components/TeamScoreDisplay.cs   | 24 ++++---
 .../Components/TournamentMatchScoreDisplay.cs |  4 +-
 .../Screens/Gameplay/GameplayScreen.cs        | 36 +++++-----
 .../Ladder/Components/DrawableMatchTeam.cs    | 29 ++++-----
 .../Components/DrawableTournamentMatch.cs     | 28 ++++----
 .../Components/DrawableTournamentRound.cs     |  4 +-
 .../Ladder/Components/LadderEditorSettings.cs | 22 +++----
 .../Ladder/Components/SettingsTeamDropdown.cs |  2 +-
 .../Screens/Ladder/LadderScreen.cs            | 12 ++--
 .../Screens/MapPool/MapPoolScreen.cs          | 38 ++++++-----
 .../Screens/Schedule/ScheduleScreen.cs        | 10 ++-
 .../Screens/Setup/ResolutionSelector.cs       |  6 +-
 .../Screens/Setup/SetupScreen.cs              | 22 +++----
 .../Screens/Setup/StablePathSelectScreen.cs   | 12 ++--
 .../Screens/Setup/TournamentSwitcher.cs       | 10 ++-
 .../Screens/Showcase/ShowcaseScreen.cs        |  2 +-
 .../Screens/TeamIntro/SeedingScreen.cs        | 22 +++----
 .../Screens/TeamIntro/TeamIntroScreen.cs      |  6 +-
 .../Screens/TeamWin/TeamWinScreen.cs          | 12 ++--
 .../Screens/TournamentMatchScreen.cs          |  8 +--
 osu.Game.Tournament/TournamentGame.cs         |  8 +--
 osu.Game.Tournament/TournamentGameBase.cs     | 29 +++++----
 osu.Game.Tournament/TournamentSceneManager.cs | 20 +++---
 51 files changed, 333 insertions(+), 382 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs b/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
index 962a6fbd6c..d18651b8bb 100644
--- a/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
@@ -3,6 +3,7 @@
 
 using Newtonsoft.Json;
 using NUnit.Framework;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Tests.NonVisual
@@ -35,8 +36,8 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 PlayersPerTeam = { Value = 4 },
                 Teams =
                 {
-                    match.Team1.Value,
-                    match.Team2.Value,
+                    match.Team1.Value.AsNonNull(),
+                    match.Team2.Value.AsNonNull(),
                 },
                 Rounds =
                 {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
index 29ecdaf873..b9b150d264 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Tournament.Tests.Screens
 
             AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
 
-            AddAssert("assert ladder teams reset", () => Ladder.CurrentMatch.Value.Team1.Value == null && Ladder.CurrentMatch.Value.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/Screens/TestSceneSeedingEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
index 15d4fb1f3f..a7ef4d7a29 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.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.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Editors;
 
@@ -17,7 +18,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             var match = CreateSampleMatch();
 
-            Add(new SeedingEditorScreen(match.Team1.Value, new TeamEditorScreen())
+            Add(new SeedingEditorScreen(match.Team1.Value.AsNonNull(), new TeamEditorScreen())
             {
                 Width = 0.85f // create room for control panel
             });
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
index b76e0d7521..d6941848b7 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tournament.Tests.Screens
             {
                 Team1 = { Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA") },
                 Team2 = { Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN") },
-                Round = { Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals") }
+                Round = { Value = Ladder.Rounds.First(g => g.Name.Value == "Quarterfinals") }
             };
 
             Add(new TeamIntroScreen
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
index 05c21fa0b1..1e3ff72d43 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tournament.Tests.Screens
             {
                 var match = Ladder.CurrentMatch.Value!;
 
-                match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals");
+                match.Round.Value = Ladder.Rounds.First(g => g.Name.Value == "Quarterfinals");
                 match.Completed.Value = true;
             });
 
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 84e5da62f4..0cf1e22211 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -40,10 +41,10 @@ namespace osu.Game.Tournament.Tests
 
             match = CreateSampleMatch();
 
-            Ladder.Rounds.Add(match.Round.Value);
+            Ladder.Rounds.Add(match.Round.Value.AsNonNull());
             Ladder.Matches.Add(match);
-            Ladder.Teams.Add(match.Team1.Value);
-            Ladder.Teams.Add(match.Team2.Value);
+            Ladder.Teams.Add(match.Team1.Value.AsNonNull());
+            Ladder.Teams.Add(match.Team2.Value.AsNonNull());
 
             Ruleset.BindTo(Ladder.Ruleset);
             Dependencies.CacheAs(new StableInfo(storage));
@@ -152,7 +153,7 @@ namespace osu.Game.Tournament.Tests
             },
             Round =
             {
-                Value = new TournamentRound { Name = { Value = "Quarterfinals" } }
+                Value = new TournamentRound { Name = { Value = "Quarterfinals" } },
             }
         };
 
diff --git a/osu.Game.Tournament/Components/DrawableTeamFlag.cs b/osu.Game.Tournament/Components/DrawableTeamFlag.cs
index 317d685ee7..aef854bb8d 100644
--- a/osu.Game.Tournament/Components/DrawableTeamFlag.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamFlag.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty 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;
@@ -17,14 +15,14 @@ namespace osu.Game.Tournament.Components
 {
     public partial class DrawableTeamFlag : Container
     {
-        private readonly TournamentTeam team;
+        private readonly TournamentTeam? team;
 
         [UsedImplicitly]
-        private Bindable<string> flag;
+        private Bindable<string>? flag;
 
-        private Sprite flagSprite;
+        private Sprite? flagSprite;
 
-        public DrawableTeamFlag(TournamentTeam team)
+        public DrawableTeamFlag(TournamentTeam? team)
         {
             this.team = team;
         }
diff --git a/osu.Game.Tournament/Components/DrawableTeamTitle.cs b/osu.Game.Tournament/Components/DrawableTeamTitle.cs
index 68cc46be19..85b3e5419c 100644
--- a/osu.Game.Tournament/Components/DrawableTeamTitle.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamTitle.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty 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;
@@ -12,12 +10,12 @@ namespace osu.Game.Tournament.Components
 {
     public partial class DrawableTeamTitle : TournamentSpriteTextWithBackground
     {
-        private readonly TournamentTeam team;
+        private readonly TournamentTeam? team;
 
         [UsedImplicitly]
-        private Bindable<string> acronym;
+        private Bindable<string>? acronym;
 
-        public DrawableTeamTitle(TournamentTeam team)
+        public DrawableTeamTitle(TournamentTeam? team)
         {
             this.team = team;
         }
diff --git a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
index 0036f5f115..9583682e8b 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty 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;
@@ -14,15 +12,15 @@ namespace osu.Game.Tournament.Components
 {
     public abstract partial class DrawableTournamentTeam : CompositeDrawable
     {
-        public readonly TournamentTeam Team;
+        public readonly TournamentTeam? Team;
 
         protected readonly Container Flag;
         protected readonly TournamentSpriteText AcronymText;
 
         [UsedImplicitly]
-        private Bindable<string> acronym;
+        private Bindable<string>? acronym;
 
-        protected DrawableTournamentTeam(TournamentTeam team)
+        protected DrawableTournamentTeam(TournamentTeam? team)
         {
             Team = team;
 
@@ -36,7 +34,8 @@ namespace osu.Game.Tournament.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (Team == null) return;
+            if (Team == null)
+                return;
 
             (acronym = Team.Acronym.GetBoundCopy()).BindValueChanged(_ => AcronymText.Text = Team?.Acronym.Value?.ToUpperInvariant() ?? string.Empty, true);
         }
diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 4f4a02ccf1..19d63286d8 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@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;
@@ -24,12 +22,12 @@ namespace osu.Game.Tournament.Components
 {
     public partial class SongBar : CompositeDrawable
     {
-        private TournamentBeatmap beatmap;
+        private TournamentBeatmap? beatmap;
 
         public const float HEIGHT = 145 / 2f;
 
         [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
         public TournamentBeatmap Beatmap
         {
@@ -55,7 +53,7 @@ namespace osu.Game.Tournament.Components
             }
         }
 
-        private FillFlowContainer flow;
+        private FillFlowContainer flow = null!;
 
         private bool expanded;
 
diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 49478a2174..2d5844d02b 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -22,13 +22,13 @@ namespace osu.Game.Tournament.Components
     {
         public readonly TournamentBeatmap? Beatmap;
 
-        private readonly string mod;
+        private readonly string? mod;
 
         public const float HEIGHT = 50;
 
         private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
 
-        private Box flash = null!;
+        private Box? flash;
 
         public TournamentBeatmapPanel(TournamentBeatmap? beatmap, string mod = "")
         {
@@ -135,25 +135,29 @@ namespace osu.Game.Tournament.Components
                 match.OldValue.PicksBans.CollectionChanged -= picksBansOnCollectionChanged;
             if (match.NewValue != null)
                 match.NewValue.PicksBans.CollectionChanged += picksBansOnCollectionChanged;
-
-            Scheduler.AddOnce(updateState);
+            updateState();
         }
 
         private void picksBansOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-            => Scheduler.AddOnce(updateState);
+            => updateState();
 
         private BeatmapChoice? choice;
 
         private void updateState()
         {
-            var newChoice = currentMatch.Value?.PicksBans.FirstOrDefault(p => p.BeatmapID == Beatmap?.OnlineID);
+            if (currentMatch.Value == null)
+            {
+                return;
+            }
+
+            var newChoice = currentMatch.Value.PicksBans.FirstOrDefault(p => p.BeatmapID == Beatmap?.OnlineID);
 
             bool shouldFlash = newChoice != choice;
 
             if (newChoice != null)
             {
                 if (shouldFlash)
-                    flash.FadeOutFromOne(500).Loop(0, 10);
+                    flash?.FadeOutFromOne(500).Loop(0, 10);
 
                 BorderThickness = 6;
 
diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index e943cb8b8c..0998e606e9 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -92,9 +92,9 @@ namespace osu.Game.Tournament.Components
             {
                 if (info.CurrentMatch.Value is TournamentMatch match)
                 {
-                    if (match.Team1.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
+                    if (match.Team1.Value?.Players.Any(u => u.OnlineID == Message.Sender.OnlineID) == true)
                         UsernameColour = TournamentGame.COLOUR_RED;
-                    else if (match.Team2.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
+                    else if (match.Team2.Value?.Players.Any(u => u.OnlineID == Message.Sender.OnlineID) == true)
                         UsernameColour = TournamentGame.COLOUR_BLUE;
                 }
             }
diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index b9ce84b735..6e45c7556b 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@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.Colour;
@@ -19,8 +17,8 @@ namespace osu.Game.Tournament.Components
     {
         private readonly string filename;
         private readonly bool drawFallbackGradient;
-        private Video video;
-        private ManualClock manualClock;
+        private Video? video;
+        private ManualClock? manualClock;
 
         public bool VideoAvailable => video != null;
 
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 7babb3ea5a..333dd0fd73 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.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.IO;
 using System.Linq;
-using JetBrains.Annotations;
 using Microsoft.Win32;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
@@ -24,36 +21,35 @@ namespace osu.Game.Tournament.IPC
 {
     public partial class FileBasedIPC : MatchIPCInfo
     {
-        public Storage IPCStorage { get; private set; }
+        public Storage? IPCStorage { get; private set; }
 
         [Resolved]
-        protected IAPIProvider API { get; private set; }
+        protected IAPIProvider API { get; private set; } = null!;
 
         [Resolved]
-        protected IRulesetStore Rulesets { get; private set; }
+        protected IRulesetStore Rulesets { get; private set; } = null!;
 
         [Resolved]
-        private GameHost host { get; set; }
+        private GameHost host { get; set; } = null!;
 
         [Resolved]
-        private LadderInfo ladder { get; set; }
+        private LadderInfo ladder { get; set; } = null!;
 
         [Resolved]
-        private StableInfo stableInfo { get; set; }
+        private StableInfo stableInfo { get; set; } = null!;
 
         private int lastBeatmapId;
-        private ScheduledDelegate scheduled;
-        private GetBeatmapRequest beatmapLookupRequest;
+        private ScheduledDelegate? scheduled;
+        private GetBeatmapRequest? beatmapLookupRequest;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            string stablePath = stableInfo.StablePath ?? findStablePath();
+            string? stablePath = stableInfo.StablePath ?? findStablePath();
             initialiseIPCStorage(stablePath);
         }
 
-        [CanBeNull]
-        private Storage initialiseIPCStorage(string path)
+        private Storage? initialiseIPCStorage(string? path)
         {
             scheduled?.Cancel();
 
@@ -89,9 +85,9 @@ namespace osu.Game.Tournament.IPC
 
                                     lastBeatmapId = beatmapId;
 
-                                    var existing = ladder.CurrentMatch.Value?.Round.Value?.Beatmaps.FirstOrDefault(b => b.ID == beatmapId && b.Beatmap != null);
+                                    var existing = ladder.CurrentMatch.Value?.Round.Value?.Beatmaps.FirstOrDefault(b => b.ID == beatmapId);
 
-                                    if (existing != null)
+                                    if (existing?.Beatmap != null)
                                         Beatmap.Value = existing.Beatmap;
                                     else
                                     {
@@ -114,7 +110,7 @@ namespace osu.Game.Tournament.IPC
                             using (var stream = IPCStorage.GetStream(file_ipc_channel_filename))
                             using (var sr = new StreamReader(stream))
                             {
-                                ChatChannel.Value = sr.ReadLine();
+                                ChatChannel.Value = sr.ReadLine().AsNonNull();
                             }
                         }
                         catch (Exception)
@@ -140,8 +136,8 @@ namespace osu.Game.Tournament.IPC
                             using (var stream = IPCStorage.GetStream(file_ipc_scores_filename))
                             using (var sr = new StreamReader(stream))
                             {
-                                Score1.Value = int.Parse(sr.ReadLine());
-                                Score2.Value = int.Parse(sr.ReadLine());
+                                Score1.Value = int.Parse(sr.ReadLine().AsNonNull());
+                                Score2.Value = int.Parse(sr.ReadLine().AsNonNull());
                             }
                         }
                         catch (Exception)
@@ -164,7 +160,7 @@ namespace osu.Game.Tournament.IPC
         /// </summary>
         /// <param name="path">Path to the IPC directory</param>
         /// <returns>Whether the supplied path was a valid IPC directory.</returns>
-        public bool SetIPCLocation(string path)
+        public bool SetIPCLocation(string? path)
         {
             if (path == null || !ipcFileExistsInDirectory(path))
                 return false;
@@ -184,29 +180,28 @@ namespace osu.Game.Tournament.IPC
         /// <returns>Whether an IPC directory was successfully auto-detected.</returns>
         public bool AutoDetectIPCLocation() => SetIPCLocation(findStablePath());
 
-        private static bool ipcFileExistsInDirectory(string p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
+        private static bool ipcFileExistsInDirectory(string? p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
 
-        [CanBeNull]
-        private string findStablePath()
+        private string? findStablePath()
         {
-            string stableInstallPath = findFromEnvVar() ??
-                                       findFromRegistry() ??
-                                       findFromLocalAppData() ??
-                                       findFromDotFolder();
+            string? stableInstallPath = findFromEnvVar() ??
+                                        findFromRegistry() ??
+                                        findFromLocalAppData() ??
+                                        findFromDotFolder();
 
             Logger.Log($"Stable path for tourney usage: {stableInstallPath}");
             return stableInstallPath;
         }
 
-        private string findFromEnvVar()
+        private string? findFromEnvVar()
         {
             try
             {
                 Logger.Log("Trying to find stable with environment variables");
-                string stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
+                string? stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
 
                 if (ipcFileExistsInDirectory(stableInstallPath))
-                    return stableInstallPath;
+                    return stableInstallPath!;
             }
             catch
             {
@@ -215,7 +210,7 @@ namespace osu.Game.Tournament.IPC
             return null;
         }
 
-        private string findFromLocalAppData()
+        private string? findFromLocalAppData()
         {
             Logger.Log("Trying to find stable in %LOCALAPPDATA%");
             string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
@@ -226,7 +221,7 @@ namespace osu.Game.Tournament.IPC
             return null;
         }
 
-        private string findFromDotFolder()
+        private string? findFromDotFolder()
         {
             Logger.Log("Trying to find stable in dotfolders");
             string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
@@ -237,16 +232,16 @@ namespace osu.Game.Tournament.IPC
             return null;
         }
 
-        private string findFromRegistry()
+        private string? findFromRegistry()
         {
             Logger.Log("Trying to find stable in registry");
 
             try
             {
-                string stableInstallPath;
+                string? stableInstallPath;
 
 #pragma warning disable CA1416
-                using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                using (RegistryKey? key = Registry.ClassesRoot.OpenSubKey("osu"))
                     stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
 #pragma warning restore CA1416
 
diff --git a/osu.Game.Tournament/JsonPointConverter.cs b/osu.Game.Tournament/JsonPointConverter.cs
index d3b40a3526..a58ec47612 100644
--- a/osu.Game.Tournament/JsonPointConverter.cs
+++ b/osu.Game.Tournament/JsonPointConverter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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.Drawing;
@@ -28,7 +26,7 @@ namespace osu.Game.Tournament
             if (reader.TokenType != JsonToken.StartObject)
             {
                 // if there's no object present then this is using string representation (System.Drawing.Point serializes to "x,y")
-                string str = (string)reader.Value;
+                string? str = (string?)reader.Value;
 
                 Debug.Assert(str != null);
 
@@ -45,9 +43,12 @@ namespace osu.Game.Tournament
 
                 if (reader.TokenType == JsonToken.PropertyName)
                 {
-                    string name = reader.Value?.ToString();
+                    string? name = reader.Value?.ToString();
                     int? val = reader.ReadAsInt32();
 
+                    if (name == null)
+                        continue;
+
                     if (val == null)
                         continue;
 
diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index 229837c94e..219a2a7bfb 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;
@@ -17,7 +15,7 @@ namespace osu.Game.Tournament.Models
     [Serializable]
     public class LadderInfo
     {
-        public Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+        public Bindable<RulesetInfo?> Ruleset = new Bindable<RulesetInfo?>();
 
         public BindableList<TournamentMatch> Matches = new BindableList<TournamentMatch>();
         public BindableList<TournamentRound> Rounds = new BindableList<TournamentRound>();
@@ -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)
         {
diff --git a/osu.Game.Tournament/Models/RoundBeatmap.cs b/osu.Game.Tournament/Models/RoundBeatmap.cs
index f2ec261246..b03b28b3b8 100644
--- a/osu.Game.Tournament/Models/RoundBeatmap.cs
+++ b/osu.Game.Tournament/Models/RoundBeatmap.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Tournament.Models
     public class RoundBeatmap
     {
         public int ID;
-
         public string Mods = string.Empty;
 
         [JsonProperty("BeatmapInfo")]
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 1ae80d4596..7ee0b4a361 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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 Newtonsoft.Json;
@@ -20,12 +18,12 @@ namespace osu.Game.Tournament.Models
         /// <summary>
         /// Path to the IPC directory used by the stable (cutting-edge) install.
         /// </summary>
-        public string StablePath { get; set; }
+        public string? StablePath { get; set; }
 
         /// <summary>
         /// Fired whenever stable info is successfully saved to file.
         /// </summary>
-        public event Action OnStableInfoSaved;
+        public event Action? OnStableInfoSaved;
 
         private const string config_path = "stable.json";
 
diff --git a/osu.Game.Tournament/Models/TournamentMatch.cs b/osu.Game.Tournament/Models/TournamentMatch.cs
index 97c2060f2c..0a700eb4d6 100644
--- a/osu.Game.Tournament/Models/TournamentMatch.cs
+++ b/osu.Game.Tournament/Models/TournamentMatch.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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.ObjectModel;
@@ -33,16 +31,16 @@ namespace osu.Game.Tournament.Models
         }
 
         [JsonIgnore]
-        public readonly Bindable<TournamentTeam> Team1 = new Bindable<TournamentTeam>();
+        public readonly Bindable<TournamentTeam?> Team1 = new Bindable<TournamentTeam?>();
 
-        public string Team1Acronym;
+        public string? Team1Acronym;
 
         public readonly Bindable<int?> Team1Score = new Bindable<int?>();
 
         [JsonIgnore]
-        public readonly Bindable<TournamentTeam> Team2 = new Bindable<TournamentTeam>();
+        public readonly Bindable<TournamentTeam?> Team2 = new Bindable<TournamentTeam?>();
 
-        public string Team2Acronym;
+        public string? Team2Acronym;
 
         public readonly Bindable<int?> Team2Score = new Bindable<int?>();
 
@@ -53,13 +51,13 @@ namespace osu.Game.Tournament.Models
         public readonly ObservableCollection<BeatmapChoice> PicksBans = new ObservableCollection<BeatmapChoice>();
 
         [JsonIgnore]
-        public readonly Bindable<TournamentRound> Round = new Bindable<TournamentRound>();
+        public readonly Bindable<TournamentRound?> Round = new Bindable<TournamentRound?>();
 
         [JsonIgnore]
-        public readonly Bindable<TournamentMatch> Progression = new Bindable<TournamentMatch>();
+        public readonly Bindable<TournamentMatch?> Progression = new Bindable<TournamentMatch?>();
 
         [JsonIgnore]
-        public readonly Bindable<TournamentMatch> LosersProgression = new Bindable<TournamentMatch>();
+        public readonly Bindable<TournamentMatch?> LosersProgression = new Bindable<TournamentMatch?>();
 
         /// <summary>
         /// Should not be set directly. Use LadderInfo.CurrentMatch.Value = this instead.
@@ -79,7 +77,7 @@ namespace osu.Game.Tournament.Models
             Team2.BindValueChanged(t => Team2Acronym = t.NewValue?.Acronym.Value, true);
         }
 
-        public TournamentMatch(TournamentTeam team1 = null, TournamentTeam team2 = null)
+        public TournamentMatch(TournamentTeam? team1 = null, TournamentTeam? team2 = null)
             : this()
         {
             Team1.Value = team1;
@@ -87,10 +85,10 @@ namespace osu.Game.Tournament.Models
         }
 
         [JsonIgnore]
-        public TournamentTeam Winner => !Completed.Value ? null : Team1Score.Value > Team2Score.Value ? Team1.Value : Team2.Value;
+        public TournamentTeam? Winner => !Completed.Value ? null : Team1Score.Value > Team2Score.Value ? Team1.Value : Team2.Value;
 
         [JsonIgnore]
-        public TournamentTeam Loser => !Completed.Value ? null : Team1Score.Value > Team2Score.Value ? Team2.Value : Team1.Value;
+        public TournamentTeam? Loser => !Completed.Value ? null : Team1Score.Value > Team2Score.Value ? Team2.Value : Team1.Value;
 
         public TeamColour WinnerColour => Winner == Team1.Value ? TeamColour.Red : TeamColour.Blue;
 
diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 1beea517d5..3587aa937e 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.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 System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 
 namespace osu.Game.Tournament.Models
 {
@@ -39,7 +38,7 @@ namespace osu.Game.Tournament.Models
             {
                 int[] ranks = Players.Select(p => p.Rank)
                                      .Where(i => i.HasValue)
-                                     .Select(i => i.Value)
+                                     .Select(i => i.AsNonNull().Value)
                                      .ToArray();
 
                 if (ranks.Length == 0)
@@ -66,14 +65,14 @@ namespace osu.Game.Tournament.Models
             {
                 // use a sane default flag name based on acronym.
                 if (val.OldValue.StartsWith(FlagName.Value, StringComparison.InvariantCultureIgnoreCase))
-                    FlagName.Value = val.NewValue.Length >= 2 ? val.NewValue?.Substring(0, 2).ToUpperInvariant() : string.Empty;
+                    FlagName.Value = val.NewValue?.Length >= 2 ? val.NewValue.Substring(0, 2).ToUpperInvariant() : string.Empty;
             };
 
             FullName.ValueChanged += val =>
             {
                 // use a sane acronym based on full name.
                 if (val.OldValue.StartsWith(Acronym.Value, StringComparison.InvariantCultureIgnoreCase))
-                    Acronym.Value = val.NewValue.Length >= 3 ? val.NewValue?.Substring(0, 3).ToUpperInvariant() : string.Empty;
+                    Acronym.Value = val.NewValue?.Length >= 3 ? val.NewValue.Substring(0, 3).ToUpperInvariant() : string.Empty;
             };
         }
 
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
index a79e2253a4..9d4474a58c 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
         public bool ContainsTeam(string fullName)
         {
-            return allTeams.Any(t => t.Team.FullName.Value == fullName);
+            return allTeams.Any(t => t.Team?.FullName.Value == fullName);
         }
 
         public bool RemoveTeam(TournamentTeam team)
@@ -112,7 +112,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
         {
             StringBuilder sb = new StringBuilder();
             foreach (GroupTeam gt in allTeams)
-                sb.AppendLine(gt.Team.FullName.Value);
+                sb.AppendLine(gt.Team?.FullName.Value);
             return sb.ToString();
         }
     }
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
index c2b15dd3e9..4a47de8714 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.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 System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -22,8 +21,8 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 {
     public partial class ScrollingTeamContainer : Container
     {
-        public event Action OnScrollStarted;
-        public event Action<TournamentTeam> OnSelected;
+        public event Action? OnScrollStarted;
+        public event Action<TournamentTeam>? OnSelected;
 
         private readonly List<TournamentTeam> availableTeams = new List<TournamentTeam>();
 
@@ -42,7 +41,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
         private double lastTime;
 
-        private ScheduledDelegate delayedStateChangeDelegate;
+        private ScheduledDelegate? delayedStateChangeDelegate;
 
         public ScrollingTeamContainer()
         {
@@ -117,7 +116,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                     if (!Children.Any())
                         break;
 
-                    ScrollingTeam closest = null;
+                    ScrollingTeam? closest = null;
 
                     foreach (var c in Children)
                     {
@@ -139,15 +138,14 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
                     Trace.Assert(closest != null, "closest != null");
 
-                    // ReSharper disable once PossibleNullReferenceException
-                    offset += DrawWidth / 2f - (closest.Position.X + closest.DrawWidth / 2f);
+                    offset += DrawWidth / 2f - (closest.AsNonNull().Position.X + closest.AsNonNull().DrawWidth / 2f);
 
-                    ScrollingTeam st = closest;
+                    ScrollingTeam st = closest.AsNonNull();
 
                     availableTeams.RemoveAll(at => at == st.Team);
 
                     st.Selected = true;
-                    OnSelected?.Invoke(st.Team);
+                    OnSelected?.Invoke(st.Team.AsNonNull());
 
                     delayedStateChangeDelegate = Scheduler.AddDelayed(() => setScrollState(ScrollState.Idle), 10000);
                     break;
@@ -174,7 +172,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
             setScrollState(ScrollState.Idle);
         }
 
-        public void AddTeams(IEnumerable<TournamentTeam> teams)
+        public void AddTeams(IEnumerable<TournamentTeam>? teams)
         {
             if (teams == null)
                 return;
@@ -190,8 +188,11 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
             setScrollState(ScrollState.Idle);
         }
 
-        public void RemoveTeam(TournamentTeam team)
+        public void RemoveTeam(TournamentTeam? team)
         {
+            if (team == null)
+                return;
+
             availableTeams.Remove(team);
 
             foreach (var c in Children)
@@ -311,6 +312,8 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
         public partial class ScrollingTeam : DrawableTournamentTeam
         {
+            public new TournamentTeam Team => base.Team.AsNonNull();
+
             public const float WIDTH = 58;
             public const float HEIGHT = 44;
 
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs b/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
index 74afb42c1a..e13462b9bd 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -39,7 +37,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                     {
                         while (sr.Peek() != -1)
                         {
-                            string line = sr.ReadLine()?.Trim();
+                            string? line = sr.ReadLine()?.Trim();
 
                             if (string.IsNullOrEmpty(line))
                                 continue;
@@ -56,7 +54,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                             teams.Add(new TournamentTeam
                             {
                                 FullName = { Value = split[1], },
-                                Acronym = { Value = split.Length >= 3 ? split[2] : null, },
+                                Acronym = { Value = split.Length >= 3 ? split[2] : string.Empty, },
                                 FlagName = { Value = split[0] }
                             });
                         }
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/VisualiserContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/VisualiserContainer.cs
index 676eec14cd..d5e39e3f44 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/VisualiserContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/VisualiserContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -72,7 +70,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
             private float leftPos => -(float)((Time.Current + Offset) / CycleTime) + expiredCount;
 
-            private Texture texture;
+            private Texture texture = null!;
 
             private int expiredCount;
 
diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index 23d0edf26e..b2dd4e8c36 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -1,14 +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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -28,27 +27,27 @@ namespace osu.Game.Tournament.Screens.Drawings
     {
         private const string results_filename = "drawings_results.txt";
 
-        private ScrollingTeamContainer teamsContainer;
-        private GroupContainer groupsContainer;
-        private TournamentSpriteText fullTeamNameText;
+        private ScrollingTeamContainer teamsContainer = null!;
+        private GroupContainer groupsContainer = null!;
+        private TournamentSpriteText fullTeamNameText = null!;
 
         private readonly List<TournamentTeam> allTeams = new List<TournamentTeam>();
 
-        private DrawingsConfigManager drawingsConfig;
+        private DrawingsConfigManager drawingsConfig = null!;
 
-        private Task writeOp;
+        private Task? writeOp;
 
-        private Storage storage;
+        private Storage storage = null!;
 
-        public ITeamList TeamList;
+        public ITeamList? TeamList;
 
         [BackgroundDependencyLoader]
         private void load(Storage storage)
         {
-            RelativeSizeAxes = Axes.Both;
-
             this.storage = storage;
 
+            RelativeSizeAxes = Axes.Both;
+
             TeamList ??= new StorageBackedTeamList(storage);
 
             if (!TeamList.Teams.Any())
@@ -224,7 +223,7 @@ namespace osu.Game.Tournament.Screens.Drawings
             teamsContainer.ClearTeams();
             allTeams.Clear();
 
-            foreach (TournamentTeam t in TeamList.Teams)
+            foreach (TournamentTeam t in TeamList.AsNonNull().Teams)
             {
                 if (groupsContainer.ContainsTeam(t.FullName.Value))
                     continue;
@@ -251,7 +250,7 @@ namespace osu.Game.Tournament.Screens.Drawings
                     using (Stream stream = storage.GetStream(results_filename, FileAccess.Read, FileMode.Open))
                     using (StreamReader sr = new StreamReader(stream))
                     {
-                        string line;
+                        string? line;
 
                         while ((line = sr.ReadLine()?.Trim()) != null)
                         {
@@ -261,8 +260,7 @@ namespace osu.Game.Tournament.Screens.Drawings
                             if (line.ToUpperInvariant().StartsWith("GROUP", StringComparison.Ordinal))
                                 continue;
 
-                            // ReSharper disable once AccessToModifiedClosure
-                            TournamentTeam teamToAdd = allTeams.FirstOrDefault(t => t.FullName.Value == line);
+                            TournamentTeam? teamToAdd = allTeams.FirstOrDefault(t => t.FullName.Value == line);
 
                             if (teamToAdd == null)
                                 continue;
diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index 9411892dc5..a82ac57ee9 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.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.Drawing;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -35,13 +32,12 @@ namespace osu.Game.Tournament.Screens.Editors
         [Cached]
         private LadderEditorInfo editorInfo = new LadderEditorInfo();
 
-        private WarningBox rightClickMessage;
+        private WarningBox rightClickMessage = null!;
 
-        private RectangularPositionSnapGrid grid;
+        private RectangularPositionSnapGrid grid = null!;
 
         [Resolved(canBeNull: true)]
-        [CanBeNull]
-        private IDialogOverlay dialogOverlay { get; set; }
+        private IDialogOverlay? dialogOverlay { get; set; }
 
         protected override bool DrawLoserPaths => true;
 
@@ -94,36 +90,28 @@ namespace osu.Game.Tournament.Screens.Editors
             ScrollContent.Add(new JoinVisualiser(MatchesContainer, match, losers, UpdateLayout));
         }
 
-        public MenuItem[] ContextMenuItems
-        {
-            get
+        public MenuItem[] ContextMenuItems =>
+            new MenuItem[]
             {
-                if (editorInfo == null)
-                    return Array.Empty<MenuItem>();
-
-                return new MenuItem[]
+                new OsuMenuItem("Create new match", MenuItemType.Highlighted, () =>
                 {
-                    new OsuMenuItem("Create new match", MenuItemType.Highlighted, () =>
+                    Vector2 pos = MatchesContainer.Count == 0 ? Vector2.Zero : lastMatchesContainerMouseDownPosition;
+
+                    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, () =>
+                {
+                    dialogOverlay?.Push(new LadderResetTeamsDialog(() =>
                     {
-                        Vector2 pos = MatchesContainer.Count == 0 ? Vector2.Zero : lastMatchesContainerMouseDownPosition;
-
-                        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, () =>
-                    {
-                        dialogOverlay?.Push(new LadderResetTeamsDialog(() =>
-                        {
-                            foreach (var p in MatchesContainer)
-                                p.Match.Reset();
-                        }));
-                    })
-                };
-            }
-        }
+                        foreach (var p in MatchesContainer)
+                            p.Match.Reset();
+                    }));
+                })
+            };
 
         public void Remove(TournamentMatch match)
         {
@@ -135,11 +123,11 @@ namespace osu.Game.Tournament.Screens.Editors
             private readonly Container<DrawableTournamentMatch> matchesContainer;
             public readonly TournamentMatch Source;
             private readonly bool losers;
-            private readonly Action complete;
+            private readonly Action? complete;
 
-            private ProgressionPath path;
+            private ProgressionPath? path;
 
-            public JoinVisualiser(Container<DrawableTournamentMatch> matchesContainer, TournamentMatch source, bool losers, Action complete)
+            public JoinVisualiser(Container<DrawableTournamentMatch> matchesContainer, TournamentMatch source, bool losers, Action? complete)
             {
                 this.matchesContainer = matchesContainer;
                 RelativeSizeAxes = Axes.Both;
@@ -153,7 +141,7 @@ namespace osu.Game.Tournament.Screens.Editors
                     Source.Progression.Value = null;
             }
 
-            private DrawableTournamentMatch findTarget(InputState state)
+            private DrawableTournamentMatch? findTarget(InputState state)
             {
                 return matchesContainer.FirstOrDefault(d => d.ReceivePositionalInputAt(state.Mouse.Position));
             }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index 8f7484980d..69f150c8ac 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@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;
@@ -14,9 +12,9 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
     public partial class MatchHeader : Container
     {
-        private TeamScoreDisplay teamDisplay1;
-        private TeamScoreDisplay teamDisplay2;
-        private DrawableTournamentHeaderLogo logo;
+        private TeamScoreDisplay teamDisplay1 = null!;
+        private TeamScoreDisplay teamDisplay2 = null!;
+        private DrawableTournamentHeaderLogo logo = null!;
 
         private bool showScores = true;
 
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index c23327a43f..3fdbbb5973 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             }
         }
 
-        public TeamDisplay(TournamentTeam team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
+        public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
             : base(team)
         {
             AutoSizeAxes = Axes.Both;
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
index 57fe1c7312..c7fcfae602 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@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,16 +15,22 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
     {
         private readonly TeamColour teamColour;
 
-        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-        private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
+        private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
+        private readonly Bindable<TournamentTeam?> currentTeam = new Bindable<TournamentTeam?>();
         private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
 
-        private TeamDisplay teamDisplay;
+        private TeamDisplay? teamDisplay;
 
         public bool ShowScore
         {
-            get => teamDisplay.ShowScore;
-            set => teamDisplay.ShowScore = value;
+            get => teamDisplay?.ShowScore ?? false;
+            set
+            {
+                if (teamDisplay != null)
+                {
+                    teamDisplay.ShowScore = value;
+                }
+            }
         }
 
         public TeamScoreDisplay(TeamColour teamColour)
@@ -48,7 +52,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             updateMatch();
         }
 
-        private void matchChanged(ValueChangedEvent<TournamentMatch> match)
+        private void matchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             currentTeamScore.UnbindBindings();
             currentTeam.UnbindBindings();
@@ -78,7 +82,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             switch (e.Button)
             {
                 case MouseButton.Left:
-                    if (currentTeamScore.Value < currentMatch.Value.PointsToWin)
+                    if (currentTeamScore.Value < currentMatch.Value?.PointsToWin)
                         currentTeamScore.Value++;
                     return true;
 
@@ -91,7 +95,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             return base.OnMouseDown(e);
         }
 
-        private void teamChanged(ValueChangedEvent<TournamentTeam> team)
+        private void teamChanged(ValueChangedEvent<TournamentTeam?> team)
         {
             bool wasShowingScores = teamDisplay?.ShowScore ?? false;
 
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
index 838e5fa071..7ae20acc77 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -146,7 +144,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private partial class MatchScoreCounter : CommaSeparatedScoreCounter
         {
-            private OsuSpriteText displayedSpriteText;
+            private OsuSpriteText displayedSpriteText = null!;
 
             public MatchScoreCounter()
             {
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 4258522cff..79c50e60ba 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@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;
@@ -26,16 +24,16 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private readonly BindableBool warmup = new BindableBool();
 
         public readonly Bindable<TourneyState> State = new Bindable<TourneyState>();
-        private OsuButton warmupButton;
-        private MatchIPCInfo ipc;
+        private OsuButton warmupButton = null!;
+        private MatchIPCInfo ipc = null!;
 
         [Resolved(canBeNull: true)]
-        private TournamentSceneManager sceneManager { get; set; }
+        private TournamentSceneManager? sceneManager { get; set; }
 
         [Resolved]
-        private TournamentMatchChatDisplay chat { get; set; }
+        private TournamentMatchChatDisplay chat { get; set; } = null!;
 
-        private Drawable chroma;
+        private Drawable chroma = null!;
 
         [BackgroundDependencyLoader]
         private void load(LadderInfo ladder, MatchIPCInfo ipc)
@@ -142,7 +140,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
             State.BindValueChanged(_ => updateState(), true);
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             base.CurrentMatchChanged(match);
 
@@ -153,29 +151,35 @@ namespace osu.Game.Tournament.Screens.Gameplay
             scheduledScreenChange?.Cancel();
         }
 
-        private ScheduledDelegate scheduledScreenChange;
-        private ScheduledDelegate scheduledContract;
+        private ScheduledDelegate? scheduledScreenChange;
+        private ScheduledDelegate? scheduledContract;
 
-        private TournamentMatchScoreDisplay scoreDisplay;
+        private TournamentMatchScoreDisplay scoreDisplay = null!;
 
         private TourneyState lastState;
-        private MatchHeader header;
+        private MatchHeader header = null!;
 
         private void contract()
         {
+            if (!IsLoaded)
+                return;
+
             scheduledContract?.Cancel();
 
             SongBar.Expanded = false;
             scoreDisplay.FadeOut(100);
-            using (chat?.BeginDelayedSequence(500))
-                chat?.Expand();
+            using (chat.BeginDelayedSequence(500))
+                chat.Expand();
         }
 
         private void expand()
         {
+            if (!IsLoaded)
+                return;
+
             scheduledContract?.Cancel();
 
-            chat?.Contract();
+            chat.Contract();
 
             using (BeginDelayedSequence(300))
             {
@@ -252,7 +256,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private partial class ChromaArea : CompositeDrawable
         {
             [Resolved]
-            private LadderInfo ladder { get; set; }
+            private LadderInfo ladder { get; set; } = null!;
 
             [BackgroundDependencyLoader]
             private void load()
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index 2b66df1a31..a380ad9b49 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -28,20 +26,20 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
     {
         private readonly TournamentMatch match;
         private readonly bool losers;
-        private TournamentSpriteText scoreText;
-        private Box background;
-        private Box backgroundRight;
+        private TournamentSpriteText scoreText = null!;
+        private Box background = null!;
+        private Box backgroundRight = null!;
 
         private readonly Bindable<int?> score = new Bindable<int?>();
         private readonly BindableBool completed = new BindableBool();
 
         private Color4 colourWinner;
 
-        private readonly Func<bool> isWinner;
-        private LadderEditorScreen ladderEditor;
+        private readonly Func<bool>? isWinner;
+        private LadderEditorScreen ladderEditor = null!;
 
         [Resolved(canBeNull: true)]
-        private LadderInfo ladderInfo { get; set; }
+        private LadderInfo? ladderInfo { get; set; }
 
         private void setCurrent()
         {
@@ -56,9 +54,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         }
 
         [Resolved(CanBeNull = true)]
-        private LadderEditorInfo editorInfo { get; set; }
+        private LadderEditorInfo? editorInfo { get; set; }
 
-        public DrawableMatchTeam(TournamentTeam team, TournamentMatch match, bool losers)
+        public DrawableMatchTeam(TournamentTeam? team, TournamentMatch match, bool losers)
             : base(team)
         {
             this.match = match;
@@ -72,14 +70,11 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             AcronymText.Padding = new MarginPadding { Left = 50 };
             AcronymText.Font = OsuFont.Torus.With(size: 22, weight: FontWeight.Bold);
 
-            if (match != null)
-            {
-                isWinner = () => match.Winner == Team;
+            isWinner = () => match.Winner == Team;
 
-                completed.BindTo(match.Completed);
-                if (team != null)
-                    score.BindTo(team == match.Team1.Value ? match.Team1Score : match.Team2Score);
-            }
+            completed.BindTo(match.Completed);
+            if (team != null)
+                score.BindTo(team == match.Team1.Value ? match.Team1Score : match.Team2Score);
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index c394877ae9..7b8f2e373b 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.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.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -27,13 +26,13 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         protected readonly FillFlowContainer<DrawableMatchTeam> Flow;
         private readonly Drawable selectionBox;
         private readonly Drawable currentMatchSelectionBox;
-        private Bindable<TournamentMatch> globalSelection;
+        private Bindable<TournamentMatch>? globalSelection;
 
         [Resolved(CanBeNull = true)]
-        private LadderEditorInfo editorInfo { get; set; }
+        private LadderEditorInfo? editorInfo { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private LadderInfo ladderInfo { get; set; }
+        private LadderInfo? ladderInfo { get; set; }
 
         public DrawableTournamentMatch(TournamentMatch match, bool editor = false)
         {
@@ -129,7 +128,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         /// <summary>
         /// Fired when something changed that requires a ladder redraw.
         /// </summary>
-        public Action Changed;
+        public Action? Changed;
 
         private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
 
@@ -201,20 +200,22 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             }
             else
             {
-                transferProgression(Match.Progression?.Value, Match.Winner);
-                transferProgression(Match.LosersProgression?.Value, Match.Loser);
+                Debug.Assert(Match.Winner != null);
+                transferProgression(Match.Progression.Value, Match.Winner);
+                Debug.Assert(Match.Loser != null);
+                transferProgression(Match.LosersProgression.Value, Match.Loser);
             }
 
             Changed?.Invoke();
         }
 
-        private void transferProgression(TournamentMatch destination, TournamentTeam team)
+        private void transferProgression(TournamentMatch? destination, TournamentTeam team)
         {
             if (destination == null) return;
 
             bool progressionAbove = destination.ID < Match.ID;
 
-            Bindable<TournamentTeam> destinationTeam;
+            Bindable<TournamentTeam?> destinationTeam;
 
             // check for the case where we have already transferred out value
             if (destination.Team1.Value == team)
@@ -268,8 +269,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             {
                 foreach (var conditional in Match.ConditionalMatches)
                 {
-                    bool team1Match = conditional.Acronyms.Contains(Match.Team1Acronym);
-                    bool team2Match = conditional.Acronyms.Contains(Match.Team2Acronym);
+                    bool team1Match = Match.Team1Acronym != null && conditional.Acronyms.Contains(Match.Team1Acronym);
+                    bool team2Match = Match.Team2Acronym != null && conditional.Acronyms.Contains(Match.Team2Acronym);
 
                     if (team1Match && team2Match)
                         Match.Date.Value = conditional.Date.Value;
@@ -344,6 +345,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             Match.Progression.Value = null;
             Match.LosersProgression.Value = null;
 
+            if (ladderInfo == null)
+                return;
+
             ladderInfo.Matches.Remove(Match);
 
             foreach (var m in ladderInfo.Matches)
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
index 4b2a29247b..216e0a5a3e 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty 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.Framework.Graphics;
@@ -52,7 +50,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             name.BindValueChanged(_ => textName.Text = ((losers ? "Losers " : "") + round.Name).ToUpperInvariant(), true);
 
             description = round.Description.GetBoundCopy();
-            description.BindValueChanged(_ => textDescription.Text = round.Description.Value?.ToUpperInvariant(), true);
+            description.BindValueChanged(_ => textDescription.Text = round.Description.Value?.ToUpperInvariant() ?? string.Empty, true);
         }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index 5c9c14cc30..9f0fa19915 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -23,17 +21,17 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 {
     public partial class LadderEditorSettings : CompositeDrawable
     {
-        private SettingsDropdown<TournamentRound> roundDropdown;
-        private PlayerCheckbox losersCheckbox;
-        private DateTextBox dateTimeBox;
-        private SettingsTeamDropdown team1Dropdown;
-        private SettingsTeamDropdown team2Dropdown;
+        private SettingsDropdown<TournamentRound?> roundDropdown = null!;
+        private PlayerCheckbox losersCheckbox = null!;
+        private DateTextBox dateTimeBox = null!;
+        private SettingsTeamDropdown team1Dropdown = null!;
+        private SettingsTeamDropdown team2Dropdown = null!;
 
         [Resolved]
-        private LadderEditorInfo editorInfo { get; set; }
+        private LadderEditorInfo editorInfo { get; set; } = null!;
 
         [Resolved]
-        private LadderInfo ladderInfo { get; set; }
+        private LadderInfo ladderInfo { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -77,7 +75,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             };
         }
 
-        private void roundDropdownChanged(ValueChangedEvent<TournamentRound> round)
+        private void roundDropdownChanged(ValueChangedEvent<TournamentRound?> round)
         {
             if (editorInfo.Selected.Value?.Date.Value < round.NewValue?.StartDate.Value)
             {
@@ -101,11 +99,11 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         {
         }
 
-        private partial class SettingsRoundDropdown : SettingsDropdown<TournamentRound>
+        private partial class SettingsRoundDropdown : SettingsDropdown<TournamentRound?>
         {
             public SettingsRoundDropdown(BindableList<TournamentRound> rounds)
             {
-                Current = new Bindable<TournamentRound>();
+                Current = new Bindable<TournamentRound?>();
 
                 foreach (var r in rounds.Prepend(new TournamentRound()))
                     add(r);
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
index 00e5353edd..7e35190e2e 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
@@ -12,7 +12,7 @@ using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Ladder.Components
 {
-    public partial class SettingsTeamDropdown : SettingsDropdown<TournamentTeam>
+    public partial class SettingsTeamDropdown : SettingsDropdown<TournamentTeam?>
     {
         public SettingsTeamDropdown(BindableList<TournamentTeam> teams)
         {
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 2d5281b893..4f56a2fcc9 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -22,13 +20,13 @@ namespace osu.Game.Tournament.Screens.Ladder
 {
     public partial class LadderScreen : TournamentScreen
     {
-        protected Container<DrawableTournamentMatch> MatchesContainer;
-        private Container<Path> paths;
-        private Container headings;
+        protected Container<DrawableTournamentMatch> MatchesContainer = null!;
+        private Container<Path> paths = null!;
+        private Container headings = null!;
 
-        protected LadderDragContainer ScrollContent;
+        protected LadderDragContainer ScrollContent = null!;
 
-        protected Container Content;
+        protected Container Content = null!;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index f45da861cb..3091f4293c 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -24,20 +22,20 @@ namespace osu.Game.Tournament.Screens.MapPool
 {
     public partial class MapPoolScreen : TournamentMatchScreen
     {
-        private FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows;
+        private FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows = null!;
 
         [Resolved(canBeNull: true)]
-        private TournamentSceneManager sceneManager { get; set; }
+        private TournamentSceneManager? sceneManager { get; set; }
 
         private TeamColour pickColour;
         private ChoiceType pickType;
 
-        private OsuButton buttonRedBan;
-        private OsuButton buttonBlueBan;
-        private OsuButton buttonRedPick;
-        private OsuButton buttonBluePick;
+        private OsuButton buttonRedBan = null!;
+        private OsuButton buttonBlueBan = null!;
+        private OsuButton buttonRedPick = null!;
+        private OsuButton buttonBluePick = null!;
 
-        private ScheduledDelegate scheduledScreenChange;
+        private ScheduledDelegate? scheduledScreenChange;
 
         [BackgroundDependencyLoader]
         private void load(MatchIPCInfo ipc)
@@ -113,7 +111,7 @@ namespace osu.Game.Tournament.Screens.MapPool
             ipc.Beatmap.BindValueChanged(beatmapChanged);
         }
 
-        private Bindable<bool> splitMapPoolByMods;
+        private Bindable<bool>? splitMapPoolByMods;
 
         protected override void LoadComplete()
         {
@@ -148,6 +146,9 @@ namespace osu.Game.Tournament.Screens.MapPool
 
         private void setNextMode()
         {
+            if (CurrentMatch.Value == null)
+                return;
+
             const TeamColour roll_winner = TeamColour.Red; //todo: draw from match
 
             var nextColour = (CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
@@ -169,11 +170,11 @@ namespace osu.Game.Tournament.Screens.MapPool
                     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)
                     {
-                        CurrentMatch.Value.PicksBans.Remove(existing);
+                        CurrentMatch.Value?.PicksBans.Remove(existing);
                         setNextMode();
                     }
                 }
@@ -186,13 +187,13 @@ namespace osu.Game.Tournament.Screens.MapPool
 
         private void reset()
         {
-            CurrentMatch.Value.PicksBans.Clear();
+            CurrentMatch.Value?.PicksBans.Clear();
             setNextMode();
         }
 
         private void addForBeatmap(int beatmapId)
         {
-            if (CurrentMatch.Value == null)
+            if (CurrentMatch.Value?.Round.Value == null)
                 return;
 
             if (CurrentMatch.Value.Round.Value.Beatmaps.All(b => b.Beatmap?.OnlineID != beatmapId))
@@ -228,7 +229,7 @@ namespace osu.Game.Tournament.Screens.MapPool
             base.Hide();
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             base.CurrentMatchChanged(match);
             updateDisplay();
@@ -245,12 +246,15 @@ namespace osu.Game.Tournament.Screens.MapPool
 
             if (CurrentMatch.Value.Round.Value != null)
             {
-                FillFlowContainer<TournamentBeatmapPanel> currentFlow = null;
-                string currentMods = null;
+                FillFlowContainer<TournamentBeatmapPanel>? currentFlow = null;
+                string? currentMods = null;
                 int flowCount = 0;
 
                 foreach (var b in CurrentMatch.Value.Round.Value.Beatmaps)
                 {
+                    if (b.Beatmap == null)
+                        continue;
+
                     if (currentFlow == null || (LadderInfo.SplitMapPoolByMods.Value && currentMods != b.Mods))
                     {
                         mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 9232b4c689..063c231add 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -21,9 +19,9 @@ namespace osu.Game.Tournament.Screens.Schedule
 {
     public partial class ScheduleScreen : TournamentScreen
     {
-        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-        private Container mainContainer;
-        private LadderInfo ladder;
+        private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
+        private Container mainContainer = null!;
+        private LadderInfo ladder = null!;
 
         [BackgroundDependencyLoader]
         private void load(LadderInfo ladder)
@@ -107,7 +105,7 @@ namespace osu.Game.Tournament.Screens.Schedule
             currentMatch.BindValueChanged(matchChanged, true);
         }
 
-        private void matchChanged(ValueChangedEvent<TournamentMatch> match)
+        private void matchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             var upcoming = ladder.Matches.Where(p => !p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4);
             var conditionals = ladder
diff --git a/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
index e6ab6f143a..c700e3bfdd 100644
--- a/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
+++ b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -14,9 +12,9 @@ namespace osu.Game.Tournament.Screens.Setup
         private const int minimum_window_height = 480;
         private const int maximum_window_height = 2160;
 
-        public new Action<int> Action;
+        public new Action<int>? Action;
 
-        private OsuNumberBox numberBox;
+        private OsuNumberBox? numberBox;
 
         protected override Drawable CreateComponent()
         {
diff --git a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
index 5c7bbed69c..1152759c2a 100644
--- a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -24,27 +22,27 @@ namespace osu.Game.Tournament.Screens.Setup
 {
     public partial class SetupScreen : TournamentScreen
     {
-        private FillFlowContainer fillFlow;
+        private FillFlowContainer fillFlow = null!;
 
-        private LoginOverlay loginOverlay;
-        private ResolutionSelector resolution;
+        private LoginOverlay? loginOverlay;
+        private ResolutionSelector resolution = null!;
 
         [Resolved]
-        private MatchIPCInfo ipc { get; set; }
+        private MatchIPCInfo ipc { get; set; } = null!;
 
         [Resolved]
-        private StableInfo stableInfo { get; set; }
+        private StableInfo stableInfo { get; set; } = null!;
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private RulesetStore rulesets { get; set; }
+        private RulesetStore rulesets { get; set; } = null!;
 
         [Resolved(canBeNull: true)]
-        private TournamentSceneManager sceneManager { get; set; }
+        private TournamentSceneManager? sceneManager { get; set; }
 
-        private Bindable<Size> windowSize;
+        private Bindable<Size> windowSize = null!;
 
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig)
@@ -115,7 +113,7 @@ namespace osu.Game.Tournament.Screens.Setup
                     Failing = api.IsLoggedIn != true,
                     Description = "In order to access the API and display metadata, signing in is required."
                 },
-                new LabelledDropdown<RulesetInfo>
+                new LabelledDropdown<RulesetInfo?>
                 {
                     Label = "Ruleset",
                     Description = "Decides what stats are displayed and which ranks are retrieved for players. This requires a restart to reload data for an existing bracket.",
diff --git a/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
index 463b012b77..c3d072b6a0 100644
--- a/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -24,19 +22,19 @@ namespace osu.Game.Tournament.Screens.Setup
     public partial class StablePathSelectScreen : TournamentScreen
     {
         [Resolved(canBeNull: true)]
-        private TournamentSceneManager sceneManager { get; set; }
+        private TournamentSceneManager? sceneManager { get; set; }
 
         [Resolved]
-        private MatchIPCInfo ipc { get; set; }
+        private MatchIPCInfo ipc { get; set; } = null!;
 
-        private OsuDirectorySelector directorySelector;
-        private DialogOverlay overlay;
+        private OsuDirectorySelector directorySelector = null!;
+        private DialogOverlay? overlay;
 
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuColour colours)
         {
             var initialStorage = (ipc as FileBasedIPC)?.IPCStorage ?? storage;
-            string initialPath = new DirectoryInfo(initialStorage.GetFullPath(string.Empty)).Parent?.FullName;
+            string? initialPath = new DirectoryInfo(initialStorage.GetFullPath(string.Empty)).Parent?.FullName;
 
             AddRangeInternal(new Drawable[]
             {
diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index ae49ccb63b..e55cbc2dbb 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@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.UserInterface;
@@ -13,12 +11,12 @@ namespace osu.Game.Tournament.Screens.Setup
 {
     internal partial class TournamentSwitcher : ActionableInfo
     {
-        private OsuDropdown<string> dropdown;
-        private OsuButton folderButton;
-        private OsuButton reloadTournamentsButton;
+        private OsuDropdown<string> dropdown = null!;
+        private OsuButton folderButton = null!;
+        private OsuButton reloadTournamentsButton = null!;
 
         [Resolved]
-        private TournamentGameBase game { get; set; }
+        private TournamentGameBase game { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load(TournamentStorage storage)
diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index db4d6198e6..ae2ec0c291 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tournament.Screens.Showcase
             });
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             // showcase screen doesn't care about a match being selected.
             // base call intentionally omitted to not show match warning.
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index b07a0a65dd..120a76c127 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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.Bindables;
@@ -22,12 +20,12 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 {
     public partial class SeedingScreen : TournamentMatchScreen
     {
-        private Container mainContainer;
+        private Container mainContainer = null!;
 
-        private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
+        private readonly Bindable<TournamentTeam?> currentTeam = new Bindable<TournamentTeam?>();
 
-        private TourneyButton showFirstTeamButton;
-        private TourneyButton showSecondTeamButton;
+        private TourneyButton showFirstTeamButton = null!;
+        private TourneyButton showSecondTeamButton = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -53,13 +51,13 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                         {
                             RelativeSizeAxes = Axes.X,
                             Text = "Show first team",
-                            Action = () => currentTeam.Value = CurrentMatch.Value.Team1.Value,
+                            Action = () => currentTeam.Value = CurrentMatch.Value?.Team1.Value,
                         },
                         showSecondTeamButton = new TourneyButton
                         {
                             RelativeSizeAxes = Axes.X,
                             Text = "Show second team",
-                            Action = () => currentTeam.Value = CurrentMatch.Value.Team2.Value,
+                            Action = () => currentTeam.Value = CurrentMatch.Value?.Team2.Value,
                         },
                         new SettingsTeamDropdown(LadderInfo.Teams)
                         {
@@ -73,7 +71,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
             currentTeam.BindValueChanged(teamChanged, true);
         }
 
-        private void teamChanged(ValueChangedEvent<TournamentTeam> team) => updateTeamDisplay();
+        private void teamChanged(ValueChangedEvent<TournamentTeam?> team) => updateTeamDisplay();
 
         public override void Show()
         {
@@ -84,7 +82,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
             updateTeamDisplay();
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             base.CurrentMatchChanged(match);
 
@@ -256,7 +254,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 
         private partial class LeftInfo : CompositeDrawable
         {
-            public LeftInfo(TournamentTeam team)
+            public LeftInfo(TournamentTeam? team)
             {
                 FillFlowContainer fill;
 
@@ -315,7 +313,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 
             private partial class TeamDisplay : DrawableTournamentTeam
             {
-                public TeamDisplay(TournamentTeam team)
+                public TeamDisplay(TournamentTeam? team)
                     : base(team)
                 {
                     AutoSizeAxes = Axes.Both;
diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index 950a63808c..2280f21d47 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@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;
@@ -15,7 +13,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 {
     public partial class TeamIntroScreen : TournamentMatchScreen
     {
-        private Container mainContainer;
+        private Container mainContainer = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -36,7 +34,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
             };
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             base.CurrentMatchChanged(match);
 
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index 9206de1dc2..af21613541 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@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;
@@ -16,12 +14,12 @@ namespace osu.Game.Tournament.Screens.TeamWin
 {
     public partial class TeamWinScreen : TournamentMatchScreen
     {
-        private Container mainContainer;
+        private Container mainContainer = null!;
 
         private readonly Bindable<bool> currentCompleted = new Bindable<bool>();
 
-        private TourneyVideo blueWinVideo;
-        private TourneyVideo redWinVideo;
+        private TourneyVideo blueWinVideo = null!;
+        private TourneyVideo redWinVideo = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -51,7 +49,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
             currentCompleted.BindValueChanged(_ => update());
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             base.CurrentMatchChanged(match);
 
@@ -70,7 +68,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
         {
             var match = CurrentMatch.Value;
 
-            if (match.Winner == null)
+            if (match?.Winner == null)
             {
                 mainContainer.Clear();
                 return;
diff --git a/osu.Game.Tournament/Screens/TournamentMatchScreen.cs b/osu.Game.Tournament/Screens/TournamentMatchScreen.cs
index 58444d0c1b..5a9b9d05ed 100644
--- a/osu.Game.Tournament/Screens/TournamentMatchScreen.cs
+++ b/osu.Game.Tournament/Screens/TournamentMatchScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@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.Tournament.Models;
 
@@ -10,8 +8,8 @@ namespace osu.Game.Tournament.Screens
 {
     public abstract partial class TournamentMatchScreen : TournamentScreen
     {
-        protected readonly Bindable<TournamentMatch> CurrentMatch = new Bindable<TournamentMatch>();
-        private WarningBox noMatchWarning;
+        protected readonly Bindable<TournamentMatch?> CurrentMatch = new Bindable<TournamentMatch?>();
+        private WarningBox? noMatchWarning;
 
         protected override void LoadComplete()
         {
@@ -21,7 +19,7 @@ namespace osu.Game.Tournament.Screens
             CurrentMatch.BindValueChanged(CurrentMatchChanged, true);
         }
 
-        protected virtual void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected virtual void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             if (match.NewValue == null)
             {
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index c79cc9cd57..ba3b17b513 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Drawing;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -35,12 +33,12 @@ namespace osu.Game.Tournament
         public static readonly Color4 ELEMENT_FOREGROUND_COLOUR = Color4Extensions.FromHex("#000");
 
         public static readonly Color4 TEXT_COLOUR = Color4Extensions.FromHex("#fff");
-        private Drawable heightWarning;
+        private Drawable heightWarning = null!;
 
-        private Bindable<WindowMode> windowMode;
+        private Bindable<WindowMode> windowMode = null!;
         private readonly BindableSize windowSize = new BindableSize();
 
-        private LoadingSpinner loadingSpinner;
+        private LoadingSpinner loadingSpinner = null!;
 
         [Cached(typeof(IDialogOverlay))]
         private readonly DialogOverlay dialogOverlay = new DialogOverlay();
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 509c8bb940..ee03b4c35d 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -1,14 +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.
 
-#nullable disable
-
 using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
@@ -31,11 +30,11 @@ namespace osu.Game.Tournament
     public partial class TournamentGameBase : OsuGameBase
     {
         public const string BRACKET_FILENAME = @"bracket.json";
-        private LadderInfo ladder;
-        private TournamentStorage storage;
-        private DependencyContainer dependencies;
-        private FileBasedIPC ipc;
-        private BeatmapLookupCache beatmapCache;
+        private LadderInfo ladder = null!;
+        private TournamentStorage storage = null!;
+        private DependencyContainer dependencies = null!;
+        private FileBasedIPC ipc = null!;
+        private BeatmapLookupCache beatmapCache = null!;
 
         protected Task BracketLoadTask => bracketLoadTaskCompletionSource.Task;
 
@@ -54,7 +53,7 @@ namespace osu.Game.Tournament
             return new ProductionEndpointConfiguration();
         }
 
-        private TournamentSpriteText initialisationText;
+        private TournamentSpriteText initialisationText = null!;
 
         [BackgroundDependencyLoader]
         private void load(Storage baseStorage)
@@ -78,6 +77,8 @@ namespace osu.Game.Tournament
             dependencies.CacheAs(new StableInfo(storage));
 
             beatmapCache = dependencies.Get<BeatmapLookupCache>();
+
+            ladder = new LadderInfo();
         }
 
         protected override void LoadComplete()
@@ -100,11 +101,11 @@ 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>(await sr.ReadToEndAsync().ConfigureAwait(false), new JsonPointConverter());
+                    {
+                        ladder = JsonConvert.DeserializeObject<LadderInfo>(await sr.ReadToEndAsync().ConfigureAwait(false), new JsonPointConverter()) ?? ladder;
+                    }
                 }
 
-                ladder ??= new LadderInfo();
-
                 var resolvedRuleset = ladder.Ruleset.Value != null
                     ? RulesetStore.GetRuleset(ladder.Ruleset.Value.ShortName)
                     : RulesetStore.AvailableRulesets.First();
@@ -283,7 +284,7 @@ namespace osu.Game.Tournament
 
         private void updateLoadProgressMessage(string s) => Schedule(() => initialisationText.Text = s);
 
-        public void PopulatePlayer(TournamentUser user, Action success = null, Action failure = null, bool immediate = false)
+        public void PopulatePlayer(TournamentUser user, Action? success = null, Action? failure = null, bool immediate = false)
         {
             var req = new GetUserRequest(user.OnlineID, ladder.Ruleset.Value);
 
@@ -348,8 +349,8 @@ namespace osu.Game.Tournament
             foreach (var r in ladder.Rounds)
                 r.Matches = ladder.Matches.Where(p => p.Round.Value == r).Select(p => p.ID).ToList();
 
-            ladder.Progressions = ladder.Matches.Where(p => p.Progression.Value != null).Select(p => new TournamentProgression(p.ID, p.Progression.Value.ID)).Concat(
-                                            ladder.Matches.Where(p => p.LosersProgression.Value != null).Select(p => new TournamentProgression(p.ID, p.LosersProgression.Value.ID, true)))
+            ladder.Progressions = ladder.Matches.Where(p => p.Progression.Value != null).Select(p => new TournamentProgression(p.ID, p.Progression.Value.AsNonNull().ID)).Concat(
+                                            ladder.Matches.Where(p => p.LosersProgression.Value != null).Select(p => new TournamentProgression(p.ID, p.LosersProgression.Value.AsNonNull().ID, true)))
                                         .ToList();
 
             return JsonConvert.SerializeObject(ladder,
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 9ac5a9de12..c69b76ae29 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -35,8 +33,8 @@ namespace osu.Game.Tournament
     [Cached]
     public partial class TournamentSceneManager : CompositeDrawable
     {
-        private Container screens;
-        private TourneyVideo video;
+        private Container screens = null!;
+        private TourneyVideo video = null!;
 
         public const int CONTROL_AREA_WIDTH = 200;
 
@@ -50,8 +48,8 @@ namespace osu.Game.Tournament
         [Cached]
         private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay();
 
-        private Container chatContainer;
-        private FillFlowContainer buttons;
+        private Container chatContainer = null!;
+        private FillFlowContainer buttons = null!;
 
         public TournamentSceneManager()
         {
@@ -166,10 +164,10 @@ namespace osu.Game.Tournament
 
         private float depth;
 
-        private Drawable currentScreen;
-        private ScheduledDelegate scheduledHide;
+        private Drawable? currentScreen;
+        private ScheduledDelegate? scheduledHide;
 
-        private Drawable temporaryScreen;
+        private Drawable? temporaryScreen;
 
         public void SetScreen(Drawable screen)
         {
@@ -284,7 +282,7 @@ namespace osu.Game.Tournament
                                 Y = -2,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Text = shortcutKey.ToString(),
+                                Text = shortcutKey.Value.ToString(),
                             }
                         }
                     });
@@ -304,7 +302,7 @@ namespace osu.Game.Tournament
 
             private bool isSelected;
 
-            public Action<Type> RequestSelection;
+            public Action<Type>? RequestSelection;
 
             public bool IsSelected
             {

From 4c33013674a9f2ddd761d966e1c6e08e88de66a6 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 29 Jul 2023 22:41:26 +0900
Subject: [PATCH 0940/2100] null check in test

---
 .../Screens/TestSceneMapPoolScreen.cs         | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 2c17cd0d52..254d5c6996 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
@@ -16,7 +15,7 @@ namespace osu.Game.Tournament.Tests.Screens
 {
     public partial class TestSceneMapPoolScreen : TournamentScreenTestScene
     {
-        private MapPoolScreen screen;
+        private MapPoolScreen screen = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -32,7 +31,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load few maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 8; i++)
                     addBeatmap();
@@ -52,7 +51,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load just enough maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 18; i++)
                     addBeatmap();
@@ -72,7 +71,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 19; i++)
                     addBeatmap();
@@ -92,7 +91,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 11; i++)
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
@@ -118,7 +117,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 12; i++)
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
@@ -138,7 +137,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 12; i++)
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
@@ -155,7 +154,7 @@ namespace osu.Game.Tournament.Tests.Screens
 
         private void addBeatmap(string mods = "NM")
         {
-            Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Add(new RoundBeatmap
+            Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Add(new RoundBeatmap
             {
                 Beatmap = CreateSampleBeatmap(),
                 Mods = mods

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 0941/2100] 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 033c9091c04377869a13185230fb4e95bf62c665 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 01:39:31 +0900
Subject: [PATCH 0942/2100] use cast instead AsNonNull

---
 osu.Game.Tournament/Models/TournamentTeam.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 3587aa937e..b3b2f213ce 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tournament.Models
             {
                 int[] ranks = Players.Select(p => p.Rank)
                                      .Where(i => i.HasValue)
-                                     .Select(i => i.AsNonNull().Value)
+                                     .Cast<int>()
                                      .ToArray();
 
                 if (ranks.Length == 0)

From 625ed729eed3a76703fe0c1713fa9617baf5e33b Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 01:39:56 +0900
Subject: [PATCH 0943/2100] debug assert `closest != null`

---
 .../Screens/Drawings/Components/ScrollingTeamContainer.cs   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
index 4a47de8714..7f19e8a497 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
@@ -136,11 +136,11 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                             closest = stc;
                     }
 
-                    Trace.Assert(closest != null, "closest != null");
+                    Debug.Assert(closest != null, "closest != null");
 
-                    offset += DrawWidth / 2f - (closest.AsNonNull().Position.X + closest.AsNonNull().DrawWidth / 2f);
+                    offset += DrawWidth / 2f - (closest.Position.X + closest.DrawWidth / 2f);
 
-                    ScrollingTeam st = closest.AsNonNull();
+                    ScrollingTeam st = closest;
 
                     availableTeams.RemoveAll(at => at == st.Team);
 

From cb4adf115cae1dbef79f1b8af64d0d71c768b537 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 01:40:13 +0900
Subject: [PATCH 0944/2100] RemoveTeam shouldn't have nullable arg

---
 .../Screens/Drawings/Components/ScrollingTeamContainer.cs    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
index 7f19e8a497..d4e0f29852 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
@@ -188,11 +188,8 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
             setScrollState(ScrollState.Idle);
         }
 
-        public void RemoveTeam(TournamentTeam? team)
+        public void RemoveTeam(TournamentTeam team)
         {
-            if (team == null)
-                return;
-
             availableTeams.Remove(team);
 
             foreach (var c in Children)

From 9482f7445614907f001aee2097939d25ad6c0b92 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 01:49:57 +0900
Subject: [PATCH 0945/2100] fix nullable for TeamList

---
 osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index b2dd4e8c36..fc59b486fe 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tournament.Screens.Drawings
 
         private Storage storage = null!;
 
-        public ITeamList? TeamList;
+        public ITeamList TeamList = null!;
 
         [BackgroundDependencyLoader]
         private void load(Storage storage)
@@ -48,7 +48,8 @@ namespace osu.Game.Tournament.Screens.Drawings
 
             RelativeSizeAxes = Axes.Both;
 
-            TeamList ??= new StorageBackedTeamList(storage);
+            if (TeamList.IsNull())
+                TeamList = new StorageBackedTeamList(storage);
 
             if (!TeamList.Teams.Any())
             {
@@ -223,7 +224,7 @@ namespace osu.Game.Tournament.Screens.Drawings
             teamsContainer.ClearTeams();
             allTeams.Clear();
 
-            foreach (TournamentTeam t in TeamList.AsNonNull().Teams)
+            foreach (TournamentTeam t in TeamList.Teams)
             {
                 if (groupsContainer.ContainsTeam(t.FullName.Value))
                     continue;

From 88a1cf40052a92f70f8055fd1da33b44d575f022 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 01:57:44 +0900
Subject: [PATCH 0946/2100] remove all `canBeNull` from attribute

---
 osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs     | 2 +-
 osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs        | 2 +-
 .../Screens/Ladder/Components/DrawableMatchTeam.cs            | 4 ++--
 .../Screens/Ladder/Components/DrawableTournamentMatch.cs      | 4 ++--
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs          | 2 +-
 osu.Game.Tournament/Screens/Setup/SetupScreen.cs              | 2 +-
 osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index a82ac57ee9..4074e681f9 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tournament.Screens.Editors
 
         private RectangularPositionSnapGrid grid = null!;
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private IDialogOverlay? dialogOverlay { get; set; }
 
         protected override bool DrawLoserPaths => true;
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 79c50e60ba..20188cc5dc 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private OsuButton warmupButton = null!;
         private MatchIPCInfo ipc = null!;
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private TournamentSceneManager? sceneManager { get; set; }
 
         [Resolved]
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index a380ad9b49..637591c6f6 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         private readonly Func<bool>? isWinner;
         private LadderEditorScreen ladderEditor = null!;
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private LadderInfo? ladderInfo { get; set; }
 
         private void setCurrent()
@@ -53,7 +53,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             ladderInfo.CurrentMatch.Value.Current.Value = true;
         }
 
-        [Resolved(CanBeNull = true)]
+        [Resolved]
         private LadderEditorInfo? editorInfo { get; set; }
 
         public DrawableMatchTeam(TournamentTeam? team, TournamentMatch match, bool losers)
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index 7b8f2e373b..4de47d7c7f 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -28,10 +28,10 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         private readonly Drawable currentMatchSelectionBox;
         private Bindable<TournamentMatch>? globalSelection;
 
-        [Resolved(CanBeNull = true)]
+        [Resolved]
         private LadderEditorInfo? editorInfo { get; set; }
 
-        [Resolved(CanBeNull = true)]
+        [Resolved]
         private LadderInfo? ladderInfo { get; set; }
 
         public DrawableTournamentMatch(TournamentMatch match, bool editor = false)
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 3091f4293c..cfce2694e9 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tournament.Screens.MapPool
     {
         private FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows = null!;
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private TournamentSceneManager? sceneManager { get; set; }
 
         private TeamColour pickColour;
diff --git a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
index 1152759c2a..df1ce69c33 100644
--- a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tournament.Screens.Setup
         [Resolved]
         private RulesetStore rulesets { get; set; } = null!;
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private TournamentSceneManager? sceneManager { get; set; }
 
         private Bindable<Size> windowSize = null!;
diff --git a/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
index c3d072b6a0..74404e06f8 100644
--- a/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tournament.Screens.Setup
 {
     public partial class StablePathSelectScreen : TournamentScreen
     {
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private TournamentSceneManager? sceneManager { get; set; }
 
         [Resolved]

From 65b4ae506ee563b9a2b940c4a72b9c9d34ac5dc2 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Sat, 29 Jul 2023 13:18:47 -0400
Subject: [PATCH 0947/2100] Moved enum to bottom of enumeration table

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 3d24afbb16..79f098f90e 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -286,9 +286,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameInterface))]
         ToggleInGameInterface,
 
-        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameLeaderboard))]
-        ToggleInGameLeaderboard,
-
         // Song select keybindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleModSelection))]
         ToggleModSelection,
@@ -382,5 +379,9 @@ namespace osu.Game.Input.Bindings
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleReplaySettings))]
         ToggleReplaySettings,
+
+        // Editor (cont)
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameLeaderboard))]
+        ToggleInGameLeaderboard,
     }
 }

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 0948/2100] 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 0949/2100] 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 0950/2100] 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 0951/2100] 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 0952/2100] 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 9d928c0225d3b86257f1cf8cd71a606c46038892 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 29 Jul 2023 10:39:50 -0700
Subject: [PATCH 0953/2100] Apply NRT to `BreakInfoLine`

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index b8696352e8..c6a0ca0ef6 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -71,7 +69,7 @@ namespace osu.Game.Screens.Play.Break
             if (count is Enum countEnum)
                 return countEnum.GetDescription();
 
-            return count.ToString();
+            return count.ToString() ?? string.Empty;
         }
 
         [BackgroundDependencyLoader]

From 740898dffb910d5d6e8306c746e9578b383b47d0 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 29 Jul 2023 10:40:18 -0700
Subject: [PATCH 0954/2100] Remove unnecessary prefix parameter

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index c6a0ca0ef6..cfdf6cc651 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -24,12 +24,8 @@ namespace osu.Game.Screens.Play.Break
         private readonly OsuSpriteText text;
         private readonly OsuSpriteText valueText;
 
-        private readonly string prefix;
-
-        public BreakInfoLine(LocalisableString name, string prefix = @"")
+        public BreakInfoLine(LocalisableString name)
         {
-            this.prefix = prefix;
-
             AutoSizeAxes = Axes.Y;
             Children = new Drawable[]
             {
@@ -45,7 +41,7 @@ namespace osu.Game.Screens.Play.Break
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.CentreLeft,
-                    Text = prefix + @"-",
+                    Text = @"-",
                     Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 17),
                     Margin = new MarginPadding { Left = margin }
                 }
@@ -56,7 +52,7 @@ namespace osu.Game.Screens.Play.Break
 
         private void currentValueChanged(ValueChangedEvent<T> e)
         {
-            LocalisableString newText = LocalisableString.Interpolate($"{prefix}{Format(e.NewValue)}");
+            LocalisableString newText = Format(e.NewValue);
 
             if (valueText.Text == newText)
                 return;
@@ -82,8 +78,8 @@ namespace osu.Game.Screens.Play.Break
 
     public partial class PercentageBreakInfoLine : BreakInfoLine<double>
     {
-        public PercentageBreakInfoLine(LocalisableString name, string prefix = "")
-            : base(name, prefix)
+        public PercentageBreakInfoLine(LocalisableString name)
+            : base(name)
         {
         }
 

From 6ad8339c6674300806378693d79cc9f12285e71a Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:30:11 +0900
Subject: [PATCH 0955/2100] use no null when true

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 333dd0fd73..daf1417f6f 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using Microsoft.Win32;
@@ -180,7 +181,7 @@ namespace osu.Game.Tournament.IPC
         /// <returns>Whether an IPC directory was successfully auto-detected.</returns>
         public bool AutoDetectIPCLocation() => SetIPCLocation(findStablePath());
 
-        private static bool ipcFileExistsInDirectory(string? p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
+        private static bool ipcFileExistsInDirectory([NotNullWhen(true)] string? p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
 
         private string? findStablePath()
         {
@@ -201,7 +202,7 @@ namespace osu.Game.Tournament.IPC
                 string? stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
 
                 if (ipcFileExistsInDirectory(stableInstallPath))
-                    return stableInstallPath!;
+                    return stableInstallPath;
             }
             catch
             {

From a1f0e5978448040c646e0252ffc7fdf4077beb17 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:30:51 +0900
Subject: [PATCH 0956/2100] remove null check for b.Beatmap

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index cfce2694e9..9caa87d75e 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -252,9 +252,6 @@ namespace osu.Game.Tournament.Screens.MapPool
 
                 foreach (var b in CurrentMatch.Value.Round.Value.Beatmaps)
                 {
-                    if (b.Beatmap == null)
-                        continue;
-
                     if (currentFlow == null || (LadderInfo.SplitMapPoolByMods.Value && currentMods != b.Mods))
                     {
                         mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>

From bc2ca11bb0497b81c0a891a34aac645089828e02 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:31:05 +0900
Subject: [PATCH 0957/2100] move to initialiser

---
 osu.Game.Tournament/TournamentGameBase.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index ee03b4c35d..eecd097a97 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament
     public partial class TournamentGameBase : OsuGameBase
     {
         public const string BRACKET_FILENAME = @"bracket.json";
-        private LadderInfo ladder = null!;
+        private LadderInfo ladder = new LadderInfo();
         private TournamentStorage storage = null!;
         private DependencyContainer dependencies = null!;
         private FileBasedIPC ipc = null!;
@@ -77,8 +77,6 @@ namespace osu.Game.Tournament
             dependencies.CacheAs(new StableInfo(storage));
 
             beatmapCache = dependencies.Get<BeatmapLookupCache>();
-
-            ladder = new LadderInfo();
         }
 
         protected override void LoadComplete()

From 059012130924902e36d3e8311d23e4381b7d07eb Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:38:19 +0900
Subject: [PATCH 0958/2100] string mod should not null

Already assigned in the constructor
---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 2d5844d02b..0f916d931d 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tournament.Components
     {
         public readonly TournamentBeatmap? Beatmap;
 
-        private readonly string? mod;
+        private readonly string mod;
 
         public const float HEIGHT = 50;
 

From ba80d1e2d5e766a5791b047fcad736adb4f54340 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:49:13 +0900
Subject: [PATCH 0959/2100] remove nullable for Box

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 0f916d931d..ba922c7c7b 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Tournament.Components
 
         private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
 
-        private Box? flash;
+        private Box flash = null!;
 
         public TournamentBeatmapPanel(TournamentBeatmap? beatmap, string mod = "")
         {
@@ -135,11 +135,12 @@ namespace osu.Game.Tournament.Components
                 match.OldValue.PicksBans.CollectionChanged -= picksBansOnCollectionChanged;
             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;
 
@@ -157,7 +158,7 @@ namespace osu.Game.Tournament.Components
             if (newChoice != null)
             {
                 if (shouldFlash)
-                    flash?.FadeOutFromOne(500).Loop(0, 10);
+                    flash.FadeOutFromOne(500).Loop(0, 10);
 
                 BorderThickness = 6;
 

From 5d09eca1041e10119738707c608340a3d8ddf861 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:49:30 +0900
Subject: [PATCH 0960/2100] revert test change

---
 osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
index d6941848b7..b76e0d7521 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tournament.Tests.Screens
             {
                 Team1 = { Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA") },
                 Team2 = { Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN") },
-                Round = { Value = Ladder.Rounds.First(g => g.Name.Value == "Quarterfinals") }
+                Round = { Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals") }
             };
 
             Add(new TeamIntroScreen

From 99dd156d5322ab17a542b855796323fadd981e36 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:50:16 +0900
Subject: [PATCH 0961/2100] remove useless using

---
 osu.Game.Tournament/Models/TournamentTeam.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index b3b2f213ce..3cd527aaaa 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -5,7 +5,6 @@ using System;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 
 namespace osu.Game.Tournament.Models
 {

From 404a927caf55f05be24d1eadf0f3bda06227d92e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:56:52 +0900
Subject: [PATCH 0962/2100] fix Possible NullReferenceException in test

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

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
index cea4306ff8..0cb95c2e43 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tournament.Tests.Components
 
         private void success(APIBeatmap beatmap)
         {
-            var ruleset = rulesets.GetRuleset(Ladder.Ruleset.Value.OnlineID);
+            var ruleset = rulesets.GetRuleset(Ladder.Ruleset.Value?.OnlineID ?? -1);
 
             if (ruleset == null)
                 return;

From 6ebfafa9c3b1f24cc89ec72a577e70a799b052d1 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 29 Jul 2023 11:02:04 -0700
Subject: [PATCH 0963/2100] Remove unnecessary text comparison

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index cfdf6cc651..3357963fac 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -47,17 +47,7 @@ namespace osu.Game.Screens.Play.Break
                 }
             };
 
-            Current.ValueChanged += currentValueChanged;
-        }
-
-        private void currentValueChanged(ValueChangedEvent<T> e)
-        {
-            LocalisableString newText = Format(e.NewValue);
-
-            if (valueText.Text == newText)
-                return;
-
-            valueText.Text = newText;
+            Current.ValueChanged += text => valueText.Text = Format(text.NewValue);
         }
 
         protected virtual LocalisableString Format(T count)

From 4ddf05602f1f117f8ab0248c937a2487e76f59a3 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 29 Jul 2023 11:05:15 -0700
Subject: [PATCH 0964/2100] Update `BreakInfoLine` to formatting standards

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs | 34 ++++++++++++--------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index 3357963fac..147650ca07 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -21,21 +21,30 @@ namespace osu.Game.Screens.Play.Break
 
         public Bindable<T> Current = new Bindable<T>();
 
-        private readonly OsuSpriteText text;
-        private readonly OsuSpriteText valueText;
+        private readonly LocalisableString name;
+
+        private OsuSpriteText valueText = null!;
 
         public BreakInfoLine(LocalisableString name)
         {
+            this.name = name;
+
             AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
             Children = new Drawable[]
             {
-                text = new OsuSpriteText
+                new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.CentreRight,
                     Text = name,
                     Font = OsuFont.GetFont(size: 17),
-                    Margin = new MarginPadding { Right = margin }
+                    Margin = new MarginPadding { Right = margin },
+                    Colour = colours.Yellow,
                 },
                 valueText = new OsuSpriteText
                 {
@@ -43,11 +52,17 @@ namespace osu.Game.Screens.Play.Break
                     Origin = Anchor.CentreLeft,
                     Text = @"-",
                     Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 17),
-                    Margin = new MarginPadding { Left = margin }
+                    Margin = new MarginPadding { Left = margin },
+                    Colour = colours.YellowLight,
                 }
             };
+        }
 
-            Current.ValueChanged += text => valueText.Text = Format(text.NewValue);
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(text => valueText.Text = Format(text.NewValue), true);
         }
 
         protected virtual LocalisableString Format(T count)
@@ -57,13 +72,6 @@ namespace osu.Game.Screens.Play.Break
 
             return count.ToString() ?? string.Empty;
         }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            text.Colour = colours.Yellow;
-            valueText.Colour = colours.YellowLight;
-        }
     }
 
     public partial class PercentageBreakInfoLine : BreakInfoLine<double>

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 0965/2100] 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 0966/2100] 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 0967/2100] 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 0968/2100] 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 0969/2100] 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 0970/2100] 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 0971/2100] 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 0972/2100] 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 0973/2100] 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 0974/2100] 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 0975/2100] 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 0976/2100] 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 0977/2100] 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 0978/2100] 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 72005bef7c037977b084f8c5b8eb60a516610573 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 31 Jul 2023 15:10:58 +0900
Subject: [PATCH 0979/2100] Fix skin editor crashing if the same component is
 provided twice

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

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index 2b23ce290f..8179d58ddf 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -356,7 +356,7 @@ namespace osu.Game.Overlays.SkinEditor
                     {
                         new SettingsDropdown<SkinComponentsContainerLookup?>
                         {
-                            Items = availableTargets.Select(t => t.Lookup),
+                            Items = availableTargets.Select(t => t.Lookup).Distinct(),
                             Current = selectedTarget,
                         }
                     }

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 0980/2100] 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 0981/2100] 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)

From 2e2b0c4e4109905f46e17f478ab1c0e936abfb23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 00:22:08 +0200
Subject: [PATCH 0982/2100] Move `SliderWithTextBoxInput` to more general
 namespace

---
 .../UserInterfaceV2}/SliderWithTextBoxInput.cs                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename osu.Game/{Screens/Edit/Timing => Graphics/UserInterfaceV2}/SliderWithTextBoxInput.cs (97%)

diff --git a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
similarity index 97%
rename from osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
rename to osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
index 1bf0e5299d..3f4e133d45 100644
--- a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
@@ -8,12 +8,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
-using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays.Settings;
 using osu.Game.Utils;
 using osuTK;
 
-namespace osu.Game.Screens.Edit.Timing
+namespace osu.Game.Graphics.UserInterfaceV2
 {
     public partial class SliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T>
         where T : struct, IEquatable<T>, IComparable<T>, IConvertible

From ca81f233563aca7d39822a6d551fc8824c1d3d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 00:44:05 +0200
Subject: [PATCH 0983/2100] Add test covering non-instantaneous behaviour

---
 .../TestSceneSliderWithTextBoxInput.cs        | 63 +++++++++++++++++++
 .../UserInterfaceV2/SliderWithTextBoxInput.cs |  2 -
 2 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
new file mode 100644
index 0000000000..dc70e2b9cb
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
@@ -0,0 +1,63 @@
+// Copyright (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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public partial class TestSceneSliderWithTextBoxInput : OsuManualInputManagerTestScene
+    {
+        private SliderWithTextBoxInput<float> sliderWithTextBoxInput = null!;
+
+        private OsuSliderBar<float> slider => sliderWithTextBoxInput.ChildrenOfType<OsuSliderBar<float>>().Single();
+        private Nub nub => sliderWithTextBoxInput.ChildrenOfType<Nub>().Single();
+        private OsuTextBox textBox => sliderWithTextBoxInput.ChildrenOfType<OsuTextBox>().Single();
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create slider", () => Child = sliderWithTextBoxInput = new SliderWithTextBoxInput<float>("Test Slider")
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Width = 0.5f,
+                Current = new BindableFloat
+                {
+                    MinValue = -5,
+                    MaxValue = 5,
+                    Precision = 0.2f
+                }
+            });
+        }
+
+        [Test]
+        public void TestNonInstantaneousMode()
+        {
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("change text", () => textBox.Text = "3");
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.Zero);
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.Zero);
+
+            AddStep("commit text", () => InputManager.Key(Key.Enter));
+            AddAssert("slider moved", () => slider.Current.Value, () => Is.EqualTo(3));
+            AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(3));
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(nub));
+            AddStep("hold left mouse", () => InputManager.PressButton(MouseButton.Left));
+            AddStep("move mouse to minimum", () => InputManager.MoveMouseTo(sliderWithTextBoxInput.ScreenSpaceDrawQuad.BottomLeft));
+            AddAssert("textbox not changed", () => textBox.Current.Value, () => Is.EqualTo("3"));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(3));
+
+            AddStep("release left mouse", () => InputManager.ReleaseButton(MouseButton.Left));
+            AddAssert("textbox changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
+            AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
index 3f4e133d45..38de0ea94a 100644
--- a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
@@ -51,8 +51,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
             textBox.OnCommit += (t, isNew) =>
             {
-                if (!isNew) return;
-
                 try
                 {
                     switch (slider.Current)

From 0b019f1d4526dbad742fb8d36d3d7923b575c091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 00:45:57 +0200
Subject: [PATCH 0984/2100] Add test covering desired instantaneous behaviour

---
 .../TestSceneSliderWithTextBoxInput.cs        | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
index dc70e2b9cb..37f18cd3dd 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
@@ -59,5 +59,28 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("textbox changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
             AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
         }
+
+        [Test]
+        public void TestInstantaneousMode()
+        {
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("change text", () => textBox.Text = "3");
+            AddAssert("slider moved", () => slider.Current.Value, () => Is.EqualTo(3));
+            AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(3));
+
+            AddStep("commit text", () => InputManager.Key(Key.Enter));
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(3));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(3));
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(nub));
+            AddStep("hold left mouse", () => InputManager.PressButton(MouseButton.Left));
+            AddStep("move mouse to minimum", () => InputManager.MoveMouseTo(sliderWithTextBoxInput.ScreenSpaceDrawQuad.BottomLeft));
+            AddAssert("textbox changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
+            AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("release left mouse", () => InputManager.ReleaseButton(MouseButton.Left));
+            AddAssert("textbox not changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+        }
     }
 }

From 4fb0ff8800281dc7c4fd97c99359791e1edd6390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 00:51:29 +0200
Subject: [PATCH 0985/2100] Implement instantaneous `SliderWithTextBoxInput`
 mode

---
 .../TestSceneSliderWithTextBoxInput.cs        |   4 +
 .../UserInterfaceV2/SliderWithTextBoxInput.cs | 128 ++++++++++++------
 2 files changed, 88 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
index 37f18cd3dd..797afccc77 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestNonInstantaneousMode()
         {
+            AddStep("set instantaneous to false", () => sliderWithTextBoxInput.Instantaneous = false);
+
             AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
             AddStep("change text", () => textBox.Text = "3");
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.Zero);
@@ -63,6 +65,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestInstantaneousMode()
         {
+            AddStep("set instantaneous to true", () => sliderWithTextBoxInput.Instantaneous = true);
+
             AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
             AddStep("change text", () => textBox.Text = "3");
             AddAssert("slider moved", () => slider.Current.Value, () => Is.EqualTo(3));
diff --git a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
index 38de0ea94a..fc0e4d2083 100644
--- a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
@@ -17,12 +17,42 @@ namespace osu.Game.Graphics.UserInterfaceV2
     public partial class SliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T>
         where T : struct, IEquatable<T>, IComparable<T>, IConvertible
     {
+        /// <summary>
+        /// A custom step value for each key press which actuates a change on this control.
+        /// </summary>
+        public float KeyboardStep
+        {
+            get => slider.KeyboardStep;
+            set => slider.KeyboardStep = value;
+        }
+
+        public Bindable<T> Current
+        {
+            get => slider.Current;
+            set => slider.Current = value;
+        }
+
+        private bool instantaneous;
+
+        /// <summary>
+        /// Whether changes to the slider should instantaneously transfer to the text box (and vice versa).
+        /// If <see langword="false"/>, the transfer will happen on text box commit (explicit, or implicit via focus loss), or on slider drag end.
+        /// </summary>
+        public bool Instantaneous
+        {
+            get => instantaneous;
+            set
+            {
+                instantaneous = value;
+                slider.TransferValueOnCommit = !instantaneous;
+            }
+        }
+
         private readonly SettingsSlider<T> slider;
+        private readonly LabelledTextBox textBox;
 
         public SliderWithTextBoxInput(LocalisableString labelText)
         {
-            LabelledTextBox textBox;
-
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
@@ -49,55 +79,65 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 },
             };
 
-            textBox.OnCommit += (t, isNew) =>
-            {
-                try
-                {
-                    switch (slider.Current)
-                    {
-                        case Bindable<int> bindableInt:
-                            bindableInt.Value = int.Parse(t.Text);
-                            break;
+            textBox.OnCommit += textCommitted;
+            textBox.Current.BindValueChanged(textChanged);
 
-                        case Bindable<double> bindableDouble:
-                            bindableDouble.Value = double.Parse(t.Text);
-                            break;
-
-                        default:
-                            slider.Current.Parse(t.Text);
-                            break;
-                    }
-                }
-                catch
-                {
-                    // TriggerChange below will restore the previous text value on failure.
-                }
-
-                // This is run regardless of parsing success as the parsed number may not actually trigger a change
-                // due to bindable clamping. Even in such a case we want to update the textbox to a sane visual state.
-                Current.TriggerChange();
-            };
-
-            Current.BindValueChanged(_ =>
-            {
-                decimal decimalValue = slider.Current.Value.ToDecimal(NumberFormatInfo.InvariantInfo);
-                textBox.Text = decimalValue.ToString($@"N{FormatUtils.FindPrecision(decimalValue)}");
-            }, true);
+            Current.BindValueChanged(updateTextBoxFromSlider, true);
         }
 
-        /// <summary>
-        /// A custom step value for each key press which actuates a change on this control.
-        /// </summary>
-        public float KeyboardStep
+        private bool updatingFromTextBox;
+
+        private void textChanged(ValueChangedEvent<string> change)
         {
-            get => slider.KeyboardStep;
-            set => slider.KeyboardStep = value;
+            if (!instantaneous) return;
+
+            tryUpdateSliderFromTextBox();
         }
 
-        public Bindable<T> Current
+        private void textCommitted(TextBox t, bool isNew)
         {
-            get => slider.Current;
-            set => slider.Current = value;
+            tryUpdateSliderFromTextBox();
+
+            // If the attempted update above failed, restore text box to match the slider.
+            Current.TriggerChange();
+        }
+
+        private void tryUpdateSliderFromTextBox()
+        {
+            updatingFromTextBox = true;
+
+            try
+            {
+                switch (slider.Current)
+                {
+                    case Bindable<int> bindableInt:
+                        bindableInt.Value = int.Parse(textBox.Current.Value);
+                        break;
+
+                    case Bindable<double> bindableDouble:
+                        bindableDouble.Value = double.Parse(textBox.Current.Value);
+                        break;
+
+                    default:
+                        slider.Current.Parse(textBox.Current.Value);
+                        break;
+                }
+            }
+            catch
+            {
+                // ignore parsing failures.
+                // sane state will eventually be restored by a commit (either explicit, or implicit via focus loss).
+            }
+
+            updatingFromTextBox = false;
+        }
+
+        private void updateTextBoxFromSlider(ValueChangedEvent<T> _)
+        {
+            if (updatingFromTextBox) return;
+
+            decimal decimalValue = slider.Current.Value.ToDecimal(NumberFormatInfo.InvariantInfo);
+            textBox.Text = decimalValue.ToString($@"N{FormatUtils.FindPrecision(decimalValue)}");
         }
     }
 }

From 049215f2dc1cbdd2ae17c10d28a0430b0dd28ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 00:54:40 +0200
Subject: [PATCH 0986/2100] Add test coverage for invalid input scenarios

---
 .../TestSceneSliderWithTextBoxInput.cs        | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
index 797afccc77..d23fcebae3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
@@ -60,6 +60,26 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("release left mouse", () => InputManager.ReleaseButton(MouseButton.Left));
             AddAssert("textbox changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
             AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("set text to invalid", () => textBox.Text = "garbage");
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("commit text", () => InputManager.Key(Key.Enter));
+            AddAssert("text restored", () => textBox.Text, () => Is.EqualTo("-5"));
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("set text to invalid", () => textBox.Text = "garbage");
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("lose focus", () => InputManager.ChangeFocus(null));
+            AddAssert("text restored", () => textBox.Text, () => Is.EqualTo("-5"));
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
         }
 
         [Test]
@@ -85,6 +105,26 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("release left mouse", () => InputManager.ReleaseButton(MouseButton.Left));
             AddAssert("textbox not changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("set text to invalid", () => textBox.Text = "garbage");
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("commit text", () => InputManager.Key(Key.Enter));
+            AddAssert("text restored", () => textBox.Text, () => Is.EqualTo("-5"));
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("set text to invalid", () => textBox.Text = "garbage");
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("lose focus", () => InputManager.ChangeFocus(null));
+            AddAssert("text restored", () => textBox.Text, () => Is.EqualTo("-5"));
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
         }
     }
 }

From ed0c7e888085b798dda471b00a905058ca734e90 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 19:21:46 +0900
Subject: [PATCH 0987/2100] Add failing test coverage showing crash on multiple
 `StartGameplay` invocations

---
 .../Multiplayer/TestSceneMultiSpectatorScreen.cs   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index e81dc87d4f..864c987569 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -78,6 +78,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddWaitStep("wait a bit", 20);
         }
 
+        [Test]
+        public void TestMultipleStartRequests()
+        {
+            int[] userIds = getPlayerIds(2);
+
+            start(userIds);
+            loadSpectateScreen();
+
+            sendFrames(userIds, 1000);
+            AddWaitStep("wait a bit", 20);
+
+            start(userIds);
+        }
+
         [Test]
         public void TestDelayedStart()
         {

From 9fe9ea2c90545e9ce546ffd0cebb9224b20a6cac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 19:18:18 +0900
Subject: [PATCH 0988/2100] Fix potential crash on multiple `StartGameplay`
 calls in multiplayer spectator

---
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 7528ff4064..afc10d0c0a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -214,7 +214,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         protected override void StartGameplay(int userId, SpectatorGameplayState spectatorGameplayState)
-            => instances.Single(i => i.UserId == userId).LoadScore(spectatorGameplayState.Score);
+        {
+            var playerArea = instances.Single(i => i.UserId == userId);
+
+            // The multiplayer spectator flow requires the client to return to a higher level screen
+            // (ie. StartGameplay should only be called once per player).
+            //
+            // Meanwhile, the solo spectator flow supports multiple `StartGameplay` calls.
+            // To ensure we don't crash out in an edge case where this is called more than once in multiplayer,
+            // guard against re-entry for the same player.
+            if (playerArea.Score != null)
+                return;
+
+            playerArea.LoadScore(spectatorGameplayState.Score);
+        }
 
         protected override void QuitGameplay(int userId)
         {

From fe47dc291bff3559ff13473dd384c3afbd73a481 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 19:08:26 +0900
Subject: [PATCH 0989/2100] Fix `onLoadRequested` getting early-exited too
 early in spectator scenarios

In some scenarios, multiplayer spectator would not tick over to the next
beatmap.

Here's an example:

- Room has two items queued
- Local user starts download of both
- First beatmap starts and download is complete
- First beatmap ends (spectating is active)
- Second beatmap starts but download is not complete

In this scenario, the local client will get stuck at the spectator
screen due to the `onLoadRequested`-invoked screen change being early
exited.

It would require manual recovery (clicking back button) to return to a
sane state.
---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index f13b47c0f5..7c12e6eab5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -371,9 +371,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onLoadRequested()
         {
-            if (BeatmapAvailability.Value.State != DownloadState.LocallyAvailable)
-                return;
-
             // In the case of spectating, IMultiplayerClient.LoadRequested can be fired while the game is still spectating a previous session.
             // For now, we want to game to switch to the new game so need to request exiting from the play screen.
             if (!ParentScreen.IsCurrentScreen())
@@ -391,6 +388,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client.LocalUser?.State == MultiplayerUserState.Spectating && (SelectedItem.Value == null || Beatmap.IsDefault))
                 return;
 
+            if (BeatmapAvailability.Value.State != DownloadState.LocallyAvailable)
+                return;
+
             StartPlay();
         }
 

From df504e1fc2f8fcae2e36f5548b80d44acb640a2a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 19:00:01 +0900
Subject: [PATCH 0990/2100] Show extended statistics in multiplayer spectator
 automatically

---
 .../Spectate/MultiSpectatorResultsScreen.cs     |  7 +++++++
 osu.Game/Screens/Ranking/ResultsScreen.cs       | 17 +++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs
index fe3f02466d..2afc187e40 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs
@@ -18,6 +18,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Scheduler.AddDelayed(() => StatisticsPanel.ToggleVisibility(), 1000);
+        }
+
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
         protected override APIRequest FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 43ddcffb62..78815d430f 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -55,7 +55,8 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private StatisticsPanel statisticsPanel;
+        protected StatisticsPanel StatisticsPanel;
+
         private Drawable bottomPanel;
         private Container<ScorePanel> detachedPanelContainer;
 
@@ -98,7 +99,7 @@ namespace osu.Game.Screens.Ranking
                                 RelativeSizeAxes = Axes.Both,
                                 Children = new Drawable[]
                                 {
-                                    statisticsPanel = CreateStatisticsPanel().With(panel =>
+                                    StatisticsPanel = CreateStatisticsPanel().With(panel =>
                                     {
                                         panel.RelativeSizeAxes = Axes.Both;
                                         panel.Score.BindTarget = SelectedScore;
@@ -107,7 +108,7 @@ namespace osu.Game.Screens.Ranking
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         SelectedScore = { BindTarget = SelectedScore },
-                                        PostExpandAction = () => statisticsPanel.ToggleVisibility()
+                                        PostExpandAction = () => StatisticsPanel.ToggleVisibility()
                                     },
                                     detachedPanelContainer = new Container<ScorePanel>
                                     {
@@ -194,7 +195,7 @@ namespace osu.Game.Screens.Ranking
             if (req != null)
                 api.Queue(req);
 
-            statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
+            StatisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
         }
 
         protected override void Update()
@@ -234,7 +235,7 @@ namespace osu.Game.Screens.Ranking
         protected virtual APIRequest FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
         /// <summary>
-        /// Creates the <see cref="StatisticsPanel"/> to be used to display extended information about scores.
+        /// Creates the <see cref="Statistics.StatisticsPanel"/> to be used to display extended information about scores.
         /// </summary>
         protected virtual StatisticsPanel CreateStatisticsPanel() => new StatisticsPanel();
 
@@ -272,9 +273,9 @@ namespace osu.Game.Screens.Ranking
 
         public override bool OnBackButton()
         {
-            if (statisticsPanel.State.Value == Visibility.Visible)
+            if (StatisticsPanel.State.Value == Visibility.Visible)
             {
-                statisticsPanel.Hide();
+                StatisticsPanel.Hide();
                 return true;
             }
 
@@ -353,7 +354,7 @@ namespace osu.Game.Screens.Ranking
             switch (e.Action)
             {
                 case GlobalAction.Select:
-                    statisticsPanel.ToggleVisibility();
+                    StatisticsPanel.ToggleVisibility();
                     return true;
             }
 

From 70bd1d3cf484f018442db2f8d86e7edea962b504 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 20:18:21 +0900
Subject: [PATCH 0991/2100] Fix centred player not animating correctly

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index 4e624da17f..ffc2328dc0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 );
 
                 // If we don't track the animating state, the animation will also occur when resizing the window.
-                isAnimating &= !Precision.AlmostEquals(Position, targetPos, 0.01f);
+                isAnimating &= !Precision.AlmostEquals(Size, targetSize, 0.5f);
             }
 
             /// <summary>

From bcfc76b469e25108c341c876ab76fc71419ec1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 17:41:07 +0200
Subject: [PATCH 0992/2100] Add visual-only test coverage for centred player
 case

---
 .../Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index e81dc87d4f..f90385ed9d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -67,6 +67,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         [TestCase(1)]
         [TestCase(4)]
+        [TestCase(9)]
         public void TestGeneral(int count)
         {
             int[] userIds = getPlayerIds(count);

From f7d5ac9f926c9463094512a7b67290b3c4efbe86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 18:09:48 +0200
Subject: [PATCH 0993/2100] Privatise setter

---
 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 78815d430f..1d0499c909 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        protected StatisticsPanel StatisticsPanel;
+        protected StatisticsPanel StatisticsPanel { get; private set; }
 
         private Drawable bottomPanel;
         private Container<ScorePanel> detachedPanelContainer;

From 426bc52fd544a7512f27284a28ef6cc50225d286 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Tue, 1 Aug 2023 14:27:37 -0400
Subject: [PATCH 0994/2100] Updated schema_version number and added braces
 around some migration cases to help with re-using variable names

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

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index f32b161bb6..c949ccbe43 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -82,8 +82,9 @@ namespace osu.Game.Database
         /// 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.
+        /// 32   2023-08-01    Added a new keybind that toggles the in-game leaderboard on and off
         /// </summary>
-        private const int schema_version = 32;
+        private const int schema_version = 33;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -771,6 +772,7 @@ namespace osu.Game.Database
                     break;
 
                 case 8:
+                {
                     // Ctrl -/+ now adjusts UI scale so let's clear any bindings which overlap these combinations.
                     // New defaults will be populated by the key store afterwards.
                     var keyBindings = migration.NewRealm.All<RealmKeyBinding>();
@@ -784,6 +786,7 @@ namespace osu.Game.Database
                         migration.NewRealm.Remove(decreaseSpeedBinding);
 
                     break;
+                }
 
                 case 9:
                     // Pretty pointless to do this as beatmaps aren't really loaded via realm yet, but oh well.
@@ -838,6 +841,7 @@ namespace osu.Game.Database
                     break;
 
                 case 11:
+                {
                     string keyBindingClassName = getMappedOrOriginalName(typeof(RealmKeyBinding));
 
                     if (!migration.OldRealm.Schema.TryFindObjectSchema(keyBindingClassName, out _))
@@ -864,6 +868,7 @@ namespace osu.Game.Database
                     }
 
                     break;
+                }
 
                 case 14:
                     foreach (var beatmap in migration.NewRealm.All<BeatmapInfo>())
@@ -1012,6 +1017,14 @@ namespace osu.Game.Database
 
                     break;
                 }
+
+                case 33:
+                {
+                    var oldKeyBinds = migration.NewRealm.All<RealmKeyBinding>();
+                    var newKeyBinds = migration.NewRealm.All<RealmKeyBinding>();
+
+                    break;
+                }
             }
 
             Logger.Log($"Migration completed in {stopwatch.ElapsedMilliseconds}ms");

From 5443f89dca0823fac233d54d1dd850b793b4145c Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Tue, 1 Aug 2023 16:58:52 -0400
Subject: [PATCH 0995/2100] Assuming its still set to tab, removes binding for
 toggle chat so itll be set to the new default

---
 osu.Game/Database/RealmAccess.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index c949ccbe43..d751cce834 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -1020,8 +1020,14 @@ namespace osu.Game.Database
 
                 case 33:
                 {
-                    var oldKeyBinds = migration.NewRealm.All<RealmKeyBinding>();
-                    var newKeyBinds = migration.NewRealm.All<RealmKeyBinding>();
+                    // Get all current keybinds, and find the toggle chat bind
+                    // (by default it used to overlap the new toggle leaderboard)
+                    var newKeyBindings = migration.NewRealm.All<RealmKeyBinding>().ToList();
+                    var toggleChatBind = newKeyBindings.FirstOrDefault(bind => bind.ActionInt == (int)GlobalAction.ToggleChatFocus);
+
+                    // If we have a bind for it, and that bind is tab, remove it
+                    if (toggleChatBind != default && toggleChatBind.KeyCombination.Keys.SequenceEqual(new[] { InputKey.Tab }))
+                        migration.NewRealm.Remove(toggleChatBind);
 
                     break;
                 }

From a618ed140e0bd631f3d0aeba8a625b37c991673d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 15:07:06 +0900
Subject: [PATCH 0996/2100] Move `StoryboardReplacesBackground` bindable more
 local to usage

---
 osu.Game/Graphics/Containers/UserDimContainer.cs        | 6 ------
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs | 9 +++++++--
 osu.Game/Screens/Play/Player.cs                         | 2 --
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 6f6292c3b2..4821e6b370 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -28,11 +28,6 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
 
-        /// <summary>
-        /// Whether or not the storyboard loaded should completely hide the background behind it.
-        /// </summary>
-        public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
-
         /// <summary>
         /// Whether player is in break time.
         /// Must be bound to <see cref="BreakTracker.IsBreakTime"/> to allow for dim adjustments in gameplay.
@@ -83,7 +78,6 @@ namespace osu.Game.Graphics.Containers
             LightenDuringBreaks.ValueChanged += _ => UpdateVisuals();
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
             ShowStoryboard.ValueChanged += _ => UpdateVisuals();
-            StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
             IgnoreUserSettings.ValueChanged += _ => UpdateVisuals();
         }
 
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 312fd496a1..8a3755f980 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Screens.Backgrounds
         /// </remarks>
         public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>(true);
 
+        /// <summary>
+        /// Whether or not the storyboard loaded should completely hide the background behind it.
+        /// </summary>
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
         /// <summary>
@@ -60,12 +63,11 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
+            dimmable.StoryboardReplacesBackground.BindTo(StoryboardReplacesBackground);
             dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);
             dimmable.DimWhenUserSettingsIgnored.BindTo(DimWhenUserSettingsIgnored);
-
-            StoryboardReplacesBackground.BindTo(dimmable.StoryboardReplacesBackground);
         }
 
         [BackgroundDependencyLoader]
@@ -144,6 +146,8 @@ namespace osu.Game.Screens.Backgrounds
             /// </remarks>
             public readonly Bindable<float> BlurAmount = new BindableFloat();
 
+            public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
+
             public Background Background
             {
                 get => background;
@@ -187,6 +191,7 @@ namespace osu.Game.Screens.Backgrounds
 
                 userBlurLevel.ValueChanged += _ => UpdateVisuals();
                 BlurAmount.ValueChanged += _ => UpdateVisuals();
+                StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
             }
 
             protected override bool ShowDimContent
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7d67e2657d..5f8e061d89 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1049,8 +1049,6 @@ namespace osu.Game.Screens.Play
 
             DimmableStoryboard.IsBreakTime.BindTo(breakTracker.IsBreakTime);
 
-            DimmableStoryboard.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
-
             storyboardReplacesBackground.Value = Beatmap.Value.Storyboard.ReplacesBackground && Beatmap.Value.Storyboard.HasDrawable;
 
             foreach (var mod in GameplayState.Mods.OfType<IApplicableToPlayer>())

From 0e510088f90e0c177be9f7147be61e39c149c97c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 15:50:15 +0900
Subject: [PATCH 0997/2100] Ensure background of gameplay is black when
 storyboard is overriding background display

---
 .../Background/TestSceneUserDimBackgrounds.cs | 26 +++++++++----------
 .../Graphics/Containers/UserDimContainer.cs   |  7 +++--
 .../Backgrounds/BackgroundScreenBeatmap.cs    | 13 +++++++---
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 5df5337a96..566ccd6bd5 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -125,13 +125,13 @@ namespace osu.Game.Tests.Visual.Background
             createFakeStoryboard();
             AddStep("Enable Storyboard", () =>
             {
-                player.ReplacesBackground.Value = true;
+                player.StoryboardReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
-            AddUntilStep("Background is invisible, storyboard is visible", () => songSelect.IsBackgroundInvisible() && player.IsStoryboardVisible);
+            AddUntilStep("Background is black, storyboard is visible", () => songSelect.IsBackgroundVisible() && songSelect.IsBackgroundBlack() && player.IsStoryboardVisible);
             AddStep("Disable Storyboard", () =>
             {
-                player.ReplacesBackground.Value = false;
+                player.StoryboardReplacesBackground.Value = false;
                 player.StoryboardEnabled.Value = false;
             });
             AddUntilStep("Background is visible, storyboard is invisible", () => songSelect.IsBackgroundVisible() && !player.IsStoryboardVisible);
@@ -173,7 +173,7 @@ namespace osu.Game.Tests.Visual.Background
             createFakeStoryboard();
             AddStep("Enable Storyboard", () =>
             {
-                player.ReplacesBackground.Value = true;
+                player.StoryboardReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
             AddStep("Enable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = false);
@@ -188,7 +188,7 @@ namespace osu.Game.Tests.Visual.Background
         {
             performFullSetup();
             createFakeStoryboard();
-            AddStep("Enable replacing background", () => player.ReplacesBackground.Value = true);
+            AddStep("Enable replacing background", () => player.StoryboardReplacesBackground.Value = true);
 
             AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
             AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible());
@@ -199,11 +199,11 @@ namespace osu.Game.Tests.Visual.Background
                 player.DimmableStoryboard.IgnoreUserSettings.Value = true;
             });
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
-            AddUntilStep("Background is invisible", () => songSelect.IsBackgroundInvisible());
+            AddUntilStep("Background is dimmed", () => songSelect.IsBackgroundVisible() && songSelect.IsBackgroundBlack());
 
-            AddStep("Disable background replacement", () => player.ReplacesBackground.Value = false);
+            AddStep("Disable background replacement", () => player.StoryboardReplacesBackground.Value = false);
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
-            AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible());
+            AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible() && !songSelect.IsBackgroundBlack());
         }
 
         /// <summary>
@@ -257,7 +257,7 @@ namespace osu.Game.Tests.Visual.Background
         private void createFakeStoryboard() => AddStep("Create storyboard", () =>
         {
             player.StoryboardEnabled.Value = false;
-            player.ReplacesBackground.Value = false;
+            player.StoryboardReplacesBackground.Value = false;
             player.DimmableStoryboard.Add(new OsuSpriteText
             {
                 Size = new Vector2(500, 50),
@@ -323,6 +323,8 @@ namespace osu.Game.Tests.Visual.Background
                 config.BindWith(OsuSetting.BlurLevel, BlurLevel);
             }
 
+            public bool IsBackgroundBlack() => background.CurrentColour == OsuColour.Gray(0);
+
             public bool IsBackgroundDimmed() => background.CurrentColour == OsuColour.Gray(1f - background.CurrentDim);
 
             public bool IsBackgroundUndimmed() => background.CurrentColour == Color4.White;
@@ -331,8 +333,6 @@ namespace osu.Game.Tests.Visual.Background
 
             public bool IsUserBlurDisabled() => background.CurrentBlur == new Vector2(0);
 
-            public bool IsBackgroundInvisible() => background.CurrentAlpha == 0;
-
             public bool IsBackgroundVisible() => background.CurrentAlpha == 1;
 
             public bool IsBackgroundBlur() => Precision.AlmostEquals(background.CurrentBlur, new Vector2(BACKGROUND_BLUR), 0.1f);
@@ -367,7 +367,7 @@ namespace osu.Game.Tests.Visual.Background
             {
                 base.OnEntering(e);
 
-                ApplyToBackground(b => ReplacesBackground.BindTo(b.StoryboardReplacesBackground));
+                ApplyToBackground(b => StoryboardReplacesBackground.BindTo(b.StoryboardReplacesBackground));
             }
 
             public new DimmableStoryboard DimmableStoryboard => base.DimmableStoryboard;
@@ -376,7 +376,7 @@ namespace osu.Game.Tests.Visual.Background
             public bool BlockLoad;
 
             public Bindable<bool> StoryboardEnabled;
-            public readonly Bindable<bool> ReplacesBackground = new Bindable<bool>();
+            public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
             public readonly Bindable<bool> IsPaused = new Bindable<bool>();
 
             public LoadBlockingTestPlayer(bool allowPause = true)
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 4821e6b370..625702ef6e 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -24,8 +24,11 @@ namespace osu.Game.Graphics.Containers
         public const double BACKGROUND_FADE_DURATION = 800;
 
         /// <summary>
-        /// Whether or not user-configured settings relating to brightness of elements should be ignored
+        /// Whether or not user-configured settings relating to brightness of elements should be ignored.
         /// </summary>
+        /// <remarks>
+        /// For best or worst, this also bypasses storyboard disable. Not sure this is correct but leaving it as to not break anything.
+        /// </remarks>
         public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
 
         /// <summary>
@@ -52,7 +55,7 @@ namespace osu.Game.Graphics.Containers
 
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 
-        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : DimWhenUserSettingsIgnored.Value, 0);
+        protected virtual float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : DimWhenUserSettingsIgnored.Value, 0);
 
         protected override Container<Drawable> Content => dimContent;
 
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 8a3755f980..1506b884b4 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -194,9 +194,16 @@ namespace osu.Game.Screens.Backgrounds
                 StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
             }
 
-            protected override bool ShowDimContent
-                // The background needs to be hidden in the case of it being replaced by the storyboard
-                => (!ShowStoryboard.Value && !IgnoreUserSettings.Value) || !StoryboardReplacesBackground.Value;
+            protected override float DimLevel
+            {
+                get
+                {
+                    if ((IgnoreUserSettings.Value || ShowStoryboard.Value) && StoryboardReplacesBackground.Value)
+                        return 1;
+
+                    return base.DimLevel;
+                }
+            }
 
             protected override void UpdateVisuals()
             {

From eef63b41dae7bc1d7916236b0bb2f0f6800cca4c Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 15:01:58 +0900
Subject: [PATCH 0998/2100] fetch missing beatmap when import score with
 missing beatmap

---
 .../Online/TestSceneReplayMissingBeatmap.cs   |  96 ++++++++
 osu.Game/OsuGame.cs                           |   2 +
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs |  15 +-
 osu.Game/Scoring/ScoreImporter.cs             |  21 ++
 osu.Game/Scoring/ScoreManager.cs              |   7 +
 .../Import/ReplayMissingBeatmapScreen.cs      | 210 ++++++++++++++++++
 6 files changed, 349 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
 create mode 100644 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
new file mode 100644
index 0000000000..a260cc8593
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
@@ -0,0 +1,96 @@
+// Copyright (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;
+using NUnit.Framework;
+using osu.Game.Database;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Screens.Import;
+using osu.Game.Tests.Resources;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public partial class TestSceneReplayMissingBeatmap : OsuGameTestScene
+    {
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+
+        [Test]
+        public void TestSceneMissingBeatmapWithOnlineAvailable()
+        {
+            var beatmap = new APIBeatmap
+            {
+                OnlineBeatmapSetID = 173612
+            };
+
+            var beatmapset = new APIBeatmapSet
+            {
+                OnlineID = 173612,
+            };
+
+            setupBeatmapResponse(beatmap, beatmapset);
+
+            AddStep("import score", () =>
+            {
+                using (var resourceStream = TestResources.OpenResource("Replays/mania-replay.osr"))
+                {
+                    var importTask = new ImportTask(resourceStream, "replay.osr");
+
+                    Game.ScoreManager.Import(new[] { importTask });
+                }
+            });
+
+            AddUntilStep("Replay missing screen show", () => Game.ScreenStack.CurrentScreen.GetType() == typeof(ReplayMissingBeatmapScreen));
+        }
+
+        [Test]
+        public void TestSceneMissingBeatmapWithOnlineUnavailable()
+        {
+            setupFailedResponse();
+
+            AddStep("import score", () =>
+            {
+                using (var resourceStream = TestResources.OpenResource("Replays/mania-replay.osr"))
+                {
+                    var importTask = new ImportTask(resourceStream, "replay.osr");
+
+                    Game.ScoreManager.Import(new[] { importTask });
+                }
+            });
+
+            AddUntilStep("Replay missing screen not show", () => Game.ScreenStack.CurrentScreen.GetType() != typeof(ReplayMissingBeatmapScreen));
+        }
+
+        private void setupBeatmapResponse(APIBeatmap b, APIBeatmapSet s)
+            => AddStep("setup response", () =>
+            {
+                dummyAPI.HandleRequest = request =>
+                {
+                    if (request is GetBeatmapRequest getBeatmapRequest)
+                    {
+                        getBeatmapRequest.TriggerSuccess(b);
+                        return true;
+                    }
+
+                    if (request is GetBeatmapSetRequest getBeatmapSetRequest)
+                    {
+                        getBeatmapSetRequest.TriggerSuccess(s);
+                        return true;
+                    }
+
+                    return false;
+                };
+            });
+
+        private void setupFailedResponse()
+            => AddStep("setup failed response", () =>
+            {
+                dummyAPI.HandleRequest = request =>
+                {
+                    request.TriggerFailure(new WebException());
+                    return true;
+                };
+            });
+    }
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1a40bb8e3d..50b4e4f125 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -854,6 +854,8 @@ namespace osu.Game
 
             MultiplayerClient.PostNotification = n => Notifications.Post(n);
 
+            ScoreManager.Performer = this;
+
             // make config aware of how to lookup skins for on-screen display purposes.
             // if this becomes a more common thing, tracked settings should be reconsidered to allow local DI.
             LocalConfig.LookupSkinName = id => SkinManager.Query(s => s.ID == id)?.ToString() ?? "Unknown";
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 8c00110909..a191220b37 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -7,6 +7,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using JetBrains.Annotations;
 using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
@@ -61,7 +62,7 @@ namespace osu.Game.Scoring.Legacy
                 workingBeatmap = GetBeatmap(beatmapHash);
 
                 if (workingBeatmap is DummyWorkingBeatmap)
-                    throw new BeatmapNotFoundException(beatmapHash);
+                    throw new BeatmapNotFoundException(beatmapHash, stream);
 
                 scoreInfo.User = new APIUser { Username = sr.ReadString() };
 
@@ -349,9 +350,19 @@ namespace osu.Game.Scoring.Legacy
         {
             public string Hash { get; }
 
-            public BeatmapNotFoundException(string hash)
+            [CanBeNull]
+            public MemoryStream ScoreStream { get; }
+
+            public BeatmapNotFoundException(string hash, [CanBeNull] Stream scoreStream)
             {
                 Hash = hash;
+
+                if (scoreStream != null)
+                {
+                    ScoreStream = new MemoryStream();
+                    scoreStream.Position = 0;
+                    scoreStream.CopyTo(ScoreStream);
+                }
             }
         }
     }
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 81b9f57bbc..408c83a5b8 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -9,6 +9,7 @@ using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.IO.Archives;
@@ -19,6 +20,8 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens;
+using osu.Game.Screens.Import;
 using Realms;
 
 namespace osu.Game.Scoring
@@ -27,6 +30,8 @@ namespace osu.Game.Scoring
     {
         public override IEnumerable<string> HandledExtensions => new[] { ".osr" };
 
+        public IPerformFromScreenRunner? Performer { get; set; }
+
         protected override string[] HashableFileTypes => new[] { ".osr" };
 
         private readonly RulesetStore rulesets;
@@ -54,12 +59,28 @@ namespace osu.Game.Scoring
                 }
                 catch (LegacyScoreDecoder.BeatmapNotFoundException e)
                 {
+                    onMissingBeatmap(e);
                     Logger.Log($@"Score '{name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
                     return null;
                 }
             }
         }
 
+        private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e)
+        {
+            var req = new GetBeatmapRequest(new BeatmapInfo
+            {
+                MD5Hash = e.Hash
+            });
+
+            req.Success += res =>
+            {
+                Performer?.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, e.ScoreStream)));
+            };
+
+            api.Queue(req);
+        }
+
         public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);
 
         protected override void Populate(ScoreInfo model, ArchiveReader? archive, Realm realm, CancellationToken cancellationToken = default)
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 31b5bd8365..9331168ab0 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Online.API;
 using osu.Game.Scoring.Legacy;
+using osu.Game.Screens;
 
 namespace osu.Game.Scoring
 {
@@ -30,6 +31,12 @@ namespace osu.Game.Scoring
         private readonly ScoreImporter scoreImporter;
         private readonly LegacyScoreExporter scoreExporter;
 
+        [CanBeNull]
+        public IPerformFromScreenRunner Performer
+        {
+            set => scoreImporter.Performer = value;
+        }
+
         public override bool PauseImports
         {
             get => base.PauseImports;
diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
new file mode 100644
index 0000000000..d7decc0e4e
--- /dev/null
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -0,0 +1,210 @@
+// Copyright (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;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables.Cards;
+using osu.Game.Configuration;
+using osu.Game.Database;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+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.Scoring;
+using osu.Game.Screens.Ranking;
+using osuTK;
+using Realms;
+
+namespace osu.Game.Screens.Import
+{
+    [Cached(typeof(IPreviewTrackOwner))]
+    public partial class ReplayMissingBeatmapScreen : OsuScreen, IPreviewTrackOwner
+    {
+        [Resolved]
+        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        [Resolved]
+        private ScoreManager scoreManager { get; set; } = null!;
+
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
+
+        private IDisposable? realmSubscription;
+
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        [Resolved]
+        private INotificationOverlay? notificationOverlay { get; set; }
+
+        private Container beatmapPanelContainer = null!;
+        private ReplayDownloadButton replayDownloadButton = null!;
+        private SettingsCheckbox automaticDownload = null!;
+
+        private readonly MemoryStream? scoreStream;
+        private readonly APIBeatmap beatmap;
+
+        private APIBeatmapSet? beatmapSetInfo;
+
+        public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream? scoreStream = null)
+        {
+            this.beatmap = beatmap;
+            this.scoreStream = scoreStream;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, OsuConfigManager config)
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    Masking = true,
+                    CornerRadius = 20,
+                    AutoSizeAxes = Axes.Both,
+                    AutoSizeDuration = 500,
+                    AutoSizeEasing = Easing.OutQuint,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colours.Gray5,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new FillFlowContainer
+                        {
+                            Margin = new MarginPadding(20),
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Vertical,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Spacing = new Vector2(15),
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Text = "Beatmap info",
+                                    Font = OsuFont.Default.With(size: 30),
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                },
+                                new FillFlowContainer
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Spacing = new Vector2(15),
+                                    Children = new Drawable[]
+                                    {
+                                        beatmapPanelContainer = new Container
+                                        {
+                                            AutoSizeAxes = Axes.Both,
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.CentreLeft,
+                                        },
+                                    }
+                                },
+                                automaticDownload = new SettingsCheckbox
+                                {
+                                    LabelText = "Automatically download beatmaps",
+                                    Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                },
+                                replayDownloadButton = new ReplayDownloadButton(new ScoreInfo())
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                },
+                            }
+                        }
+                    }
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            var onlineBeatmapRequest = new GetBeatmapSetRequest(beatmap.OnlineBeatmapSetID);
+
+            onlineBeatmapRequest.Success += res =>
+            {
+                beatmapSetInfo = res;
+                beatmapPanelContainer.Child = new BeatmapCardNormal(res, allowExpansion: false);
+                checkForAutomaticDownload(res);
+            };
+
+            api.Queue(onlineBeatmapRequest);
+
+            realmSubscription = realm.RegisterForNotifications(
+                realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
+        }
+
+        private void checkForAutomaticDownload(APIBeatmapSet beatmap)
+        {
+            if (!automaticDownload.Current.Value)
+                return;
+
+            beatmapDownloader.Download(beatmap);
+        }
+
+        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
+        {
+            if (changes?.InsertedIndices == null) return;
+
+            if (beatmapSetInfo == null) return;
+
+            if (scoreStream == null) return;
+
+            if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))
+            {
+                var progressNotification = new ImportProgressNotification();
+                var importTask = new ImportTask(scoreStream, "score.osr");
+
+                scoreManager.Import(progressNotification, new[] { importTask })
+                            .ContinueWith(s =>
+                            {
+                                s.GetResultSafely<IEnumerable<Live<ScoreInfo>>>().FirstOrDefault()?.PerformRead(score =>
+                                {
+                                    Guid scoreid = score.ID;
+                                    Scheduler.Add(() =>
+                                    {
+                                        replayDownloadButton.Score.Value = realm.Realm.Find<ScoreInfo>(scoreid) ?? new ScoreInfo();
+                                    });
+                                });
+                            });
+
+                notificationOverlay?.Post(progressNotification);
+
+                realmSubscription?.Dispose();
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            realmSubscription?.Dispose();
+        }
+    }
+}

From c07a1ec91ec0e087c6c7a437d5d0b684cea1b4e8 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 16:09:37 +0900
Subject: [PATCH 0999/2100] retrun DefaultBeatmap when beatmapset already
 delete pending

reimplement https://github.com/ppy/osu/pull/22741
---
 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 78eed626f2..c06f4da4ae 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Beatmaps
 
         public virtual WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo)
         {
-            if (beatmapInfo?.BeatmapSet == null)
+            if (beatmapInfo?.BeatmapSet == null || beatmapInfo.BeatmapSet?.DeletePending == true)
                 return DefaultBeatmap;
 
             lock (workingCache)

From 4c43c9232970c1ac9c4ce2ba4ad4dc54f910e530 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 17:48:24 +0900
Subject: [PATCH 1000/2100] ensure dispose stream

---
 osu.Game/Scoring/ScoreImporter.cs                     | 2 ++
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 408c83a5b8..ea3bd8f5ae 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -78,6 +78,8 @@ namespace osu.Game.Scoring
                 Performer?.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, e.ScoreStream)));
             };
 
+            req.Failure += _ => e.ScoreStream?.Dispose();
+
             api.Queue(req);
         }
 
diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index d7decc0e4e..a6215165fb 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -174,16 +174,17 @@ namespace osu.Game.Screens.Import
 
             if (beatmapSetInfo == null) return;
 
-            if (scoreStream == null) return;
+            if (scoreStream == null || !scoreStream.CanRead) return;
 
             if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))
             {
                 var progressNotification = new ImportProgressNotification();
                 var importTask = new ImportTask(scoreStream, "score.osr");
-
                 scoreManager.Import(progressNotification, new[] { importTask })
                             .ContinueWith(s =>
                             {
+                                scoreStream.Dispose();
+
                                 s.GetResultSafely<IEnumerable<Live<ScoreInfo>>>().FirstOrDefault()?.PerformRead(score =>
                                 {
                                     Guid scoreid = score.ID;
@@ -205,6 +206,7 @@ namespace osu.Game.Screens.Import
             base.Dispose(isDisposing);
 
             realmSubscription?.Dispose();
+            scoreStream?.Dispose();
         }
     }
 }

From 1bdd054bd60a6af5c0816cbbacf6ca629c771b8a Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 18:15:58 +0900
Subject: [PATCH 1001/2100] extract method

---
 .../Import/ReplayMissingBeatmapScreen.cs      | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index a6215165fb..5707721bde 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -64,6 +64,8 @@ namespace osu.Game.Screens.Import
         public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream? scoreStream = null)
         {
             this.beatmap = beatmap;
+            beatmapSetInfo = beatmap.BeatmapSet;
+
             this.scoreStream = scoreStream;
         }
 
@@ -145,21 +147,32 @@ namespace osu.Game.Screens.Import
         {
             base.LoadComplete();
 
-            var onlineBeatmapRequest = new GetBeatmapSetRequest(beatmap.OnlineBeatmapSetID);
-
-            onlineBeatmapRequest.Success += res =>
+            if (beatmapSetInfo == null)
             {
-                beatmapSetInfo = res;
-                beatmapPanelContainer.Child = new BeatmapCardNormal(res, allowExpansion: false);
-                checkForAutomaticDownload(res);
-            };
+                var onlineBeatmapRequest = new GetBeatmapSetRequest(beatmap.OnlineBeatmapSetID);
 
-            api.Queue(onlineBeatmapRequest);
+                onlineBeatmapRequest.Success += res =>
+                {
+                    beatmapSetInfo = res;
+                    updateStatus();
+                };
+                api.Queue(onlineBeatmapRequest);
+            }
 
+            updateStatus();
             realmSubscription = realm.RegisterForNotifications(
                 realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
         }
 
+        private void updateStatus()
+        {
+            if (beatmapSetInfo == null) return;
+
+            beatmapPanelContainer.Clear();
+            beatmapPanelContainer.Child = new BeatmapCardNormal(beatmapSetInfo, allowExpansion: false);
+            checkForAutomaticDownload(beatmapSetInfo);
+        }
+
         private void checkForAutomaticDownload(APIBeatmapSet beatmap)
         {
             if (!automaticDownload.Current.Value)

From 14d87e49c75e423ac34c0e5276f32dda93880bdf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 16:49:58 +0900
Subject: [PATCH 1002/2100] Improve choice of where to start playback of
 multiplayer spectator

---
 .../Spectate/MultiSpectatorScreen.cs          | 32 ++++++++++++++-----
 .../Spectate/SpectatorSyncManager.cs          |  2 +-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index afc10d0c0a..bb1a139cf7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -2,12 +2,13 @@
 // 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.Audio;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -198,15 +199,29 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private void performInitialSeek()
         {
-            // Seek the master clock to the gameplay time.
-            // This is chosen as the first available frame in the players' replays, which matches the seek by each individual SpectatorPlayer.
-            double startTime = instances.Where(i => i.Score != null)
-                                        .SelectMany(i => i.Score.AsNonNull().Replay.Frames)
-                                        .Select(f => f.Time)
-                                        .DefaultIfEmpty(0)
-                                        .Min();
+            // We want to start showing gameplay as soon as possible.
+            // Each client may be in a different place in the beatmap, so we need to do our best to find a common
+            // starting point.
+            //
+            // Preferring a lower value ensures that we don't have some clients stuttering to keep up.
+            List<double> minFrameTimes = new List<double>();
+
+            foreach (var instance in instances)
+            {
+                if (instance.Score == null)
+                    continue;
+
+                minFrameTimes.Add(instance.Score.Replay.Frames.Min(f => f.Time));
+            }
+
+            // Remove any outliers (only need to worry about removing those lower than the mean since we will take a Min() after.
+            double mean = minFrameTimes.Average();
+            minFrameTimes.RemoveAll(t => mean - t > 1000);
+
+            double startTime = minFrameTimes.Min();
 
             masterClockContainer.Reset(startTime, true);
+            Logger.Log($"Multiplayer spectator seeking to initial time of {startTime}");
         }
 
         protected override void OnNewPlayingUserState(int userId, SpectatorState spectatorState)
@@ -245,6 +260,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return base.OnBackButton();
 
             // On a manual exit, set the player back to idle unless gameplay has finished.
+            // Of note, this doesn't cover exiting using alt-f4 or menu home option.
             if (multiplayerClient.Room.State != MultiplayerRoomState.Open)
                 multiplayerClient.ChangeState(MultiplayerUserState.Idle);
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs
index 615c0d7c2b..fd61b60fe4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
 
             masterState = newState;
-            Logger.Log($"{nameof(SpectatorSyncManager)}'s master clock become {masterState}");
+            Logger.Log($"{nameof(SpectatorSyncManager)}'s master clock became {masterState}");
 
             switch (masterState)
             {

From 75c1d5ad7feaf9fd81d9ddd83e5650961e98a952 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 18:02:11 +0900
Subject: [PATCH 1003/2100] Add lenience to `FramedBeatmapClock` workaround

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

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 399e2fde7f..9577d1e38b 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
-            if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < decoupledClock.CurrentTime)
+            if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < decoupledClock.CurrentTime - 100)
             {
                 // InterpolatingFramedClock won't interpolate backwards unless its source has an ElapsedFrameTime.
                 // See https://github.com/ppy/osu-framework/blob/ba1385330cc501f34937e08257e586c84e35d772/osu.Framework/Timing/InterpolatingFramedClock.cs#L91-L93

From 6637a5e7bc39db1083e73453025ce29b1f69ea7e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 18:53:27 +0900
Subject: [PATCH 1004/2100] ensure Performer not null

---
 osu.Game/Scoring/ScoreImporter.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index ea3bd8f5ae..db4c0aff89 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -68,6 +68,12 @@ namespace osu.Game.Scoring
 
         private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e)
         {
+            if (Performer == null)
+            {
+                e.ScoreStream?.Dispose();
+                return;
+            }
+
             var req = new GetBeatmapRequest(new BeatmapInfo
             {
                 MD5Hash = e.Hash
@@ -75,7 +81,7 @@ namespace osu.Game.Scoring
 
             req.Success += res =>
             {
-                Performer?.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, e.ScoreStream)));
+                Performer.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, e.ScoreStream)));
             };
 
             req.Failure += _ => e.ScoreStream?.Dispose();

From 87fee001c786b29db34063ef3350e9a9f024d3ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 18:26:36 +0900
Subject: [PATCH 1005/2100] Fix multiplayer spectator potentially taking too
 long to start

When watching from the middle of gameplay, due to a series of failures,
`SpectatorClock` would not get seeked to the current time, causing all
clients to look like they were out of sync.

This is a hotfix for the issue. A better fix will require framework
changes or considerable restructuring.

I'd recommend testing this works in practice and agreeing that while it
is a hack, it's likely not going to cause issues and is something we
want to see fixed sooner rather than later.
---
 .../Multiplayer/Spectate/SpectatorPlayerClock.cs           | 2 ++
 osu.Game/Screens/Play/GameplayClockContainer.cs            | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs
index 45615d4e19..2ce78818a0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Logging;
 using osu.Framework.Timing;
 using osu.Game.Screens.Play;
 
@@ -59,6 +60,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         public bool Seek(double position)
         {
+            Logger.Log($"{nameof(SpectatorPlayerClock)} seeked to {position}");
             CurrentTime = position;
             return true;
         }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 22e6884526..226108209a 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -160,6 +160,13 @@ namespace osu.Game.Screens.Play
 
             Seek(StartTime);
 
+            // This is a workaround for the fact that DecoupleableInterpolatingFramedClock doesn't seek the source
+            // if the source is not IsRunning. (see https://github.com/ppy/osu-framework/blob/2102638056dfcf85d21b4d85266d53b5dd018767/osu.Framework/Timing/DecoupleableInterpolatingFramedClock.cs#L209-L210)
+            //
+            // This breaks in multiplayer spectator.
+            // I hope to remove this once we knock some sense into clocks in general.
+            (SourceClock as IAdjustableClock)?.Seek(StartTime);
+
             if (!wasPaused || startClock)
                 Start();
         }

From 0e7e36f114006c02c46b18b5cc79703e68293a4d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 21:53:14 +0900
Subject: [PATCH 1006/2100] don't passing stream by exception

---
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 15 ++-------------
 osu.Game/Scoring/ScoreImporter.cs             | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index a191220b37..8c00110909 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -7,7 +7,6 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using JetBrains.Annotations;
 using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
@@ -62,7 +61,7 @@ namespace osu.Game.Scoring.Legacy
                 workingBeatmap = GetBeatmap(beatmapHash);
 
                 if (workingBeatmap is DummyWorkingBeatmap)
-                    throw new BeatmapNotFoundException(beatmapHash, stream);
+                    throw new BeatmapNotFoundException(beatmapHash);
 
                 scoreInfo.User = new APIUser { Username = sr.ReadString() };
 
@@ -350,19 +349,9 @@ namespace osu.Game.Scoring.Legacy
         {
             public string Hash { get; }
 
-            [CanBeNull]
-            public MemoryStream ScoreStream { get; }
-
-            public BeatmapNotFoundException(string hash, [CanBeNull] Stream scoreStream)
+            public BeatmapNotFoundException(string hash)
             {
                 Hash = hash;
-
-                if (scoreStream != null)
-                {
-                    ScoreStream = new MemoryStream();
-                    scoreStream.Position = 0;
-                    scoreStream.CopyTo(ScoreStream);
-                }
             }
         }
     }
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index db4c0aff89..64394800cd 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using Newtonsoft.Json;
@@ -59,19 +60,24 @@ namespace osu.Game.Scoring
                 }
                 catch (LegacyScoreDecoder.BeatmapNotFoundException e)
                 {
-                    onMissingBeatmap(e);
+                    onMissingBeatmap(e, archive, name);
                     Logger.Log($@"Score '{name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
                     return null;
                 }
             }
         }
 
-        private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e)
+        private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e, ArchiveReader archive, string name)
         {
             if (Performer == null)
-            {
-                e.ScoreStream?.Dispose();
                 return;
+
+            var stream = new MemoryStream();
+
+            // stream will close after exception throw, so fetch the stream again.
+            using (var scoreStream = archive.GetStream(name))
+            {
+                scoreStream.CopyTo(stream);
             }
 
             var req = new GetBeatmapRequest(new BeatmapInfo
@@ -81,10 +87,10 @@ namespace osu.Game.Scoring
 
             req.Success += res =>
             {
-                Performer.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, e.ScoreStream)));
+                Performer.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, stream)));
             };
 
-            req.Failure += _ => e.ScoreStream?.Dispose();
+            req.Failure += _ => stream.Dispose();
 
             api.Queue(req);
         }

From aab462fd95534417aa5b3b65918d021a9907885c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 2 Aug 2023 09:40:22 -0700
Subject: [PATCH 1007/2100] Fix `valueText` being replaced even if current is
 not binding to anything

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs |  7 +------
 osu.Game/Screens/Play/BreakOverlay.cs        | 17 +++++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index 147650ca07..df71767f82 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -56,13 +56,8 @@ namespace osu.Game.Screens.Play.Break
                     Colour = colours.YellowLight,
                 }
             };
-        }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Current.BindValueChanged(text => valueText.Text = Format(text.NewValue), true);
+            Current.BindValueChanged(text => valueText.Text = Format(text.NewValue));
         }
 
         protected virtual LocalisableString Format(T count)
diff --git a/osu.Game/Screens/Play/BreakOverlay.cs b/osu.Game/Screens/Play/BreakOverlay.cs
index 4927800059..3ca82ec00b 100644
--- a/osu.Game/Screens/Play/BreakOverlay.cs
+++ b/osu.Game/Screens/Play/BreakOverlay.cs
@@ -46,13 +46,14 @@ namespace osu.Game.Screens.Play
         private readonly Container remainingTimeBox;
         private readonly RemainingTimeCounter remainingTimeCounter;
         private readonly BreakArrows breakArrows;
+        private readonly ScoreProcessor scoreProcessor;
+        private readonly BreakInfo info;
 
         public BreakOverlay(bool letterboxing, ScoreProcessor scoreProcessor)
         {
+            this.scoreProcessor = scoreProcessor;
             RelativeSizeAxes = Axes.Both;
 
-            BreakInfo info;
-
             Child = fadeContainer = new Container
             {
                 Alpha = 0,
@@ -102,18 +103,18 @@ namespace osu.Game.Screens.Play
                     }
                 }
             };
-
-            if (scoreProcessor != null)
-            {
-                info.AccuracyDisplay.Current.BindTo(scoreProcessor.Accuracy);
-                info.GradeDisplay.Current.BindTo(scoreProcessor.Rank);
-            }
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
             initializeBreaks();
+
+            if (scoreProcessor != null)
+            {
+                info.AccuracyDisplay.Current.BindTo(scoreProcessor.Accuracy);
+                info.GradeDisplay.Current.BindTo(scoreProcessor.Rank);
+            }
         }
 
         private void initializeBreaks()

From f38b21110f0e60a1667f3f2cb7c21fa5936b6122 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Aug 2023 08:57:43 +0900
Subject: [PATCH 1008/2100] Add missing parenthesis to 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>
---
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index bb1a139cf7..66524f66ae 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -214,7 +214,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 minFrameTimes.Add(instance.Score.Replay.Frames.Min(f => f.Time));
             }
 
-            // Remove any outliers (only need to worry about removing those lower than the mean since we will take a Min() after.
+            // Remove any outliers (only need to worry about removing those lower than the mean since we will take a Min() after).
             double mean = minFrameTimes.Average();
             minFrameTimes.RemoveAll(t => mean - t > 1000);
 

From 71f6e5731d9e7b0990f1a56aa03343466be6d193 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Aug 2023 08:58:19 +0900
Subject: [PATCH 1009/2100] Fix potential null reference if no frames found
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>
---
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 66524f66ae..c1b1127542 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 if (instance.Score == null)
                     continue;
 
-                minFrameTimes.Add(instance.Score.Replay.Frames.Min(f => f.Time));
+                minFrameTimes.Add(instance.Score.Replay.Frames.MinBy(f => f.Time)?.Time ?? 0);
             }
 
             // Remove any outliers (only need to worry about removing those lower than the mean since we will take a Min() after).

From d39ef48b71bb346932a10f69bdb315782666be15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Aug 2023 09:01:11 +0900
Subject: [PATCH 1010/2100] Return `null` intead of `FileNotFoundException` on
 missing file in `ZipArchiveReader`

---
 osu.Game/IO/Archives/ZipArchiveReader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/IO/Archives/ZipArchiveReader.cs b/osu.Game/IO/Archives/ZipArchiveReader.cs
index 1fca8aa055..5ef03b3641 100644
--- a/osu.Game/IO/Archives/ZipArchiveReader.cs
+++ b/osu.Game/IO/Archives/ZipArchiveReader.cs
@@ -31,7 +31,7 @@ namespace osu.Game.IO.Archives
         {
             ZipArchiveEntry entry = archive.Entries.SingleOrDefault(e => e.Key == name);
             if (entry == null)
-                throw new FileNotFoundException();
+                return null;
 
             var owner = MemoryAllocator.Default.Allocate<byte>((int)entry.Size);
 

From 52b1073d937fbd91112bc5b1dee0f660f8bc09ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 3 Aug 2023 21:08:00 +0200
Subject: [PATCH 1011/2100] Fix playfield skin layer not rotating correctly
 with barrel roll mod

---
 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 536d3ac146..43c61588b1 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -242,7 +242,9 @@ namespace osu.Game.Screens.Play
                 Quad playfieldScreenSpaceDrawQuad = drawableRuleset.Playfield.SkinnableComponentScreenSpaceDrawQuad;
 
                 playfieldComponents.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
-                playfieldComponents.Size = ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+                playfieldComponents.Width = (ToLocalSpace(playfieldScreenSpaceDrawQuad.TopRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft)).Length;
+                playfieldComponents.Height = (ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomLeft) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft)).Length;
+                playfieldComponents.Rotation = drawableRuleset.Playfield.Rotation;
             }
 
             float? lowestTopScreenSpaceLeft = null;

From d179fe3d96919ed33105d0f489c3bbbda23dd721 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 3 Aug 2023 23:09:39 -0700
Subject: [PATCH 1012/2100] Add support for changelog entries with url attached

---
 .../Online/TestSceneChangelogOverlay.cs       |  9 +++++++-
 osu.Game/Overlays/Changelog/ChangelogEntry.cs | 22 +++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 8d61c5df9f..040b903636 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -154,7 +154,14 @@ namespace osu.Game.Tests.Visual.Online
                         Type = ChangelogEntryType.Misc,
                         Category = "Code quality",
                         Title = "Clean up another thing"
-                    }
+                    },
+                    new APIChangelogEntry
+                    {
+                        Type = ChangelogEntryType.Add,
+                        Category = "osu!",
+                        Title = "Add entry with news url",
+                        Url = "https://osu.ppy.sh/home/news/2023-07-27-summer-splash"
+                    },
                 }
             });
 
diff --git a/osu.Game/Overlays/Changelog/ChangelogEntry.cs b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
index 06ec2043f9..9c40440778 100644
--- a/osu.Game/Overlays/Changelog/ChangelogEntry.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 using osuTK.Graphics;
@@ -29,6 +30,9 @@ namespace osu.Game.Overlays.Changelog
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        [Resolved]
+        private ILinkHandler? linkHandler { get; set; }
+
         private FontUsage fontLarge;
         private FontUsage fontMedium;
 
@@ -86,11 +90,21 @@ namespace osu.Game.Overlays.Changelog
                 }
             };
 
-            title.AddText(entry.Title, t =>
+            if (string.IsNullOrEmpty(entry.Url))
             {
-                t.Font = fontLarge;
-                t.Colour = entryColour;
-            });
+                title.AddText(entry.Title, t =>
+                {
+                    t.Font = fontLarge;
+                    t.Colour = entryColour;
+                });
+            }
+            else
+            {
+                title.AddLink(entry.Title, () => linkHandler?.HandleLink(entry.Url), entry.Url, t =>
+                {
+                    t.Font = fontLarge;
+                });
+            }
 
             if (!string.IsNullOrEmpty(entry.Repository) && !string.IsNullOrEmpty(entry.GithubUrl))
                 addRepositoryReference(title, entryColour);

From 79892865288507e43b12c7b376ec8b7bfddb3ed4 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 4 Aug 2023 19:57:25 +0900
Subject: [PATCH 1013/2100] scoreStream never been null

---
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index 5707721bde..6fabbd00c8 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -56,12 +56,12 @@ namespace osu.Game.Screens.Import
         private ReplayDownloadButton replayDownloadButton = null!;
         private SettingsCheckbox automaticDownload = null!;
 
-        private readonly MemoryStream? scoreStream;
+        private readonly MemoryStream scoreStream;
         private readonly APIBeatmap beatmap;
 
         private APIBeatmapSet? beatmapSetInfo;
 
-        public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream? scoreStream = null)
+        public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream scoreStream)
         {
             this.beatmap = beatmap;
             beatmapSetInfo = beatmap.BeatmapSet;
@@ -187,7 +187,7 @@ namespace osu.Game.Screens.Import
 
             if (beatmapSetInfo == null) return;
 
-            if (scoreStream == null || !scoreStream.CanRead) return;
+            if (!scoreStream.CanRead) return;
 
             if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))
             {

From 09047538c70629861a2121af5dbe9db04224886d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 4 Aug 2023 20:02:22 +0900
Subject: [PATCH 1014/2100] remove all memory stream dispose

---
 osu.Game/Scoring/ScoreImporter.cs                     | 2 --
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 64394800cd..5c354ac3d1 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -90,8 +90,6 @@ namespace osu.Game.Scoring
                 Performer.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, stream)));
             };
 
-            req.Failure += _ => stream.Dispose();
-
             api.Queue(req);
         }
 
diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index 6fabbd00c8..2e0e7a8e3f 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -196,8 +196,6 @@ namespace osu.Game.Screens.Import
                 scoreManager.Import(progressNotification, new[] { importTask })
                             .ContinueWith(s =>
                             {
-                                scoreStream.Dispose();
-
                                 s.GetResultSafely<IEnumerable<Live<ScoreInfo>>>().FirstOrDefault()?.PerformRead(score =>
                                 {
                                     Guid scoreid = score.ID;
@@ -219,7 +217,6 @@ namespace osu.Game.Screens.Import
             base.Dispose(isDisposing);
 
             realmSubscription?.Dispose();
-            scoreStream?.Dispose();
         }
     }
 }

From 49f5d6813ec82dec79ef02e8b380fde4cc7a44d8 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Fri, 4 Aug 2023 22:05:59 -0700
Subject: [PATCH 1015/2100] Block beatmap editor from testing/exiting/exporting
 when saving fails

---
 osu.Game/Screens/Edit/Editor.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b885eee46f..35d8bb4ab7 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -425,7 +425,8 @@ namespace osu.Game.Screens.Edit
             {
                 dialogOverlay.Push(new SaveBeforeGameplayTestDialog(() =>
                 {
-                    Save();
+                    if (!Save()) return;
+
                     pushEditorPlayer();
                 }));
             }
@@ -764,7 +765,7 @@ namespace osu.Game.Screens.Edit
 
         private void confirmExitWithSave()
         {
-            Save();
+            if (!Save()) return;
 
             ExitConfirmed = true;
             this.Exit();
@@ -1021,13 +1022,15 @@ namespace osu.Game.Screens.Edit
 
         private void exportBeatmap()
         {
-            Save();
+            if (!Save()) return;
+
             beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
         }
 
         private void exportLegacyBeatmap()
         {
-            Save();
+            if (!Save()) return;
+
             beatmapManager.ExportLegacy(Beatmap.Value.BeatmapSetInfo);
         }
 

From d91798271d80fe735e2f0c9ff72c6faf30fe0525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 8 Aug 2023 22:06:30 +0200
Subject: [PATCH 1016/2100] Add test case covering exit block

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 .../Editing/TestSceneEditorBeatmapCreation.cs | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 5aa2dd2ebf..37cb43a43a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -18,6 +18,7 @@ using osu.Game.Database;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
@@ -453,6 +454,51 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        [Test]
+        public void TestExitBlockedWhenSavingBeatmapWithSameNamedDifficulties()
+        {
+            Guid setId = Guid.Empty;
+            const string duplicate_difficulty_name = "duplicate";
+
+            AddStep("retrieve set ID", () => setId = EditorBeatmap.BeatmapInfo.BeatmapSet!.ID);
+            AddStep("set difficulty name", () => EditorBeatmap.BeatmapInfo.DifficultyName = duplicate_difficulty_name);
+            AddStep("save beatmap", () => Editor.Save());
+            AddAssert("new beatmap persisted", () =>
+            {
+                var set = beatmapManager.QueryBeatmapSet(s => s.ID == setId);
+                return set != null && set.PerformRead(s => s.Beatmaps.Count == 1 && s.Files.Count == 1);
+            });
+
+            AddStep("create new difficulty", () => Editor.CreateNewDifficulty(new CatchRuleset().RulesetInfo));
+
+            AddUntilStep("wait for created", () =>
+            {
+                string? difficultyName = Editor.ChildrenOfType<EditorBeatmap>().SingleOrDefault()?.BeatmapInfo.DifficultyName;
+                return difficultyName != null && difficultyName != duplicate_difficulty_name;
+            });
+            AddUntilStep("wait for editor load", () => Editor.IsLoaded && DialogOverlay.IsLoaded);
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(new[]
+            {
+                new Fruit
+                {
+                    StartTime = 0
+                },
+                new Fruit
+                {
+                    StartTime = 1000
+                }
+            }));
+
+            AddStep("set difficulty name", () => EditorBeatmap.BeatmapInfo.DifficultyName = duplicate_difficulty_name);
+            AddUntilStep("wait for has unsaved changes", () => Editor.HasUnsavedChanges);
+
+            AddStep("exit", () => Editor.Exit());
+            AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is PromptForSaveDialog);
+            AddStep("attempt to save", () => DialogOverlay.CurrentDialog.PerformOkAction());
+            AddAssert("editor is still current", () => Editor.IsCurrentScreen());
+        }
+
         [Test]
         public void TestCreateNewDifficultyForInconvertibleRuleset()
         {

From c88045dfc7251dde653bd666f3ebf1b7be4fb809 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Aug 2023 18:21:57 +0900
Subject: [PATCH 1017/2100] Fix weird usage of `Cast`

---
 osu.Game.Tournament/Models/TournamentTeam.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 3cd527aaaa..5df8c2a620 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tournament.Models
             {
                 int[] ranks = Players.Select(p => p.Rank)
                                      .Where(i => i.HasValue)
-                                     .Cast<int>()
+                                     .Select(i => i!.Value)
                                      .ToArray();
 
                 if (ranks.Length == 0)

From 5898a9986b2ee8dc12628f7e2ff880a367457d46 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 9 Aug 2023 19:11:36 +0900
Subject: [PATCH 1018/2100] Revert "use no null when true"

This reverts commit 6ad8339c6674300806378693d79cc9f12285e71a.
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index daf1417f6f..333dd0fd73 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using Microsoft.Win32;
@@ -181,7 +180,7 @@ namespace osu.Game.Tournament.IPC
         /// <returns>Whether an IPC directory was successfully auto-detected.</returns>
         public bool AutoDetectIPCLocation() => SetIPCLocation(findStablePath());
 
-        private static bool ipcFileExistsInDirectory([NotNullWhen(true)] string? p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
+        private static bool ipcFileExistsInDirectory(string? p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
 
         private string? findStablePath()
         {
@@ -202,7 +201,7 @@ namespace osu.Game.Tournament.IPC
                 string? stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
 
                 if (ipcFileExistsInDirectory(stableInstallPath))
-                    return stableInstallPath;
+                    return stableInstallPath!;
             }
             catch
             {

From 5ad80879b771015b757823b9fd322ebe7b1c87f1 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 9 Aug 2023 19:11:51 +0900
Subject: [PATCH 1019/2100] let MatchIPCInfo .Beatmap be nullable

---
 osu.Game.Tournament/Components/SongBar.cs            | 2 +-
 osu.Game.Tournament/IPC/FileBasedIPC.cs              | 3 ++-
 osu.Game.Tournament/IPC/MatchIPCInfo.cs              | 2 +-
 osu.Game.Tournament/Screens/BeatmapInfoScreen.cs     | 2 +-
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 19d63286d8..fa0cbda16b 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tournament.Components
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
-        public TournamentBeatmap Beatmap
+        public TournamentBeatmap? Beatmap
         {
             set
             {
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 333dd0fd73..bf835122cc 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -87,12 +87,13 @@ namespace osu.Game.Tournament.IPC
 
                                     var existing = ladder.CurrentMatch.Value?.Round.Value?.Beatmaps.FirstOrDefault(b => b.ID == beatmapId);
 
-                                    if (existing?.Beatmap != null)
+                                    if (existing != null)
                                         Beatmap.Value = existing.Beatmap;
                                     else
                                     {
                                         beatmapLookupRequest = new GetBeatmapRequest(new APIBeatmap { OnlineID = beatmapId });
                                         beatmapLookupRequest.Success += b => Beatmap.Value = new TournamentBeatmap(b);
+                                        beatmapLookupRequest.Failure += _ => Beatmap.Value = null;
                                         API.Queue(beatmapLookupRequest);
                                     }
                                 }
diff --git a/osu.Game.Tournament/IPC/MatchIPCInfo.cs b/osu.Game.Tournament/IPC/MatchIPCInfo.cs
index ff557717d5..f57518971f 100644
--- a/osu.Game.Tournament/IPC/MatchIPCInfo.cs
+++ b/osu.Game.Tournament/IPC/MatchIPCInfo.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tournament.IPC
 {
     public partial class MatchIPCInfo : Component
     {
-        public Bindable<TournamentBeatmap> Beatmap { get; } = new Bindable<TournamentBeatmap>();
+        public Bindable<TournamentBeatmap?> Beatmap { get; } = new Bindable<TournamentBeatmap?>();
         public Bindable<LegacyMods> Mods { get; } = new Bindable<LegacyMods>();
         public Bindable<TourneyState> State { get; } = new Bindable<TourneyState>();
         public Bindable<string> ChatChannel { get; } = new Bindable<string>();
diff --git a/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs b/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
index e977012803..32a50d2222 100644
--- a/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
+++ b/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tournament.Screens
             SongBar.Mods = mods.NewValue;
         }
 
-        private void beatmapChanged(ValueChangedEvent<TournamentBeatmap> beatmap)
+        private void beatmapChanged(ValueChangedEvent<TournamentBeatmap?> beatmap)
         {
             SongBar.FadeInFromZero(300, Easing.OutQuint);
             SongBar.Beatmap = beatmap.NewValue;
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 9caa87d75e..07dc2bea54 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -121,13 +121,13 @@ namespace osu.Game.Tournament.Screens.MapPool
             splitMapPoolByMods.BindValueChanged(_ => updateDisplay());
         }
 
-        private void beatmapChanged(ValueChangedEvent<TournamentBeatmap> beatmap)
+        private void beatmapChanged(ValueChangedEvent<TournamentBeatmap?> beatmap)
         {
             if (CurrentMatch.Value == null || CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) < 2)
                 return;
 
             // if bans have already been placed, beatmap changes result in a selection being made autoamtically
-            if (beatmap.NewValue.OnlineID > 0)
+            if (beatmap.NewValue?.OnlineID > 0)
                 addForBeatmap(beatmap.NewValue.OnlineID);
         }
 

From 6549ca530480828076c7bd372cb8fec764189260 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Aug 2023 00:20:37 +0900
Subject: [PATCH 1020/2100] Revert some usages of `AsNonNull()` in tests

We generally prefer `!` when it is unambiguous usage (ie. direct access).
---
 .../NonVisual/LadderInfoSerialisationTest.cs      |  5 ++---
 .../Screens/TestSceneMapPoolScreen.cs             | 15 +++++++--------
 osu.Game.Tournament.Tests/TournamentTestScene.cs  |  7 +++----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs b/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
index d18651b8bb..acb4a87ffc 100644
--- a/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
@@ -3,7 +3,6 @@
 
 using Newtonsoft.Json;
 using NUnit.Framework;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Tests.NonVisual
@@ -36,8 +35,8 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 PlayersPerTeam = { Value = 4 },
                 Teams =
                 {
-                    match.Team1.Value.AsNonNull(),
-                    match.Team2.Value.AsNonNull(),
+                    match.Team1.Value!,
+                    match.Team2.Value!,
                 },
                 Rounds =
                 {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 254d5c6996..7b2c1ba336 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
@@ -31,7 +30,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load few maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
                 for (int i = 0; i < 8; i++)
                     addBeatmap();
@@ -51,7 +50,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load just enough maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
                 for (int i = 0; i < 18; i++)
                     addBeatmap();
@@ -71,7 +70,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
                 for (int i = 0; i < 19; i++)
                     addBeatmap();
@@ -91,7 +90,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
                 for (int i = 0; i < 11; i++)
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
@@ -117,7 +116,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                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");
@@ -137,7 +136,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                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");
@@ -154,7 +153,7 @@ namespace osu.Game.Tournament.Tests.Screens
 
         private void addBeatmap(string mods = "NM")
         {
-            Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Add(new RoundBeatmap
+            Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Add(new RoundBeatmap
             {
                 Beatmap = CreateSampleBeatmap(),
                 Mods = mods
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 0cf1e22211..f24fc61d85 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -41,10 +40,10 @@ namespace osu.Game.Tournament.Tests
 
             match = CreateSampleMatch();
 
-            Ladder.Rounds.Add(match.Round.Value.AsNonNull());
+            Ladder.Rounds.Add(match.Round.Value!);
             Ladder.Matches.Add(match);
-            Ladder.Teams.Add(match.Team1.Value.AsNonNull());
-            Ladder.Teams.Add(match.Team2.Value.AsNonNull());
+            Ladder.Teams.Add(match.Team1.Value!);
+            Ladder.Teams.Add(match.Team2.Value!);
 
             Ruleset.BindTo(Ladder.Ruleset);
             Dependencies.CacheAs(new StableInfo(storage));

From 4e83245acfc61c0460fc4882935d5b7e64b04e09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Aug 2023 00:24:57 +0900
Subject: [PATCH 1021/2100] Apply nullability to all remaining tests where it
 wasn't applied

---
 .../Components/TestSceneDateTextBox.cs                      | 2 --
 osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs    | 4 +---
 .../Components/TestSceneTournamentModDisplay.cs             | 2 --
 osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs         | 2 --
 osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs      | 6 ++----
 osu.Game.Tournament.Tests/NonVisual/TournamentHostTest.cs   | 4 +---
 .../Screens/TestSceneGameplayScreen.cs                      | 2 --
 .../Screens/TestSceneScheduleScreen.cs                      | 2 --
 8 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs b/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
index f547acd635..c1651b8ce3 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty 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;
 using osu.Game.Tournament.Components;
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
index f793c33878..762cfa2519 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty 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;
@@ -22,7 +20,7 @@ namespace osu.Game.Tournament.Tests.Components
         [Test]
         public void TestSongBar()
         {
-            SongBar songBar = null;
+            SongBar songBar = null!;
 
             AddStep("create bar", () => Child = songBar = new SongBar
             {
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
index 0cb95c2e43..99a448c494 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@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.Tests/NonVisual/DataLoadTest.cs b/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
index 256a984a7c..014c96b075 100644
--- a/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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.Threading.Tasks;
diff --git a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
index ca6354cb48..6ee7808099 100644
--- a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -36,11 +34,11 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 {
                     var osu = LoadTournament(host);
                     TournamentStorage storage = (TournamentStorage)osu.Dependencies.Get<Storage>();
-                    FileBasedIPC ipc = null;
+                    FileBasedIPC? ipc = null;
 
                     WaitForOrAssert(() => (ipc = osu.Dependencies.Get<MatchIPCInfo>() as FileBasedIPC)?.IsLoaded == true, @"ipc could not be populated in a reasonable amount of time");
 
-                    Assert.True(ipc.SetIPCLocation(testStableInstallDirectory));
+                    Assert.True(ipc!.SetIPCLocation(testStableInstallDirectory));
                     Assert.True(storage.AllTournaments.Exists("stable.json"));
                 }
                 finally
diff --git a/osu.Game.Tournament.Tests/NonVisual/TournamentHostTest.cs b/osu.Game.Tournament.Tests/NonVisual/TournamentHostTest.cs
index 8dc0946432..e4a35913cc 100644
--- a/osu.Game.Tournament.Tests/NonVisual/TournamentHostTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/TournamentHostTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -13,7 +11,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
 {
     public abstract class TournamentHostTest
     {
-        public static TournamentGameBase LoadTournament(GameHost host, TournamentGameBase tournament = null)
+        public static TournamentGameBase LoadTournament(GameHost host, TournamentGameBase? tournament = null)
         {
             tournament ??= new TournamentGameBase();
             Task.Factory.StartNew(() => host.Run(tournament), TaskCreationOptions.LongRunning)
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index abf0905647..31583bf8b7 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index 5071fbbfe3..f3c3fdec97 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;

From 3501b7c22b9820292cc9b28ca0caadef6255c82e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 9 Aug 2023 21:32:46 +0200
Subject: [PATCH 1022/2100] Fix some more nullability inspections

---
 .../Components/TestSceneDateTextBox.cs                      | 2 +-
 .../Components/TestSceneTournamentModDisplay.cs             | 6 +++---
 osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs b/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
index c1651b8ce3..d018a7ed5c 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Tournament.Tests.Components
 {
     public partial class TestSceneDateTextBox : OsuManualInputManagerTestScene
     {
-        private DateTextBox textBox;
+        private DateTextBox textBox = null!;
 
         [SetUp]
         public void Setup() => Schedule(() =>
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
index 99a448c494..0b69da78a4 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Tournament.Tests.Components
     public partial class TestSceneTournamentModDisplay : TournamentTestScene
     {
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private IRulesetStore rulesets { get; set; }
+        private IRulesetStore rulesets { get; set; } = null!;
 
-        private FillFlowContainer<TournamentBeatmapPanel> fillFlow;
+        private FillFlowContainer<TournamentBeatmapPanel> fillFlow = null!;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs b/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
index 014c96b075..e8c9f65608 100644
--- a/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
@@ -79,11 +79,11 @@ namespace osu.Game.Tournament.Tests.NonVisual
         public partial class TestTournament : TournamentGameBase
         {
             private readonly bool resetRuleset;
-            private readonly Action runOnLoadComplete;
+            private readonly Action? runOnLoadComplete;
 
             public new Task BracketLoadTask => base.BracketLoadTask;
 
-            public TestTournament(bool resetRuleset = false, [InstantHandle] Action runOnLoadComplete = null)
+            public TestTournament(bool resetRuleset = false, [InstantHandle] Action? runOnLoadComplete = null)
             {
                 this.resetRuleset = resetRuleset;
                 this.runOnLoadComplete = runOnLoadComplete;

From 71c42167e7e8fce7e4671f67e672786e5584fe21 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Thu, 10 Aug 2023 10:17:12 -0400
Subject: [PATCH 1023/2100] Updated wording on realm comments

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

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index d751cce834..6eb1e3bf9b 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -1021,11 +1021,11 @@ namespace osu.Game.Database
                 case 33:
                 {
                     // Get all current keybinds, and find the toggle chat bind
-                    // (by default it used to overlap the new toggle leaderboard)
+                    // (by default it would to overlap the new toggle leaderboard)
                     var newKeyBindings = migration.NewRealm.All<RealmKeyBinding>().ToList();
                     var toggleChatBind = newKeyBindings.FirstOrDefault(bind => bind.ActionInt == (int)GlobalAction.ToggleChatFocus);
 
-                    // If we have a bind for it, and that bind is tab, remove it
+                    // If we have a bind for it, and that bind is still tab, remove it
                     if (toggleChatBind != default && toggleChatBind.KeyCombination.Keys.SequenceEqual(new[] { InputKey.Tab }))
                         migration.NewRealm.Remove(toggleChatBind);
 

From 5d6ebb4df9f1fffd6bdadfe454dff9d1249dd589 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Thu, 10 Aug 2023 10:18:15 -0400
Subject: [PATCH 1024/2100] Removed comments organizing
 GlobalActionContainer.cs, since they were incorrectly grouping actions

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 79f098f90e..1090eeb462 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -205,7 +205,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleMute))]
         ToggleMute,
 
-        // In-Game Keybindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.SkipCutscene))]
         SkipCutscene,
 
@@ -233,7 +232,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.QuickExit))]
         QuickExit,
 
-        // Game-wide beatmap music controller keybindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.MusicNext))]
         MusicNext,
 
@@ -261,7 +259,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.PauseGameplay))]
         PauseGameplay,
 
-        // Editor
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorSetupMode))]
         EditorSetupMode,
 
@@ -286,7 +283,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameInterface))]
         ToggleInGameInterface,
 
-        // Song select keybindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleModSelection))]
         ToggleModSelection,
 
@@ -380,7 +376,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleReplaySettings))]
         ToggleReplaySettings,
 
-        // Editor (cont)
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameLeaderboard))]
         ToggleInGameLeaderboard,
     }

From 2b738edb93dbc34d1f850db710221656871c3e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 10 Aug 2023 22:55:02 +0200
Subject: [PATCH 1025/2100] Reword / fix comments

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

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 6eb1e3bf9b..90e39da201 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Database
         /// 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.
-        /// 32   2023-08-01    Added a new keybind that toggles the in-game leaderboard on and off
+        /// 33   2023-08-01    Reset default chat toggle keybind to avoid conflict with leaderboard toggle keybind.
         /// </summary>
         private const int schema_version = 33;
 
@@ -1020,12 +1020,11 @@ namespace osu.Game.Database
 
                 case 33:
                 {
-                    // Get all current keybinds, and find the toggle chat bind
-                    // (by default it would to overlap the new toggle leaderboard)
+                    // Clear default bindings for the chat focus toggle,
+                    // as they would conflict with the newly-added leaderboard toggle.
                     var newKeyBindings = migration.NewRealm.All<RealmKeyBinding>().ToList();
                     var toggleChatBind = newKeyBindings.FirstOrDefault(bind => bind.ActionInt == (int)GlobalAction.ToggleChatFocus);
 
-                    // If we have a bind for it, and that bind is still tab, remove it
                     if (toggleChatBind != default && toggleChatBind.KeyCombination.Keys.SequenceEqual(new[] { InputKey.Tab }))
                         migration.NewRealm.Remove(toggleChatBind);
 

From 896cbb0ba074474858e222253a34b449a7869bea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Aug 2023 21:34:59 +0900
Subject: [PATCH 1026/2100] 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 651e5b1fe6..1ac85532b8 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.801.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.811.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 1ac0f9de73..dd6f9b3a96 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.801.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.811.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 9926d52413..0cf1fe9c28 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.801.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.811.0" />
   </ItemGroup>
 </Project>

From d2f5e696e77072138dc0bafd5e62b3567d165f07 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 11 Aug 2023 22:34:04 +0200
Subject: [PATCH 1027/2100] Fix DrawableHitObject state not synchronizing with
 hitobject edits

---
 .../Objects/Drawables/DrawableHitObject.cs        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index bf649a0a15..f141263e27 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -260,7 +260,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             StartTimeBindable.BindTo(HitObject.StartTimeBindable);
-            StartTimeBindable.BindValueChanged(onStartTimeChanged);
 
             if (HitObject is IHasComboInformation combo)
             {
@@ -311,9 +310,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             samplesBindable.UnbindFrom(HitObject.SamplesBindable);
 
-            // Changes in start time trigger state updates. When a new hitobject is applied, OnApply() automatically performs a state update anyway.
-            StartTimeBindable.ValueChanged -= onStartTimeChanged;
-
             // When a new hitobject is applied, the samples will be cleared before re-populating.
             // In order to stop this needless update, the event is unbound and re-bound as late as possible in Apply().
             samplesBindable.CollectionChanged -= onSamplesChanged;
@@ -333,6 +329,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Entry.NestedEntries.RemoveAll(nestedEntry => nestedEntry is SyntheticHitObjectEntry);
             ClearNestedHitObjects();
 
+            // Changes in state trigger defaults applied trigger state updates.
+            // When a new hitobject is applied, OnApply() automatically performs a state update anyway.
             HitObject.DefaultsApplied -= onDefaultsApplied;
 
             entry.RevertResult -= onRevertResult;
@@ -375,8 +373,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void onSamplesChanged(object sender, NotifyCollectionChangedEventArgs e) => LoadSamples();
 
-        private void onStartTimeChanged(ValueChangedEvent<double> startTime) => updateState(State.Value, true);
-
         private void onNewResult(DrawableHitObject drawableHitObject, JudgementResult result) => OnNewResult?.Invoke(drawableHitObject, result);
 
         private void onRevertResult()
@@ -394,6 +390,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Debug.Assert(Entry != null);
             Apply(Entry);
 
+            // Applied defaults indicate a change in hit object state.
+            if (Result is not null)
+            {
+                Result.TimeOffset = 0;
+                updateState(State.Value, true);
+            }
+
             DefaultsApplied?.Invoke(this);
         }
 

From 5d1ccc2601a739e2d8ed61b8d9b64a0efa580f7f Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 11 Aug 2023 23:39:28 +0200
Subject: [PATCH 1028/2100] Ensure invariant of monotone time

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 30 ++++++++++++++++++-
 osu.Game/Rulesets/UI/Playfield.cs          | 35 ++++++++++++++++++----
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 099be486b3..e919e4d088 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -51,6 +51,11 @@ namespace osu.Game.Rulesets.UI
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> is updated.
+        /// </summary>
+        public event Action<HitObject> HitObjectUpdated;
+
         public HitObjectContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -108,6 +113,7 @@ namespace osu.Game.Rulesets.UI
             drawable.OnNewResult += onNewResult;
 
             bindStartTime(drawable);
+            bindUpdated(drawable);
             AddInternal(drawable);
         }
 
@@ -116,7 +122,7 @@ namespace osu.Game.Rulesets.UI
             drawable.OnNewResult -= onNewResult;
 
             unbindStartTime(drawable);
-
+            unbindUpdated(drawable);
             RemoveInternal(drawable, false);
         }
 
@@ -176,6 +182,27 @@ namespace osu.Game.Rulesets.UI
             startTimeMap.Clear();
         }
 
+        private void bindUpdated(DrawableHitObject hitObject)
+        {
+            hitObject.DefaultsApplied += onDefaultsApplied;
+        }
+
+        private void unbindUpdated(DrawableHitObject hitObject)
+        {
+            hitObject.DefaultsApplied += onDefaultsApplied;
+        }
+
+        private void unbindAllUpdated()
+        {
+            foreach (var h in AliveObjects)
+                unbindUpdated(h);
+        }
+
+        private void onDefaultsApplied(DrawableHitObject obj)
+        {
+            HitObjectUpdated?.Invoke(obj.HitObject);
+        }
+
         protected override int Compare(Drawable x, Drawable y)
         {
             if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
@@ -192,6 +219,7 @@ namespace osu.Game.Rulesets.UI
         {
             base.Dispose(isDisposing);
             unbindAllStartTimes();
+            unbindAllUpdated();
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index e9c35555c8..9a4d082a06 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.UI
 
         private readonly HitObjectEntryManager entryManager = new HitObjectEntryManager();
 
-        private readonly Stack<HitObjectLifetimeEntry> judgedEntries;
+        private readonly LinkedList<HitObjectLifetimeEntry> judgedEntries;
 
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
@@ -125,12 +125,13 @@ namespace osu.Game.Rulesets.UI
                 h.NewResult += onNewResult;
                 h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
                 h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
+                h.HitObjectUpdated += onHitObjectUpdated;
             }));
 
             entryManager.OnEntryAdded += onEntryAdded;
             entryManager.OnEntryRemoved += onEntryRemoved;
 
-            judgedEntries = new Stack<HitObjectLifetimeEntry>();
+            judgedEntries = new LinkedList<HitObjectLifetimeEntry>();
         }
 
         [BackgroundDependencyLoader]
@@ -270,15 +271,16 @@ namespace osu.Game.Rulesets.UI
             }
 
             // When rewinding, revert future judgements in the reverse order.
-            while (judgedEntries.Count > 0)
+            while (judgedEntries.Last is not null)
             {
-                var result = judgedEntries.Peek().Result;
+                var result = judgedEntries.Last.Value.Result;
                 Debug.Assert(result?.RawTime != null);
 
                 if (Time.Current >= result.RawTime.Value)
                     break;
 
-                revertResult(judgedEntries.Pop());
+                revertResult(judgedEntries.Last.Value);
+                judgedEntries.RemoveLast();
             }
         }
 
@@ -471,10 +473,31 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
+        private void onHitObjectUpdated(HitObject _)
+        {
+            // The time of judged entries may have changed, so we need to re-sort the list to preserve the invariant of monotone time.
+            // Insertion sort on linked-list is O(n) for nearly-sorted lists, which is the case here.
+            var current = judgedEntries.First;
+
+            while (current?.Next is not null)
+            {
+                var next = current.Next;
+
+                if (current.Value.Result?.RawTime > next.Value.Result?.RawTime)
+                {
+                    judgedEntries.Remove(next);
+                    judgedEntries.AddBefore(current, next);
+                    current = next.Previous;
+                }
+                else
+                    current = next;
+            }
+        }
+
         private void onNewResult(DrawableHitObject drawable, JudgementResult result)
         {
             Debug.Assert(result != null && drawable.Entry?.Result == result && result.RawTime != null);
-            judgedEntries.Push(drawable.Entry.AsNonNull());
+            judgedEntries.AddLast(drawable.Entry.AsNonNull());
 
             NewResult?.Invoke(drawable, result);
         }

From 90f2acaf0a9d1bfa5ac8d4cc653798604a3fdf21 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 11 Aug 2023 23:50:00 +0200
Subject: [PATCH 1029/2100] Fix typo

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

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index e919e4d088..76cfc049e3 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.UI
 
         private void unbindUpdated(DrawableHitObject hitObject)
         {
-            hitObject.DefaultsApplied += onDefaultsApplied;
+            hitObject.DefaultsApplied -= onDefaultsApplied;
         }
 
         private void unbindAllUpdated()

From 37361cd6837b4714a3f161a1e05873ef3f39456f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Aug 2023 00:49:39 +0200
Subject: [PATCH 1030/2100] Repurpose `Flat{File -> }WorkingBeatmap`

---
 osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs |  2 +-
 ...orkingBeatmap.cs => FlatWorkingBeatmap.cs} | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)
 rename osu.Game/Beatmaps/{FlatFileWorkingBeatmap.cs => FlatWorkingBeatmap.cs} (76%)

diff --git a/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs b/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs
index 5d950eef55..d1ac42f22b 100644
--- a/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs
+++ b/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs
@@ -75,7 +75,7 @@ namespace osu.Desktop.LegacyIpc
                 case LegacyIpcDifficultyCalculationRequest req:
                     try
                     {
-                        WorkingBeatmap beatmap = new FlatFileWorkingBeatmap(req.BeatmapFile);
+                        WorkingBeatmap beatmap = new FlatWorkingBeatmap(req.BeatmapFile);
                         var ruleset = beatmap.BeatmapInfo.Ruleset.CreateInstance();
                         Mod[] mods = ruleset.ConvertFromLegacyMods((LegacyMods)req.Mods).ToArray();
 
diff --git a/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs b/osu.Game/Beatmaps/FlatWorkingBeatmap.cs
similarity index 76%
rename from osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
rename to osu.Game/Beatmaps/FlatWorkingBeatmap.cs
index d20baf1edb..c2505ec109 100644
--- a/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/FlatWorkingBeatmap.cs
@@ -12,25 +12,26 @@ using osu.Game.Skinning;
 namespace osu.Game.Beatmaps
 {
     /// <summary>
-    /// A <see cref="WorkingBeatmap"/> which can be constructed directly from a .osu file, providing an implementation for
+    /// A <see cref="WorkingBeatmap"/> which can be constructed directly from an .osu file (via <see cref="FlatWorkingBeatmap(string, int?)"/>)
+    /// or an <see cref="IBeatmap"/> instance (via <see cref="FlatWorkingBeatmap(IBeatmap)"/>,
+    /// providing an implementation for
     /// <see cref="WorkingBeatmap.GetPlayableBeatmap(osu.Game.Rulesets.IRulesetInfo,System.Collections.Generic.IReadOnlyList{osu.Game.Rulesets.Mods.Mod})"/>.
     /// </summary>
-    public class FlatFileWorkingBeatmap : WorkingBeatmap
+    public class FlatWorkingBeatmap : WorkingBeatmap
     {
-        private readonly Beatmap beatmap;
+        private readonly IBeatmap beatmap;
 
-        public FlatFileWorkingBeatmap(string file, int? beatmapId = null)
-            : this(readFromFile(file), beatmapId)
+        public FlatWorkingBeatmap(string file, int? beatmapId = null)
+            : this(readFromFile(file))
         {
+            if (beatmapId.HasValue)
+                beatmap.BeatmapInfo.OnlineID = beatmapId.Value;
         }
 
-        private FlatFileWorkingBeatmap(Beatmap beatmap, int? beatmapId = null)
+        public FlatWorkingBeatmap(IBeatmap beatmap)
             : base(beatmap.BeatmapInfo, null)
         {
             this.beatmap = beatmap;
-
-            if (beatmapId.HasValue)
-                beatmap.BeatmapInfo.OnlineID = beatmapId.Value;
         }
 
         private static Beatmap readFromFile(string filename)

From 253392409e70f5914988c8af85d3a7aabec25c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Aug 2023 00:50:31 +0200
Subject: [PATCH 1031/2100] Fix `LegacyBeatmapExporter` not converting beatmap
 between decode and re-encode

---
 osu.Game/Database/LegacyBeatmapExporter.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index e054652efa..a874353f73 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -29,9 +29,9 @@ namespace osu.Game.Database
 
         protected override Stream? GetFileContents(BeatmapSetInfo model, INamedFileUsage file)
         {
-            bool isBeatmap = model.Beatmaps.Any(o => o.Hash == file.File.Hash);
+            var beatmapInfo = model.Beatmaps.SingleOrDefault(o => o.Hash == file.File.Hash);
 
-            if (!isBeatmap)
+            if (beatmapInfo == null)
                 return base.GetFileContents(model, file);
 
             // Read the beatmap contents and skin
@@ -43,6 +43,9 @@ namespace osu.Game.Database
             using var contentStreamReader = new LineBufferedReader(contentStream);
             var beatmapContent = new LegacyBeatmapDecoder().Decode(contentStreamReader);
 
+            var workingBeatmap = new FlatWorkingBeatmap(beatmapContent);
+            var playableBeatmap = workingBeatmap.GetPlayableBeatmap(beatmapInfo.Ruleset);
+
             using var skinStream = base.GetFileContents(model, file);
 
             if (skinStream == null)
@@ -56,10 +59,10 @@ namespace osu.Game.Database
 
             // 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)
+            foreach (var controlPoint in playableBeatmap.ControlPointInfo.AllControlPoints)
                 controlPoint.Time = Math.Floor(controlPoint.Time);
 
-            foreach (var hitObject in beatmapContent.HitObjects)
+            foreach (var hitObject in playableBeatmap.HitObjects)
             {
                 // Truncate end time before truncating start time because end time is dependent on start time
                 if (hitObject is IHasDuration hasDuration && hitObject is not IHasPath)
@@ -86,7 +89,7 @@ namespace osu.Game.Database
             // Encode to legacy format
             var stream = new MemoryStream();
             using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                new LegacyBeatmapEncoder(beatmapContent, beatmapSkin).Encode(sw);
+                new LegacyBeatmapEncoder(playableBeatmap, beatmapSkin).Encode(sw);
 
             stream.Seek(0, SeekOrigin.Begin);
 

From 562af8b46d1cbe3bf028e70cd044b3f93e71aaa4 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Sat, 12 Aug 2023 00:18:10 -0400
Subject: [PATCH 1032/2100] Updated test TestSceneGameplayChatDisplay.cs. Now
 uses new default bind for toggle chat (enter)

---
 .../Multiplayer/TestSceneGameplayChatDisplay.cs    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
index 979cb4424e..99b898efda 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
@@ -84,12 +84,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        public void TestFocusOnTabKeyWhenExpanded()
+        public void TestFocusOnEnterKeyWhenExpanded()
         {
             setLocalUserPlaying(true);
 
             assertChatFocused(false);
-            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
             assertChatFocused(true);
         }
 
@@ -99,19 +99,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
             setLocalUserPlaying(true);
 
             assertChatFocused(false);
-            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
             assertChatFocused(true);
             AddStep("press escape", () => InputManager.Key(Key.Escape));
             assertChatFocused(false);
         }
 
         [Test]
-        public void TestFocusOnTabKeyWhenNotExpanded()
+        public void TestFocusOnEnterKeyWhenNotExpanded()
         {
             AddStep("set not expanded", () => chatDisplay.Expanded.Value = false);
             AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
 
-            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
             assertChatFocused(true);
             AddUntilStep("is visible", () => chatDisplay.IsPresent);
 
@@ -126,11 +126,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("set not expanded", () => chatDisplay.Expanded.Value = false);
             AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
 
-            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
             assertChatFocused(true);
             AddUntilStep("is visible", () => chatDisplay.IsPresent);
 
-            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
             assertChatFocused(false);
             AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
         }

From 0eaa38312078352184e8bb3b581daa2c85534cbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 12 Aug 2023 17:54:05 +0900
Subject: [PATCH 1033/2100] 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 1ac85532b8..46f3247a8c 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.811.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.812.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 dd6f9b3a96..cba200489d 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.811.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.812.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 0cf1fe9c28..0c049e65b3 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.811.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.812.0" />
   </ItemGroup>
 </Project>

From 8912a0e91e79e05264b56754493fe4be5e355b40 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sat, 12 Aug 2023 20:30:48 +0200
Subject: [PATCH 1034/2100] Fix sliders being reversed incorrectly in the
 editor.

---
 osu.Game/Rulesets/Objects/SliderPath.cs       |  2 +-
 .../Rulesets/Objects/SliderPathExtensions.cs  | 57 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 028f8b6839..f48ffbe5a4 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Objects
         {
             ensureValid();
 
-            return segmentEnds.Select(i => cumulativeLength[i] / calculatedLength);
+            return segmentEnds.Select(i => cumulativeLength[Math.Clamp(i, 0, cumulativeLength.Count - 1)] / calculatedLength);
         }
 
         private void invalidate()
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 92a3b570fb..a312f872b8 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -1,7 +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 System;
+using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -26,10 +29,58 @@ namespace osu.Game.Rulesets.Objects
         /// <param name="positionalOffset">The positional offset of the resulting path. It should be added to the start position of this path.</param>
         public static void Reverse(this SliderPath sliderPath, out Vector2 positionalOffset)
         {
-            var points = sliderPath.ControlPoints.ToArray();
+            var controlPoints = sliderPath.ControlPoints;
+            double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
+            double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
+
+            // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
+            if (segmentEnds[^1] == segmentEnds[^2] && distinctSegmentEnds.Length > 1)
+            {
+                int numVisibleSegments = distinctSegmentEnds.Length - 2;
+                var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();
+
+                var lastVisibleControlPoint = nonInheritedControlPoints[numVisibleSegments];
+                int lastVisibleControlPointIndex = controlPoints.IndexOf(lastVisibleControlPoint);
+
+                if (controlPoints.Count > lastVisibleControlPointIndex + 1)
+                {
+                    // Make sure to include all inherited control points directly after the last visible non-inherited control point.
+                    do
+                    {
+                        lastVisibleControlPointIndex++;
+                    } while (lastVisibleControlPointIndex + 1 < controlPoints.Count && controlPoints[lastVisibleControlPointIndex].Type is null);
+                }
+
+                // Remove all control points after the first invisible non-inherited control point.
+                controlPoints.RemoveRange(lastVisibleControlPointIndex + 1, controlPoints.Count - lastVisibleControlPointIndex - 1);
+            }
+
+            // Recalculate perfect curve at the end of the slider path.
+            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 1)
+            {
+                double lastSegmentStart = distinctSegmentEnds[^2];
+                double lastSegmentEnd = distinctSegmentEnds[^1];
+
+                var oldCircleArcPath = new List<Vector2>();
+                sliderPath.GetPathToProgress(oldCircleArcPath, lastSegmentStart / lastSegmentEnd, 1);
+
+                var newCircleArcPoints = new[]
+                {
+                    oldCircleArcPath[0],
+                    oldCircleArcPath[oldCircleArcPath.Count / 2],
+                    oldCircleArcPath[^1]
+                };
+
+                var newCircleArcPath = PathApproximator.ApproximateCircularArc(newCircleArcPoints.AsSpan());
+                controlPoints[^2].Position = newCircleArcPath[newCircleArcPath.Count / 2];
+            }
+
+            // Reverse the control points.
+
+            var points = controlPoints.ToArray();
             positionalOffset = sliderPath.PositionAt(1);
 
-            sliderPath.ControlPoints.Clear();
+            controlPoints.Clear();
 
             PathType? lastType = null;
 
@@ -47,7 +98,7 @@ namespace osu.Game.Rulesets.Objects
                 else if (p.Type != null)
                     (p.Type, lastType) = (lastType, p.Type);
 
-                sliderPath.ControlPoints.Insert(0, p);
+                controlPoints.Insert(0, p);
             }
         }
     }

From 3178865cd32b83f8f9d78819303d7e6a4620b28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Aug 2023 21:55:20 +0200
Subject: [PATCH 1035/2100] Fix playfield skinnable layer bounds being
 incorrectly calculated with multiple stages

Closes #24514.

The original PR was _supposed_ to be handling this, and had code that
_looked_ like it would handle it, but was in fact subtly wrong, as the
union of `RectangleF.Empty` (initial value of `area`) and an arbitrary
other rectangle is _not_ the second rectangle, but rather a rectangle
that contains _both_ the second rectangle and the point (0,0),
thus leading to the bound calculation fail.
---
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index 7b00447238..314d199944 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -30,15 +30,15 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             get
             {
-                if (Stages.Count == 1)
-                    return Stages.First().ScreenSpaceDrawQuad;
+                RectangleF totalArea = RectangleF.Empty;
 
-                RectangleF area = RectangleF.Empty;
+                for (int i = 0; i < Stages.Count; ++i)
+                {
+                    var stageArea = Stages[i].ScreenSpaceDrawQuad.AABBFloat;
+                    totalArea = i == 0 ? stageArea : RectangleF.Union(totalArea, stageArea);
+                }
 
-                foreach (var stage in Stages)
-                    area = RectangleF.Union(area, stage.ScreenSpaceDrawQuad.AABBFloat);
-
-                return area;
+                return totalArea;
             }
         }
 

From 4152b4e5238e23ac50cee0c2d480b120fb224bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Aug 2023 22:46:18 +0200
Subject: [PATCH 1036/2100] Remove duplicated test case

---
 .../Multiplayer/TestSceneGameplayChatDisplay.cs   | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
index 99b898efda..d1a914300f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
@@ -120,21 +120,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
         }
 
-        [Test]
-        public void TestFocusToggleViaAction()
-        {
-            AddStep("set not expanded", () => chatDisplay.Expanded.Value = false);
-            AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
-
-            AddStep("press enter", () => InputManager.Key(Key.Enter));
-            assertChatFocused(true);
-            AddUntilStep("is visible", () => chatDisplay.IsPresent);
-
-            AddStep("press enter", () => InputManager.Key(Key.Enter));
-            assertChatFocused(false);
-            AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
-        }
-
         private void assertChatFocused(bool isFocused) =>
             AddAssert($"chat {(isFocused ? "focused" : "not focused")}", () => textBox.HasFocus == isFocused);
 

From b9d0a8a9f69fadacf1d1578fccd9101798583d47 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 13 Aug 2023 15:15:37 +0200
Subject: [PATCH 1037/2100] Fix TestSceneFruitRandomness

---
 osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index de3d9d6530..8e7f77285c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddSliderStep("start time", 500, 600, 0, x =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = x;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
         }
 
@@ -44,6 +46,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("Initialize start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
 
                 fruitRotation = drawableFruit.DisplayRotation;
                 bananaRotation = drawableBanana.DisplayRotation;
@@ -54,6 +58,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("change start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = another_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("fruit rotation is changed", () => drawableFruit.DisplayRotation != fruitRotation);
@@ -64,6 +70,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("reset start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("rotation and size restored", () =>

From e7b34cd4da77e9b1de5efd950f5351a3d35b6794 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 14 Aug 2023 03:43:16 +0900
Subject: [PATCH 1038/2100] declare BeatmapSet is not null

---
 .../Online/TestSceneReplayMissingBeatmap.cs   | 21 +++++++------------
 .../Import/ReplayMissingBeatmapScreen.cs      | 21 ++-----------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
index a260cc8593..eb84d80051 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
@@ -21,15 +21,14 @@ namespace osu.Game.Tests.Visual.Online
         {
             var beatmap = new APIBeatmap
             {
-                OnlineBeatmapSetID = 173612
+                OnlineBeatmapSetID = 173612,
+                BeatmapSet = new APIBeatmapSet
+                {
+                    OnlineID = 173612
+                }
             };
 
-            var beatmapset = new APIBeatmapSet
-            {
-                OnlineID = 173612,
-            };
-
-            setupBeatmapResponse(beatmap, beatmapset);
+            setupBeatmapResponse(beatmap);
 
             AddStep("import score", () =>
             {
@@ -62,7 +61,7 @@ namespace osu.Game.Tests.Visual.Online
             AddUntilStep("Replay missing screen not show", () => Game.ScreenStack.CurrentScreen.GetType() != typeof(ReplayMissingBeatmapScreen));
         }
 
-        private void setupBeatmapResponse(APIBeatmap b, APIBeatmapSet s)
+        private void setupBeatmapResponse(APIBeatmap b)
             => AddStep("setup response", () =>
             {
                 dummyAPI.HandleRequest = request =>
@@ -73,12 +72,6 @@ namespace osu.Game.Tests.Visual.Online
                         return true;
                     }
 
-                    if (request is GetBeatmapSetRequest getBeatmapSetRequest)
-                    {
-                        getBeatmapSetRequest.TriggerSuccess(s);
-                        return true;
-                    }
-
                     return false;
                 };
             });
diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index 2e0e7a8e3f..ffd6942b9b 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -18,7 +18,6 @@ using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 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;
@@ -57,14 +56,12 @@ namespace osu.Game.Screens.Import
         private SettingsCheckbox automaticDownload = null!;
 
         private readonly MemoryStream scoreStream;
-        private readonly APIBeatmap beatmap;
 
-        private APIBeatmapSet? beatmapSetInfo;
+        private readonly APIBeatmapSet beatmapSetInfo;
 
         public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream scoreStream)
         {
-            this.beatmap = beatmap;
-            beatmapSetInfo = beatmap.BeatmapSet;
+            beatmapSetInfo = beatmap.BeatmapSet!;
 
             this.scoreStream = scoreStream;
         }
@@ -147,18 +144,6 @@ namespace osu.Game.Screens.Import
         {
             base.LoadComplete();
 
-            if (beatmapSetInfo == null)
-            {
-                var onlineBeatmapRequest = new GetBeatmapSetRequest(beatmap.OnlineBeatmapSetID);
-
-                onlineBeatmapRequest.Success += res =>
-                {
-                    beatmapSetInfo = res;
-                    updateStatus();
-                };
-                api.Queue(onlineBeatmapRequest);
-            }
-
             updateStatus();
             realmSubscription = realm.RegisterForNotifications(
                 realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
@@ -185,8 +170,6 @@ namespace osu.Game.Screens.Import
         {
             if (changes?.InsertedIndices == null) return;
 
-            if (beatmapSetInfo == null) return;
-
             if (!scoreStream.CanRead) return;
 
             if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))

From 71a96e8be2e19397e7ab6b14e39a272517c9927e Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 13 Aug 2023 21:47:13 +0200
Subject: [PATCH 1039/2100] Remove SV from DrumRoll

---
 .../Beatmaps/TaikoBeatmapConverter.cs         |  1 -
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   | 19 +++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index dddd1e3c5a..5f3d0f898e 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -139,7 +139,6 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                             StartTime = obj.StartTime,
                             Samples = obj.Samples,
                             Duration = taikoDuration,
-                            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 083b8cc547..5f47d486e6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -3,7 +3,6 @@
 
 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;
@@ -14,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoStrongableHitObject, IHasPath, IHasSliderVelocity
+    public class DrumRoll : TaikoStrongableHitObject, IHasPath
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
@@ -34,19 +33,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public double Velocity { get; private set; }
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1)
-        {
-            Precision = 0.01,
-            MinValue = 0.1,
-            MaxValue = 10
-        };
-
-        public double SliderVelocity
-        {
-            get => SliderVelocityBindable.Value;
-            set => SliderVelocityBindable.Value = value;
-        }
-
         /// <summary>
         /// Numer of ticks per beat length.
         /// </summary>
@@ -63,8 +49,9 @@ namespace osu.Game.Rulesets.Taiko.Objects
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
+            EffectControlPoint effectPoint = controlPointInfo.EffectPointAt(StartTime);
 
-            double scoringDistance = base_distance * difficulty.SliderMultiplier * SliderVelocity;
+            double scoringDistance = base_distance * difficulty.SliderMultiplier * effectPoint.ScrollSpeed;
             Velocity = scoringDistance / timingPoint.BeatLength;
 
             TickRate = difficulty.SliderTickRate == 3 ? 3 : 4;

From d1a4a46fd3888663852b9f9f9e729f4c2633a159 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 14 Aug 2023 16:59:01 +0900
Subject: [PATCH 1040/2100] Temporarily allow new difficulty attributes to not
 exist

---
 osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index 5a01faa417..d6a3bd7f07 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -104,9 +104,11 @@ namespace osu.Game.Rulesets.Difficulty
         public virtual void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
             MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
-            LegacyAccuracyScore = (int)values[ATTRIB_ID_LEGACY_ACCURACY_SCORE];
-            LegacyComboScore = (int)values[ATTRIB_ID_LEGACY_COMBO_SCORE];
-            LegacyBonusScoreRatio = (int)values[ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO];
+
+            // Temporarily allow these attributes to not exist so as to not block releases of server-side components while these attributes aren't populated/used yet.
+            LegacyAccuracyScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_ACCURACY_SCORE);
+            LegacyComboScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_COMBO_SCORE);
+            LegacyBonusScoreRatio = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO);
         }
     }
 }

From f42b3603b34546609ed9cd829053b770510e9847 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 14:08:02 +0200
Subject: [PATCH 1041/2100] Fix linear sliders sometimes being reversed
 incorrectly Extract control point reversing to separate method

---
 .../Rulesets/Objects/SliderPathExtensions.cs  | 44 +++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index a312f872b8..2c8a6393af 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
@@ -30,31 +31,40 @@ namespace osu.Game.Rulesets.Objects
         public static void Reverse(this SliderPath sliderPath, out Vector2 positionalOffset)
         {
             var controlPoints = sliderPath.ControlPoints;
+            var originalControlPointTypes = controlPoints.Select(p => p.Type).ToArray();
+
+            controlPoints[0].Type ??= PathType.Linear;
+
+            // Inherited points after a linear point should be treated as linear points.
+            controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.Linear).ForEach(p => p.Type = PathType.Linear);
+
             double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
             double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
 
             // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
-            if (segmentEnds[^1] == segmentEnds[^2] && distinctSegmentEnds.Length > 1)
+            if (Math.Abs(segmentEnds[^1] - segmentEnds[^2]) < 1e-10 && distinctSegmentEnds.Length > 1)
             {
                 int numVisibleSegments = distinctSegmentEnds.Length - 2;
                 var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();
 
-                var lastVisibleControlPoint = nonInheritedControlPoints[numVisibleSegments];
-                int lastVisibleControlPointIndex = controlPoints.IndexOf(lastVisibleControlPoint);
+                int lastVisibleControlPointIndex = controlPoints.IndexOf(nonInheritedControlPoints[numVisibleSegments]);
 
-                if (controlPoints.Count > lastVisibleControlPointIndex + 1)
+                // Make sure to include all inherited control points directly after the last visible non-inherited control point.
+                while (lastVisibleControlPointIndex + 1 < controlPoints.Count)
                 {
-                    // Make sure to include all inherited control points directly after the last visible non-inherited control point.
-                    do
-                    {
-                        lastVisibleControlPointIndex++;
-                    } while (lastVisibleControlPointIndex + 1 < controlPoints.Count && controlPoints[lastVisibleControlPointIndex].Type is null);
+                    lastVisibleControlPointIndex++;
+
+                    if (controlPoints[lastVisibleControlPointIndex].Type is not null)
+                        break;
                 }
 
                 // Remove all control points after the first invisible non-inherited control point.
                 controlPoints.RemoveRange(lastVisibleControlPointIndex + 1, controlPoints.Count - lastVisibleControlPointIndex - 1);
             }
 
+            // Restore original control point types.
+            controlPoints.Zip(originalControlPointTypes).ForEach(x => x.First.Type = x.Second);
+
             // Recalculate perfect curve at the end of the slider path.
             if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 1)
             {
@@ -75,12 +85,20 @@ namespace osu.Game.Rulesets.Objects
                 controlPoints[^2].Position = newCircleArcPath[newCircleArcPath.Count / 2];
             }
 
-            // Reverse the control points.
+            sliderPath.reverseControlPoints(out positionalOffset);
+        }
 
-            var points = controlPoints.ToArray();
+        /// <summary>
+        /// Reverses the order of the provided <see cref="SliderPath"/>'s <see cref="PathControlPoint"/>s.
+        /// </summary>
+        /// <param name="sliderPath">The <see cref="SliderPath"/>.</param>
+        /// <param name="positionalOffset">The positional offset of the resulting path. It should be added to the start position of this path.</param>
+        private static void reverseControlPoints(this SliderPath sliderPath, out Vector2 positionalOffset)
+        {
+            var points = sliderPath.ControlPoints.ToArray();
             positionalOffset = sliderPath.PositionAt(1);
 
-            controlPoints.Clear();
+            sliderPath.ControlPoints.Clear();
 
             PathType? lastType = null;
 
@@ -98,7 +116,7 @@ namespace osu.Game.Rulesets.Objects
                 else if (p.Type != null)
                     (p.Type, lastType) = (lastType, p.Type);
 
-                controlPoints.Insert(0, p);
+                sliderPath.ControlPoints.Insert(0, p);
             }
         }
     }

From 55ac942e7abe42d60958007b8819ebf58f72df2d Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 14:09:08 +0200
Subject: [PATCH 1042/2100] Fix `IndexOutOfRangeException` when trying to
 reverse a zero-length slider

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

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 2c8a6393af..1bc9668258 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Objects
             double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
 
             // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
-            if (Math.Abs(segmentEnds[^1] - segmentEnds[^2]) < 1e-10 && distinctSegmentEnds.Length > 1)
+            if (segmentEnds.Length >= 2 && Math.Abs(segmentEnds[^1] - segmentEnds[^2]) < 1e-10 && distinctSegmentEnds.Length > 1)
             {
                 int numVisibleSegments = distinctSegmentEnds.Length - 2;
                 var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();

From bbd91e3ee47a66e7107b398db60b716eacae3c67 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 14:14:11 +0200
Subject: [PATCH 1043/2100] Add `TestSceneSliderReversal`

---
 .../Editor/TestSceneSliderReversal.cs         | 102 ++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
new file mode 100644
index 0000000000..ddef74deb1
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.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 System;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    public partial class TestSceneSliderReversal : TestSceneOsuEditor
+    {
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(Ruleset.Value, false);
+
+        private readonly PathControlPoint[][] paths =
+        {
+            createPathSegment(
+                PathType.PerfectCurve,
+                new Vector2(200, -50),
+                new Vector2(250, 0)
+            ),
+            createPathSegment(
+                PathType.Linear,
+                new Vector2(100, 0),
+                new Vector2(100, 100)
+            )
+        };
+
+        private static PathControlPoint[] createPathSegment(PathType type, params Vector2[] positions)
+        {
+            return new[]
+            {
+                new PathControlPoint
+                {
+                    Type = type
+                },
+            }.Concat(positions.Select(p => new PathControlPoint
+            {
+                Position = p
+            })).ToArray();
+        }
+
+        [TestCase(0, 250)]
+        [TestCase(0, 200)]
+        [TestCase(1, 80)]
+        [TestCase(1, 120)]
+        public void TestSliderReversal(int pathIndex, double length)
+        {
+            var controlPoints = paths[pathIndex];
+
+            Vector2 oldStartPos = default;
+            Vector2 oldEndPos = default;
+            double oldDistance = default;
+
+            AddStep("Add slider", () =>
+            {
+                var slider = new Slider
+                {
+                    Position = new Vector2(OsuPlayfield.BASE_SIZE.X / 2, OsuPlayfield.BASE_SIZE.Y / 2),
+                    Path = new SliderPath(controlPoints)
+                    {
+                        ExpectedDistance = { Value = length }
+                    }
+                };
+
+                EditorBeatmap.Add(slider);
+
+                oldStartPos = slider.Position;
+                oldEndPos = slider.EndPosition;
+                oldDistance = slider.Path.Distance;
+            });
+
+            AddStep("Select slider", () =>
+            {
+                var slider = (Slider)EditorBeatmap.HitObjects[0];
+                EditorBeatmap.SelectedHitObjects.Add(slider);
+            });
+
+            AddStep("Reverse slider", () =>
+            {
+                InputManager.PressKey(Key.LControl);
+                InputManager.Key(Key.G);
+                InputManager.ReleaseKey(Key.LControl);
+            });
+
+            AddAssert("Slider was reversed correctly", () =>
+            {
+                var slider = (Slider)EditorBeatmap.SelectedHitObjects[0];
+                return Vector2.Distance(slider.Position, oldEndPos) < 1
+                       && Vector2.Distance(slider.EndPosition, oldStartPos) < 1
+                       && Math.Abs(slider.Path.Distance - oldDistance) < 1e-10;
+            });
+        }
+    }
+}

From 34c761946c970ecc321688cec200901447bf2bd3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Aug 2023 23:55:56 +0900
Subject: [PATCH 1044/2100] Don't completely fade FPS counter out when running
 at full FPS

I've heard multiple times from uses that this is distracting or
confusing.
---
 osu.Game/Graphics/UserInterface/FPSCounter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/FPSCounter.cs b/osu.Game/Graphics/UserInterface/FPSCounter.cs
index c1ef573848..000b85b900 100644
--- a/osu.Game/Graphics/UserInterface/FPSCounter.cs
+++ b/osu.Game/Graphics/UserInterface/FPSCounter.cs
@@ -213,7 +213,7 @@ namespace osu.Game.Graphics.UserInterface
                 requestDisplay();
             else if (isDisplayed && Time.Current - lastDisplayRequiredTime > 2000 && !IsHovered)
             {
-                mainContent.FadeTo(0, 300, Easing.OutQuint);
+                mainContent.FadeTo(0.7f, 300, Easing.OutQuint);
                 isDisplayed = false;
             }
         }

From 90d7e46e20fa5a633c856f2835eedd1b8451fad4 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 00:58:13 +0900
Subject: [PATCH 1045/2100] Fix incorrect truncation to int

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

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index d6a3bd7f07..f62eeab5d7 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Difficulty
             // Temporarily allow these attributes to not exist so as to not block releases of server-side components while these attributes aren't populated/used yet.
             LegacyAccuracyScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_ACCURACY_SCORE);
             LegacyComboScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_COMBO_SCORE);
-            LegacyBonusScoreRatio = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO);
+            LegacyBonusScoreRatio = values.GetValueOrDefault(ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO);
         }
     }
 }

From 19c8b74a47fbbb001bc5acf57d3ad921482ec597 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 21:09:58 +0200
Subject: [PATCH 1046/2100] Remove unnecessary circle arc approximation

---
 osu.Game/Rulesets/Objects/SliderPathExtensions.cs | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 1bc9668258..cb753229ae 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -71,18 +70,10 @@ namespace osu.Game.Rulesets.Objects
                 double lastSegmentStart = distinctSegmentEnds[^2];
                 double lastSegmentEnd = distinctSegmentEnds[^1];
 
-                var oldCircleArcPath = new List<Vector2>();
-                sliderPath.GetPathToProgress(oldCircleArcPath, lastSegmentStart / lastSegmentEnd, 1);
+                var circleArcPath = new List<Vector2>();
+                sliderPath.GetPathToProgress(circleArcPath, lastSegmentStart / lastSegmentEnd, 1);
 
-                var newCircleArcPoints = new[]
-                {
-                    oldCircleArcPath[0],
-                    oldCircleArcPath[oldCircleArcPath.Count / 2],
-                    oldCircleArcPath[^1]
-                };
-
-                var newCircleArcPath = PathApproximator.ApproximateCircularArc(newCircleArcPoints.AsSpan());
-                controlPoints[^2].Position = newCircleArcPath[newCircleArcPath.Count / 2];
+                controlPoints[^2].Position = circleArcPath[circleArcPath.Count / 2];
             }
 
             sliderPath.reverseControlPoints(out positionalOffset);

From 449bee98cc1c1194d0fd111ae36afadb75fed117 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 21:56:08 +0200
Subject: [PATCH 1047/2100] Code cleanup

---
 .../Editor/TestSceneSliderReversal.cs               | 13 +++++--------
 osu.Game/Rulesets/Objects/SliderPathExtensions.cs   |  9 ++++++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
index ddef74deb1..f26a889ec6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
@@ -35,16 +35,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         private static PathControlPoint[] createPathSegment(PathType type, params Vector2[] positions)
         {
-            return new[]
-            {
-                new PathControlPoint
-                {
-                    Type = type
-                },
-            }.Concat(positions.Select(p => new PathControlPoint
+            return positions.Select(p => new PathControlPoint
             {
                 Position = p
-            })).ToArray();
+            }).Prepend(new PathControlPoint
+            {
+                Type = type
+            }).ToArray();
         }
 
         [TestCase(0, 250)]
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index cb753229ae..9e9b542961 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -1,10 +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 System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Objects
             double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
 
             // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
-            if (segmentEnds.Length >= 2 && Math.Abs(segmentEnds[^1] - segmentEnds[^2]) < 1e-10 && distinctSegmentEnds.Length > 1)
+            if (segmentEnds.Length >= 2 && Precision.AlmostEquals(segmentEnds[^1], segmentEnds[^2]) && distinctSegmentEnds.Length > 1)
             {
                 int numVisibleSegments = distinctSegmentEnds.Length - 2;
                 var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();
@@ -62,7 +62,10 @@ namespace osu.Game.Rulesets.Objects
             }
 
             // Restore original control point types.
-            controlPoints.Zip(originalControlPointTypes).ForEach(x => x.First.Type = x.Second);
+            for (int i = 0; i < controlPoints.Count; i++)
+            {
+                controlPoints[i].Type = originalControlPointTypes[i];
+            }
 
             // Recalculate perfect curve at the end of the slider path.
             if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 1)

From 28994166bca85c7b2c83ec779d896d25b281cf6c Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 22:09:12 +0200
Subject: [PATCH 1048/2100] Split up assertions

---
 .../Editor/TestSceneSliderReversal.cs          | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
index f26a889ec6..9f6b278609 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -44,6 +45,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             }).ToArray();
         }
 
+        private Slider SelectedSlider => (Slider)EditorBeatmap.SelectedHitObjects[0];
+
         [TestCase(0, 250)]
         [TestCase(0, 200)]
         [TestCase(1, 80)]
@@ -87,13 +90,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 InputManager.ReleaseKey(Key.LControl);
             });
 
-            AddAssert("Slider was reversed correctly", () =>
-            {
-                var slider = (Slider)EditorBeatmap.SelectedHitObjects[0];
-                return Vector2.Distance(slider.Position, oldEndPos) < 1
-                       && Vector2.Distance(slider.EndPosition, oldStartPos) < 1
-                       && Math.Abs(slider.Path.Distance - oldDistance) < 1e-10;
-            });
+            AddAssert("Slider has correct length", () =>
+                Precision.AlmostEquals(SelectedSlider.Path.Distance, oldDistance));
+
+            AddAssert("Slider has correct start position", () =>
+                Vector2.Distance(SelectedSlider.Position, oldEndPos) < 1);
+
+            AddAssert("Slider has correct end position", () =>
+                Vector2.Distance(SelectedSlider.EndPosition, oldStartPos) < 1);
         }
     }
 }

From cd706734636cd3d8da5bef4e9078c4b4d70cd5f9 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 22:41:25 +0200
Subject: [PATCH 1049/2100] Fix property name

---
 .../Editor/TestSceneSliderReversal.cs                    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
index 9f6b278609..b804680f0d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.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 NUnit.Framework;
 using osu.Framework.Utils;
@@ -45,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             }).ToArray();
         }
 
-        private Slider SelectedSlider => (Slider)EditorBeatmap.SelectedHitObjects[0];
+        private Slider selectedSlider => (Slider)EditorBeatmap.SelectedHitObjects[0];
 
         [TestCase(0, 250)]
         [TestCase(0, 200)]
@@ -91,13 +90,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
 
             AddAssert("Slider has correct length", () =>
-                Precision.AlmostEquals(SelectedSlider.Path.Distance, oldDistance));
+                Precision.AlmostEquals(selectedSlider.Path.Distance, oldDistance));
 
             AddAssert("Slider has correct start position", () =>
-                Vector2.Distance(SelectedSlider.Position, oldEndPos) < 1);
+                Vector2.Distance(selectedSlider.Position, oldEndPos) < 1);
 
             AddAssert("Slider has correct end position", () =>
-                Vector2.Distance(SelectedSlider.EndPosition, oldStartPos) < 1);
+                Vector2.Distance(selectedSlider.EndPosition, oldStartPos) < 1);
         }
     }
 }

From 6a7b0786c9231df3313d918ad752a15b31b796a9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 13:33:49 +0900
Subject: [PATCH 1050/2100] Add barline pooling for mania

---
 .../ManiaSkinComponentLookup.cs               |  1 +
 osu.Game.Rulesets.Mania/Objects/BarLine.cs    | 11 ++-
 .../Objects/Drawables/DrawableBarLine.cs      | 60 ++++++++--------
 .../Skinning/Default/DefaultBarLine.cs        | 72 +++++++++++++++++++
 .../Legacy/ManiaLegacySkinTransformer.cs      |  3 +
 osu.Game.Rulesets.Mania/UI/Stage.cs           |  4 +-
 6 files changed, 118 insertions(+), 33 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs

diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs
index c9ee5af809..44120e16e6 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs
@@ -33,5 +33,6 @@ namespace osu.Game.Rulesets.Mania
         HitExplosion,
         StageBackground,
         StageForeground,
+        BarLine
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/BarLine.cs b/osu.Game.Rulesets.Mania/Objects/BarLine.cs
index 09a746042b..cf576239ed 100644
--- a/osu.Game.Rulesets.Mania/Objects/BarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/BarLine.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.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 
@@ -8,7 +9,15 @@ namespace osu.Game.Rulesets.Mania.Objects
 {
     public class BarLine : ManiaHitObject, IBarLine
     {
-        public bool Major { get; set; }
+        private HitObjectProperty<bool> major;
+
+        public Bindable<bool> MajorBindable => major.Bindable;
+
+        public bool Major
+        {
+            get => major.Value;
+            set => major.Value = value;
+        }
 
         public override Judgement CreateJudgement() => new IgnoreJudgement();
     }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
index 8381b8b24b..25fed1a84c 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
@@ -1,9 +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.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osuTK;
+using osu.Game.Rulesets.Mania.Skinning.Default;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -13,45 +15,41 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     /// </summary>
     public partial class DrawableBarLine : DrawableManiaHitObject<BarLine>
     {
+        public readonly Bindable<bool> Major = new Bindable<bool>();
+
+        public DrawableBarLine()
+            : this(null!)
+        {
+        }
+
         public DrawableBarLine(BarLine barLine)
             : base(barLine)
         {
             RelativeSizeAxes = Axes.X;
-            Height = barLine.Major ? 1.7f : 1.2f;
+        }
 
-            AddInternal(new Box
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.BarLine), _ => new DefaultBarLine())
             {
-                Name = "Bar line",
-                Anchor = Anchor.BottomCentre,
-                Origin = Anchor.BottomCentre,
-                RelativeSizeAxes = Axes.Both,
-                Alpha = barLine.Major ? 0.5f : 0.2f
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
             });
 
-            if (barLine.Major)
-            {
-                Vector2 size = new Vector2(22, 6);
-                const float line_offset = 4;
+            Major.BindValueChanged(major => Height = major.NewValue ? 1.7f : 1.2f, true);
+        }
 
-                AddInternal(new Circle
-                {
-                    Name = "Left line",
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreRight,
+        protected override void OnApply()
+        {
+            base.OnApply();
+            Major.BindTo(HitObject.MajorBindable);
+        }
 
-                    Size = size,
-                    X = -line_offset,
-                });
-
-                AddInternal(new Circle
-                {
-                    Name = "Right line",
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreLeft,
-                    Size = size,
-                    X = line_offset,
-                });
-            }
+        protected override void OnFree()
+        {
+            base.OnFree();
+            Major.UnbindFrom(HitObject.MajorBindable);
         }
 
         protected override void UpdateStartTimeStateTransforms() => this.FadeOut(150);
diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
new file mode 100644
index 0000000000..cd85901a65
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
@@ -0,0 +1,72 @@
+// Copyright (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;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Default
+{
+    public partial class DefaultBarLine : CompositeDrawable
+    {
+        private Bindable<bool> major = null!;
+
+        private Drawable mainLine = null!;
+        private Drawable leftAnchor = null!;
+        private Drawable rightAnchor = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableHitObject)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            AddInternal(mainLine = new Box
+            {
+                Name = "Bar line",
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+                RelativeSizeAxes = Axes.Both,
+            });
+
+            Vector2 size = new Vector2(22, 6);
+            const float line_offset = 4;
+
+            AddInternal(leftAnchor = new Circle
+            {
+                Name = "Left anchor",
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreRight,
+                Size = size,
+                X = -line_offset,
+            });
+
+            AddInternal(rightAnchor = new Circle
+            {
+                Name = "Right anchor",
+                Anchor = Anchor.CentreRight,
+                Origin = Anchor.CentreLeft,
+                Size = size,
+                X = line_offset,
+            });
+
+            major = ((DrawableBarLine)drawableHitObject).Major.GetBoundCopy();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            major.BindValueChanged(updateMajor, true);
+        }
+
+        private void updateMajor(ValueChangedEvent<bool> major)
+        {
+            mainLine.Alpha = major.NewValue ? 0.5f : 0.2f;
+            leftAnchor.Alpha = rightAnchor.Alpha = major.NewValue ? 1 : 0;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index f8519beb22..446dfae0f6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -119,6 +119,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                         case ManiaSkinComponents.StageForeground:
                             return new LegacyStageForeground();
 
+                        case ManiaSkinComponents.BarLine:
+                            return null; // Not yet implemented.
+
                         default:
                             throw new UnsupportedSkinComponentException(lookup);
                     }
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 879c704450..4382f8e84a 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -136,6 +136,8 @@ namespace osu.Game.Rulesets.Mania.UI
                 columnFlow.SetContentForColumn(i, column);
                 AddNested(column);
             }
+
+            RegisterPool<BarLine, DrawableBarLine>(50, 200);
         }
 
         private ISkinSource currentSkin;
@@ -186,7 +188,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public override bool Remove(DrawableHitObject h) => Columns.ElementAt(((ManiaHitObject)h.HitObject).Column - firstColumnIndex).Remove(h);
 
-        public void Add(BarLine barLine) => base.Add(new DrawableBarLine(barLine));
+        public void Add(BarLine barLine) => base.Add(barLine);
 
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {

From e9621e7d6ebe3f117017b8e87b1fbcbb6d5a40f0 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 13:34:02 +0900
Subject: [PATCH 1051/2100] Adjust test to share barline between stages

---
 osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
index 86499a7c6e..fee3ba3e39 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
@@ -117,18 +117,16 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private void createBarLine(bool major)
         {
-            foreach (var stage in stages)
+            var obj = new BarLine
             {
-                var obj = new BarLine
-                {
-                    StartTime = Time.Current + 2000,
-                    Major = major,
-                };
+                StartTime = Time.Current + 2000,
+                Major = major,
+            };
 
-                obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
+            foreach (var stage in stages)
                 stage.Add(obj);
-            }
         }
 
         private ScrollingTestContainer createStage(ScrollingDirection direction, ManiaAction action)

From 8c14ff674e8460cd419693654a2d48aa39f152d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Aug 2023 14:33:21 +0900
Subject: [PATCH 1052/2100] 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 46f3247a8c..d64855e5c1 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.812.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.815.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 cba200489d..a5a9387e36 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.812.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.815.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 0c049e65b3..d93dfaf67c 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.812.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.815.0" />
   </ItemGroup>
 </Project>

From ab1d5235284bb0b3f98c602736262403da9eb6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 15 Aug 2023 07:44:05 +0200
Subject: [PATCH 1053/2100] Fix kiai stars flickering on and off during
 gameplay

Closes #24503.

The problematic reset of `lastParticleAdded` has been moved to a place
that should hopefully (a) not cause such problems and (b) be much more
explicit about what's happening.
---
 osu.Game/Graphics/ParticleSpewer.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/ParticleSpewer.cs b/osu.Game/Graphics/ParticleSpewer.cs
index 37a4fe77bd..64c70095bf 100644
--- a/osu.Game/Graphics/ParticleSpewer.cs
+++ b/osu.Game/Graphics/ParticleSpewer.cs
@@ -49,6 +49,18 @@ namespace osu.Game.Graphics
             this.maxDuration = maxDuration;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Active.BindValueChanged(active =>
+            {
+                // ensure that particles can be spawned immediately after the spewer becomes active.
+                if (active.NewValue)
+                    lastParticleAdded = null;
+            });
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -56,12 +68,8 @@ namespace osu.Game.Graphics
             Invalidate(Invalidation.DrawNode);
 
             if (!Active.Value || !CanSpawnParticles)
-            {
-                lastParticleAdded = null;
                 return;
-            }
 
-            // Always want to spawn the first particle in an activation immediately.
             if (lastParticleAdded == null)
             {
                 lastParticleAdded = Time.Current;

From e8bde6504a176c2cd138d721e267fa97db079520 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Aug 2023 16:08:11 +0900
Subject: [PATCH 1054/2100] Fix score being cloned in async method causing
 random crashes

Closes https://github.com/ppy/osu/issues/24445.
---
 osu.Game/Screens/Play/Player.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 5f8e061d89..8c5828fc92 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -810,10 +810,13 @@ namespace osu.Game.Screens.Play
             if (!canShowResults && !forceImport)
                 return Task.FromResult<ScoreInfo>(null);
 
+            // Clone score before beginning any async processing.
+            // - Must be run synchronously as the score may potentially be mutated in the background.
+            // - Must be cloned for the same reason.
+            Score scoreCopy = Score.DeepClone();
+
             return prepareScoreForDisplayTask = Task.Run(async () =>
             {
-                var scoreCopy = Score.DeepClone();
-
                 try
                 {
                     await PrepareScoreForResultsAsync(scoreCopy).ConfigureAwait(false);

From ec9e7f14a81165f3bdd21eeef6f8fd0f3ea5dae2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 18:51:24 +0900
Subject: [PATCH 1055/2100] Disable SVs from being visualised in mania editor

---
 osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index f480fa516b..dadd725a2f 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osuTK;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -19,6 +20,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods)
             : base(ruleset, beatmap, mods)
         {
+            ScrollMethod = ScrollVisualisationMethod.Constant;
         }
 
         protected override Playfield CreatePlayfield() => new ManiaEditorPlayfield(Beatmap.Stages)

From e34a9a00014d63249582320f5b08e9cce6ec29cc Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 19:30:37 +0900
Subject: [PATCH 1056/2100] Disable hold end conversion for mania HoldOff mod

---
 osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
index 2b0098744f..a94fdeda6b 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
@@ -46,19 +46,6 @@ namespace osu.Game.Rulesets.Mania.Mods
                     StartTime = h.StartTime,
                     Samples = h.GetNodeSamples(0)
                 });
-
-                // Don't add an end note if the duration is shorter than the threshold
-                double noteValue = GetNoteDurationInBeatLength(h, maniaBeatmap); // 1/1, 1/2, 1/4, etc.
-
-                if (noteValue >= END_NOTE_ALLOW_THRESHOLD)
-                {
-                    newObjects.Add(new Note
-                    {
-                        Column = h.Column,
-                        StartTime = h.EndTime,
-                        Samples = h.GetNodeSamples((h.NodeSamples?.Count - 1) ?? 1)
-                    });
-                }
             }
 
             maniaBeatmap.HitObjects = maniaBeatmap.HitObjects.OfType<Note>().Concat(newObjects).OrderBy(h => h.StartTime).ToList();

From 5678db4e707bf37736bb9b2ea8ad29538f886c4b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 19:42:32 +0900
Subject: [PATCH 1057/2100] Fix test + cleanup

---
 .../Mods/TestSceneManiaModHoldOff.cs          | 37 +------------------
 .../Mods/ManiaModHoldOff.cs                   |  8 ----
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs
index 3011a93755..f5117b61af 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs
@@ -6,7 +6,6 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Tests.Visual;
-using System.Collections.Generic;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -24,21 +23,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             Assert.False(testBeatmap.HitObjects.OfType<HoldNote>().Any());
         }
 
-        [Test]
-        public void TestCorrectNoteValues()
-        {
-            var testBeatmap = createRawBeatmap();
-            var noteValues = new List<double>(testBeatmap.HitObjects.OfType<HoldNote>().Count());
-
-            foreach (HoldNote h in testBeatmap.HitObjects.OfType<HoldNote>())
-            {
-                noteValues.Add(ManiaModHoldOff.GetNoteDurationInBeatLength(h, testBeatmap));
-            }
-
-            noteValues.Sort();
-            Assert.AreEqual(noteValues, new List<double> { 0.125, 0.250, 0.500, 1.000, 2.000 });
-        }
-
         [Test]
         public void TestCorrectObjectCount()
         {
@@ -47,25 +31,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             var rawBeatmap = createRawBeatmap();
             var testBeatmap = createModdedBeatmap();
 
-            // Calculate expected number of objects
-            int expectedObjectCount = 0;
-
-            foreach (ManiaHitObject h in rawBeatmap.HitObjects)
-            {
-                // Both notes and hold notes account for at least one object
-                expectedObjectCount++;
-
-                if (h.GetType() == typeof(HoldNote))
-                {
-                    double noteValue = ManiaModHoldOff.GetNoteDurationInBeatLength((HoldNote)h, rawBeatmap);
-
-                    if (noteValue >= ManiaModHoldOff.END_NOTE_ALLOW_THRESHOLD)
-                    {
-                        // Should generate an end note if it's longer than the minimum note value
-                        expectedObjectCount++;
-                    }
-                }
-            }
+            // Both notes and hold notes account for at least one object
+            int expectedObjectCount = rawBeatmap.HitObjects.Count;
 
             Assert.That(testBeatmap.HitObjects.Count == expectedObjectCount);
         }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
index a94fdeda6b..4e6cc4f1d6 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Rulesets.Mania.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(ManiaModInvert) };
 
-        public const double END_NOTE_ALLOW_THRESHOLD = 0.5;
-
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
             var maniaBeatmap = (ManiaBeatmap)beatmap;
@@ -50,11 +48,5 @@ namespace osu.Game.Rulesets.Mania.Mods
 
             maniaBeatmap.HitObjects = maniaBeatmap.HitObjects.OfType<Note>().Concat(newObjects).OrderBy(h => h.StartTime).ToList();
         }
-
-        public static double GetNoteDurationInBeatLength(HoldNote holdNote, ManiaBeatmap beatmap)
-        {
-            double beatLength = beatmap.ControlPointInfo.TimingPointAt(holdNote.StartTime).BeatLength;
-            return holdNote.Duration / beatLength;
-        }
     }
 }

From 6346872c3931b795fd20bad5326b1d62acff776e Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Tue, 15 Aug 2023 23:27:12 +0200
Subject: [PATCH 1058/2100] Improve code readability and add assertion to test
 scene

---
 .../Editor/TestSceneSliderReversal.cs         | 10 +++++++++-
 .../Rulesets/Objects/SliderPathExtensions.cs  | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
index b804680f0d..9c5eb83e3c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
@@ -48,8 +48,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         [TestCase(0, 250)]
         [TestCase(0, 200)]
-        [TestCase(1, 80)]
         [TestCase(1, 120)]
+        [TestCase(1, 80)]
         public void TestSliderReversal(int pathIndex, double length)
         {
             var controlPoints = paths[pathIndex];
@@ -57,6 +57,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             Vector2 oldStartPos = default;
             Vector2 oldEndPos = default;
             double oldDistance = default;
+            var oldControlPointTypes = controlPoints.Select(p => p.Type);
 
             AddStep("Add slider", () =>
             {
@@ -97,6 +98,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddAssert("Slider has correct end position", () =>
                 Vector2.Distance(selectedSlider.EndPosition, oldStartPos) < 1);
+
+            AddAssert("Control points have correct types", () =>
+            {
+                var newControlPointTypes = selectedSlider.Path.ControlPoints.Select(p => p.Type).ToArray();
+
+                return oldControlPointTypes.Take(newControlPointTypes.Length).SequenceEqual(newControlPointTypes);
+            });
         }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 9e9b542961..682e31fa96 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
@@ -30,12 +29,17 @@ namespace osu.Game.Rulesets.Objects
         public static void Reverse(this SliderPath sliderPath, out Vector2 positionalOffset)
         {
             var controlPoints = sliderPath.ControlPoints;
-            var originalControlPointTypes = controlPoints.Select(p => p.Type).ToArray();
 
-            controlPoints[0].Type ??= PathType.Linear;
+            var inheritedLinearPoints = controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.Linear && p.Type is null).ToList();
 
-            // Inherited points after a linear point should be treated as linear points.
-            controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.Linear).ForEach(p => p.Type = PathType.Linear);
+            if (controlPoints[0].Type == null)
+            {
+                inheritedLinearPoints.Add(controlPoints[0]);
+            }
+
+            // Inherited points after a linear point, as well as the first control point if it inherited,
+            // should be treated as linear points, so their types are temporarily changed to linear.
+            inheritedLinearPoints.ForEach(p => p.Type = PathType.Linear);
 
             double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
             double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
@@ -62,10 +66,7 @@ namespace osu.Game.Rulesets.Objects
             }
 
             // Restore original control point types.
-            for (int i = 0; i < controlPoints.Count; i++)
-            {
-                controlPoints[i].Type = originalControlPointTypes[i];
-            }
+            inheritedLinearPoints.ForEach(p => p.Type = null);
 
             // Recalculate perfect curve at the end of the slider path.
             if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 1)

From e7e0c49f428075debc22c7607fcf44697e28c4ac Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Wed, 16 Aug 2023 01:14:25 +0200
Subject: [PATCH 1059/2100] Replace `.Distinct()` with
 `truncateEndingDuplicates()`

---
 .../Rulesets/Objects/SliderPathExtensions.cs  | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 682e31fa96..2fa460ec01 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Objects
             inheritedLinearPoints.ForEach(p => p.Type = PathType.Linear);
 
             double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
-            double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
+            double[] distinctSegmentEnds = truncateEndingDuplicates(segmentEnds);
 
             // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
             if (segmentEnds.Length >= 2 && Precision.AlmostEquals(segmentEnds[^1], segmentEnds[^2]) && distinctSegmentEnds.Length > 1)
@@ -83,6 +83,24 @@ namespace osu.Game.Rulesets.Objects
             sliderPath.reverseControlPoints(out positionalOffset);
         }
 
+        /// <summary>
+        /// Keeps removing the last element of the provided array until the last two elements are not equal.
+        /// </summary>
+        /// <param name="arr">The array to truncate.</param>
+        /// <returns>The truncated array.</returns>
+        private static double[] truncateEndingDuplicates(double[] arr)
+        {
+            if (arr.Length < 2)
+                return arr;
+
+            var result = arr.ToList();
+
+            while (Precision.AlmostEquals(result[^1], result[^2]))
+                result.RemoveAt(result.Count - 1);
+
+            return result.ToArray();
+        }
+
         /// <summary>
         /// Reverses the order of the provided <see cref="SliderPath"/>'s <see cref="PathControlPoint"/>s.
         /// </summary>

From 58bffa13cd284891ebd735c216ca9bdab94ca8c8 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Wed, 16 Aug 2023 01:19:41 +0200
Subject: [PATCH 1060/2100] Fix possible `IndexOutOfRangeException`

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

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 2fa460ec01..21448404ef 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Objects
 
             var result = arr.ToList();
 
-            while (Precision.AlmostEquals(result[^1], result[^2]))
+            while (Precision.AlmostEquals(result[^1], result[^2]) && result.Count > 1)
                 result.RemoveAt(result.Count - 1);
 
             return result.ToArray();

From 6001f7e5c783b67a9236f81aeda28214ad2a0832 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 13:52:23 +0900
Subject: [PATCH 1061/2100] Rename "dummy" local user to something more
 descriptive

This created weird cases in logs which are very hard to understand. The
one which really got me was this:

```
[runtime] 2023-08-13 07:48:27 [verbose]: Invalidating working beatmap cache for unknown artist - unknown title (Dummy)
```

Which looks like a dummy working beatmap was invalidated, but it turns
out that's just the local user which was populated when creating a new
local beatmap.
---
 osu.Game/Online/API/DummyAPIAccess.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 01169828b0..2764247f5c 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Online.API
 
         public Bindable<APIUser> LocalUser { get; } = new Bindable<APIUser>(new APIUser
         {
-            Username = @"Dummy",
+            Username = @"Local user",
             Id = DUMMY_USER_ID,
         });
 

From 502844a8583e6ee8537f0479d71f2e6a8ab62178 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 14:23:01 +0900
Subject: [PATCH 1062/2100] Add ability to construct `RealmLive` from `ID`

---
 osu.Game/Database/RealmLive.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmLive.cs b/osu.Game/Database/RealmLive.cs
index 509fabec59..1134636756 100644
--- a/osu.Game/Database/RealmLive.cs
+++ b/osu.Game/Database/RealmLive.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Construct a new instance of live realm data.
         /// </summary>
-        /// <param name="data">The realm data.</param>
+        /// <param name="data">The realm data. Must be managed (see <see cref="IRealmObject.IsManaged"/>).</param>
         /// <param name="realm">The realm factory the data was sourced from. May be null for an unmanaged object.</param>
         public RealmLive(T data, RealmAccess realm)
             : base(data.ID)
@@ -41,6 +41,24 @@ namespace osu.Game.Database
             dataIsFromUpdateThread = ThreadSafety.IsUpdateThread;
         }
 
+        /// <summary>
+        /// Construct a new instance of live realm data from an ID.
+        /// </summary>
+        /// <param name="id">The ID of an already-persisting realm instance.</param>
+        /// <param name="realm">The realm factory the data was sourced from. May be null for an unmanaged object.</param>
+        public RealmLive(Guid id, RealmAccess realm)
+            : base(id)
+        {
+            data = retrieveFromID(realm.Realm);
+
+            if (data.IsNull())
+                throw new ArgumentException("Realm instance for provided ID could not be found.", nameof(id));
+
+            this.realm = realm;
+
+            dataIsFromUpdateThread = ThreadSafety.IsUpdateThread;
+        }
+
         /// <summary>
         /// Perform a read operation on this live object.
         /// </summary>

From 5bd7370439c1e79a739be0d46dce060f57444ffe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 14:23:17 +0900
Subject: [PATCH 1063/2100] Add log output when editor is creating a fresh
 beatmap

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 35d8bb4ab7..1cdca5754d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -199,6 +199,8 @@ namespace osu.Game.Screens.Edit
 
             if (loadableBeatmap is DummyWorkingBeatmap)
             {
+                Logger.Log("Editor was loaded without a valid beatmap; creating a new beatmap.");
+
                 isNewBeatmap = true;
 
                 loadableBeatmap = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);

From 531794b26b6af72f3f25d609694e135fc960cf64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 14:23:30 +0900
Subject: [PATCH 1064/2100] Fix `ModelManager` not correctly re-retrieving
 realm objects before performing operations

Falls into the age-old trap of attempting to retrieve an item from realm
without first ensuring that realm is in an up-to-date state.

Consider this scenario:

- Editor is entered from main menu, causing it to create a new beatmap
  from its async `load()` method.
- Editor opens correctly, then main thread performs a file operations on
  the same beatmap.
- Main thread is potentially not refreshed yet, and will result in `null`
  instance when performing the re-fetch in `performFileOperation`.

I've fixed this by using the safe implementation inside `RealmLive<T>`.
Feels like we want this is one place which is always used as the correct
method.

On a quick search, there are 10-20 other usages of `Realm.Find<T>` which
could also have similar issues, but it'll be a bit of a pain to go
through and fix each of these. In 99.9% of cases, the accesses are on
instances which couldn't have just been created (or the usage of
recently-imported/created is blocked by realm subscription flows, ie.
baetmap import) so I'm not touching them for now.

Something to keep in mind when working with realm going forward though.
---
 osu.Game/Database/ModelManager.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 47feb8a8f9..6b538e62ea 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -48,16 +48,13 @@ namespace osu.Game.Database
             // This method should be removed as soon as all the surrounding pieces support non-detached operations.
             if (!item.IsManaged)
             {
-                // Importantly, begin the realm write *before* re-fetching, else the update realm may not be in a consistent state
-                // (ie. if an async import finished very recently).
-                Realm.Realm.Write(realm =>
+                // We use RealmLive here as it handled re-retrieval and refreshing of realm if required.
+                new RealmLive<TModel>(item.ID, Realm).PerformWrite(i =>
                 {
-                    var managed = realm.Find<TModel>(item.ID);
-                    Debug.Assert(managed != null);
-                    operation(managed);
+                    operation(i);
 
                     item.Files.Clear();
-                    item.Files.AddRange(managed.Files.Detach());
+                    item.Files.AddRange(i.Files.Detach());
                 });
             }
             else

From a8824c8c8ad4b6d8184f68a34ebc2672fb299716 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 14:30:10 +0900
Subject: [PATCH 1065/2100] Remove flaky test documentation for fixed test

---
 .../Editing/TestSceneEditorBeatmapCreation.cs | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 37cb43a43a..920e560018 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -92,25 +92,6 @@ namespace osu.Game.Tests.Visual.Editing
         }
 
         [Test]
-        [FlakyTest]
-        /*
-         * Fail rate around 1.2%.
-         *
-         * Failing with realm refetch occasionally being null.
-         * My only guess is that the WorkingBeatmap at SetupScreen is dummy instead of the true one.
-         * If it's something else, we have larger issues with realm, but I don't think that's the case.
-         *
-         * at osu.Framework.Logging.ThrowingTraceListener.Fail(String message1, String message2)
-         * at System.Diagnostics.TraceInternal.Fail(String message, String detailMessage)
-         * at System.Diagnostics.TraceInternal.TraceProvider.Fail(String message, String detailMessage)
-         * at System.Diagnostics.Debug.Fail(String message, String detailMessage)
-         * at osu.Game.Database.ModelManager`1.<>c__DisplayClass8_0.<performFileOperation>b__0(Realm realm) ModelManager.cs:line 50
-         * at osu.Game.Database.RealmExtensions.Write(Realm realm, Action`1 function) RealmExtensions.cs:line 14
-         * at osu.Game.Database.ModelManager`1.performFileOperation(TModel item, Action`1 operation) ModelManager.cs:line 47
-         * at osu.Game.Database.ModelManager`1.AddFile(TModel item, Stream contents, String filename) ModelManager.cs:line 37
-         * at osu.Game.Screens.Edit.Setup.ResourcesSection.ChangeAudioTrack(FileInfo source) ResourcesSection.cs:line 115
-         * at osu.Game.Tests.Visual.Editing.TestSceneEditorBeatmapCreation.<TestAddAudioTrack>b__11_0() TestSceneEditorBeatmapCreation.cs:line 101
-         */
         public void TestAddAudioTrack()
         {
             AddAssert("track is virtual", () => Beatmap.Value.Track is TrackVirtual);

From 6c4c76350fbecd1032709e2724b9abd9ee979e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 16 Aug 2023 07:36:56 +0200
Subject: [PATCH 1066/2100] Remove unused using directive

---
 osu.Game/Database/ModelManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 6b538e62ea..56aa0843a0 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using osu.Framework.Platform;

From 88295a49aa4655fcf48c317c1efac5a19dbc7342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 16 Aug 2023 07:38:31 +0200
Subject: [PATCH 1067/2100] Fix invalid reference in xmldoc

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

diff --git a/osu.Game/Database/RealmLive.cs b/osu.Game/Database/RealmLive.cs
index 1134636756..bfb755c42a 100644
--- a/osu.Game/Database/RealmLive.cs
+++ b/osu.Game/Database/RealmLive.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Construct a new instance of live realm data.
         /// </summary>
-        /// <param name="data">The realm data. Must be managed (see <see cref="IRealmObject.IsManaged"/>).</param>
+        /// <param name="data">The realm data. Must be managed (see <see cref="IRealmObjectBase.IsManaged"/>).</param>
         /// <param name="realm">The realm factory the data was sourced from. May be null for an unmanaged object.</param>
         public RealmLive(T data, RealmAccess realm)
             : base(data.ID)

From 6e11162ab10734b86b88f13b4967ae0bf68b6abd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 15:36:31 +0900
Subject: [PATCH 1068/2100] Add helper method for safer realm `Find<T>`

---
 osu.Game/Database/ModelManager.cs    | 12 +++++---
 osu.Game/Database/RealmExtensions.cs | 25 +++++++++++++++++
 osu.Game/Database/RealmLive.cs       | 41 +++-------------------------
 3 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 56aa0843a0..39dae61d36 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using osu.Framework.Platform;
@@ -47,13 +48,16 @@ namespace osu.Game.Database
             // This method should be removed as soon as all the surrounding pieces support non-detached operations.
             if (!item.IsManaged)
             {
-                // We use RealmLive here as it handled re-retrieval and refreshing of realm if required.
-                new RealmLive<TModel>(item.ID, Realm).PerformWrite(i =>
+                // Importantly, begin the realm write *before* re-fetching, else the update realm may not be in a consistent state
+                // (ie. if an async import finished very recently).
+                Realm.Realm.Write(realm =>
                 {
-                    operation(i);
+                    var managed = realm.FindWithRefresh<TModel>(item.ID);
+                    Debug.Assert(managed != null);
+                    operation(managed);
 
                     item.Files.Clear();
-                    item.Files.AddRange(i.Files.Detach());
+                    item.Files.AddRange(managed.Files.Detach());
                 });
             }
             else
diff --git a/osu.Game/Database/RealmExtensions.cs b/osu.Game/Database/RealmExtensions.cs
index 13c4defb83..ee76f1aa79 100644
--- a/osu.Game/Database/RealmExtensions.cs
+++ b/osu.Game/Database/RealmExtensions.cs
@@ -8,6 +8,31 @@ namespace osu.Game.Database
 {
     public static class RealmExtensions
     {
+        /// <summary>
+        /// Performs a <see cref="Realm.Find{T}(System.Nullable{long})"/>.
+        /// If a match was not found, a <see cref="Realm.Refresh"/> is performed before trying a second time.
+        /// This ensures that an instance is found even if the realm requested against was not in a consistent state.
+        /// </summary>
+        /// <param name="realm"></param>
+        /// <param name="id"></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public static T? FindWithRefresh<T>(this Realm realm, Guid id) where T : IRealmObject
+        {
+            var found = realm.Find<T>(id);
+
+            if (found == null)
+            {
+                // It may be that we access this from the update thread before a refresh has taken place.
+                // 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);
+            }
+
+            return found;
+        }
+
         /// <summary>
         /// Perform a write operation against the provided realm instance.
         /// </summary>
diff --git a/osu.Game/Database/RealmLive.cs b/osu.Game/Database/RealmLive.cs
index bfb755c42a..9e99cba45c 100644
--- a/osu.Game/Database/RealmLive.cs
+++ b/osu.Game/Database/RealmLive.cs
@@ -41,24 +41,6 @@ namespace osu.Game.Database
             dataIsFromUpdateThread = ThreadSafety.IsUpdateThread;
         }
 
-        /// <summary>
-        /// Construct a new instance of live realm data from an ID.
-        /// </summary>
-        /// <param name="id">The ID of an already-persisting realm instance.</param>
-        /// <param name="realm">The realm factory the data was sourced from. May be null for an unmanaged object.</param>
-        public RealmLive(Guid id, RealmAccess realm)
-            : base(id)
-        {
-            data = retrieveFromID(realm.Realm);
-
-            if (data.IsNull())
-                throw new ArgumentException("Realm instance for provided ID could not be found.", nameof(id));
-
-            this.realm = realm;
-
-            dataIsFromUpdateThread = ThreadSafety.IsUpdateThread;
-        }
-
         /// <summary>
         /// Perform a read operation on this live object.
         /// </summary>
@@ -80,7 +62,7 @@ namespace osu.Game.Database
                     return;
                 }
 
-                perform(retrieveFromID(r));
+                perform(r.FindWithRefresh<T>(ID)!);
                 RealmLiveStatistics.USAGE_ASYNC.Value++;
             });
         }
@@ -102,7 +84,7 @@ namespace osu.Game.Database
 
             return realm.Run(r =>
             {
-                var returnData = perform(retrieveFromID(r));
+                var returnData = perform(r.FindWithRefresh<T>(ID)!);
                 RealmLiveStatistics.USAGE_ASYNC.Value++;
 
                 if (returnData is RealmObjectBase realmObject && realmObject.IsManaged)
@@ -159,25 +141,10 @@ namespace osu.Game.Database
             }
 
             dataIsFromUpdateThread = true;
-            data = retrieveFromID(realm.Realm);
+            data = realm.Realm.FindWithRefresh<T>(ID)!;
+
             RealmLiveStatistics.USAGE_UPDATE_REFETCH.Value++;
         }
-
-        private T retrieveFromID(Realm realm)
-        {
-            var found = realm.Find<T>(ID);
-
-            if (found == null)
-            {
-                // It may be that we access this from the update thread before a refresh has taken place.
-                // 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)!;
-            }
-
-            return found;
-        }
     }
 
     internal static class RealmLiveStatistics

From c885b71f3ad7a35438b3eba37c87cefff53c8a2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 16:17:56 +0900
Subject: [PATCH 1069/2100] Add leaderboard toggle as tracked setting to give
 better use visibility

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

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index edcbb94368..921284ad4d 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -237,6 +237,12 @@ namespace osu.Game.Configuration
                     value: disabledState ? CommonStrings.Disabled.ToLower() : CommonStrings.Enabled.ToLower(),
                     shortcut: LookupKeyBindings(GlobalAction.ToggleGameplayMouseButtons))
                 ),
+                new TrackedSetting<bool>(OsuSetting.GameplayLeaderboard, state => new SettingDescription(
+                    rawValue: state,
+                    name: GlobalActionKeyBindingStrings.ToggleInGameLeaderboard,
+                    value: state ? CommonStrings.Enabled.ToLower() : CommonStrings.Disabled.ToLower(),
+                    shortcut: LookupKeyBindings(GlobalAction.ToggleInGameLeaderboard))
+                ),
                 new TrackedSetting<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode, visibilityMode => new SettingDescription(
                     rawValue: visibilityMode,
                     name: GameplaySettingsStrings.HUDVisibilityMode,

From 68db112882b03ec4f361e0066245208ef789de60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 16:19:56 +0900
Subject: [PATCH 1070/2100] Re-date migration

---
 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 90e39da201..b729fdd8e8 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Database
         /// 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.
-        /// 33   2023-08-01    Reset default chat toggle keybind to avoid conflict with leaderboard toggle keybind.
+        /// 33   2023-08-16    Reset default chat toggle key binding to avoid conflict with newly added leaderboard toggle key binding.
         /// </summary>
         private const int schema_version = 33;
 

From caf0fd074296aa21fad8a5bd9dda96912ece8414 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 16:21:42 +0900
Subject: [PATCH 1071/2100] Refactor migration to read the same as previous one

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

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index b729fdd8e8..917d662255 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -1022,10 +1022,10 @@ namespace osu.Game.Database
                 {
                     // Clear default bindings for the chat focus toggle,
                     // as they would conflict with the newly-added leaderboard toggle.
-                    var newKeyBindings = migration.NewRealm.All<RealmKeyBinding>().ToList();
-                    var toggleChatBind = newKeyBindings.FirstOrDefault(bind => bind.ActionInt == (int)GlobalAction.ToggleChatFocus);
+                    var keyBindings = migration.NewRealm.All<RealmKeyBinding>();
 
-                    if (toggleChatBind != default && toggleChatBind.KeyCombination.Keys.SequenceEqual(new[] { InputKey.Tab }))
+                    var toggleChatBind = keyBindings.FirstOrDefault(bind => bind.ActionInt == (int)GlobalAction.ToggleChatFocus);
+                    if (toggleChatBind != null && toggleChatBind.KeyCombination.Keys.SequenceEqual(new[] { InputKey.Tab }))
                         migration.NewRealm.Remove(toggleChatBind);
 
                     break;

From bb98f10ff67b87794a542f8f51f4cc1aeb1f1743 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 16:38:49 +0900
Subject: [PATCH 1072/2100] Use `CurrentTime` instead of `StartTime` for hotfix
 seek (and update comment)

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 226108209a..a50c089d16 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -162,10 +162,18 @@ namespace osu.Game.Screens.Play
 
             // This is a workaround for the fact that DecoupleableInterpolatingFramedClock doesn't seek the source
             // if the source is not IsRunning. (see https://github.com/ppy/osu-framework/blob/2102638056dfcf85d21b4d85266d53b5dd018767/osu.Framework/Timing/DecoupleableInterpolatingFramedClock.cs#L209-L210)
-            //
-            // This breaks in multiplayer spectator.
             // I hope to remove this once we knock some sense into clocks in general.
-            (SourceClock as IAdjustableClock)?.Seek(StartTime);
+            //
+            // Without this seek, the multiplayer spectator start sequence breaks:
+            // - Individual clients' clocks are never updated to their expected time
+            // - The sync manager thinks they are running behind
+            // - Gameplay doesn't start when it should (until a timeout occurs because nothing is happening for 10+ seconds)
+            //
+            // In addition, we use `CurrentTime` for this seek instead of `StartTime` as the above seek may have applied inherent
+            // offsets which need to be accounted for (ie. FramedBeatmapClock.TotalApliedOffset).
+            //
+            // See https://github.com/ppy/osu/pull/24451/files/87fee001c786b29db34063ef3350e9a9f024d3ab#diff-28ca02979641e2d98a15fe5d5e806f56acf60ac100258a059fa72503b6cc54e8.
+            (SourceClock as IAdjustableClock)?.Seek(CurrentTime);
 
             if (!wasPaused || startClock)
                 Start();

From d70a9a5bc414c538ba67340c9a21d0666bd932d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 16 Aug 2023 09:40:46 +0200
Subject: [PATCH 1073/2100] Fill out xmldoc and adjust inline commentary

---
 osu.Game/Database/RealmExtensions.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/RealmExtensions.cs b/osu.Game/Database/RealmExtensions.cs
index ee76f1aa79..c84e1e35b8 100644
--- a/osu.Game/Database/RealmExtensions.cs
+++ b/osu.Game/Database/RealmExtensions.cs
@@ -13,10 +13,13 @@ namespace osu.Game.Database
         /// If a match was not found, a <see cref="Realm.Refresh"/> is performed before trying a second time.
         /// This ensures that an instance is found even if the realm requested against was not in a consistent state.
         /// </summary>
-        /// <param name="realm"></param>
-        /// <param name="id"></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
+        /// <param name="realm">The realm to operate on.</param>
+        /// <param name="id">The ID of the entity to find in the realm.</param>
+        /// <typeparam name="T">The type of the entity to find in the realm.</typeparam>
+        /// <returns>
+        /// The retrieved entity of type <typeparamref name="T"/>.
+        /// Can be <see langword="null"/> if the entity is still not found by <paramref name="id"/> even after a refresh.
+        /// </returns>
         public static T? FindWithRefresh<T>(this Realm realm, Guid id) where T : IRealmObject
         {
             var found = realm.Find<T>(id);
@@ -24,7 +27,7 @@ namespace osu.Game.Database
             if (found == null)
             {
                 // It may be that we access this from the update thread before a refresh has taken place.
-                // To ensure that behaviour matches what we'd expect (the object *is* available), force
+                // To ensure that behaviour matches what we'd expect (the object generally *should be* available), force
                 // a refresh to bring in any off-thread changes immediately.
                 realm.Refresh();
                 found = realm.Find<T>(id);

From 56a4989f7158a071bf78b009e4524944f172493b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 16:55:48 +0900
Subject: [PATCH 1074/2100] Disable IPC binding in tournament client to allow
 running concurrently

---
 osu.Desktop/Program.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index 5a1373e040..a33e845f5b 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -85,7 +85,7 @@ namespace osu.Desktop
                 }
             }
 
-            using (DesktopGameHost host = Host.GetSuitableDesktopHost(gameName, new HostOptions { BindIPC = true }))
+            using (DesktopGameHost host = Host.GetSuitableDesktopHost(gameName, new HostOptions { BindIPC = !tournamentClient }))
             {
                 if (!host.IsPrimaryInstance)
                 {

From add1ef77d0b1ef4cb41ce083a937b9154eacc7b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 16 Aug 2023 10:07:12 +0200
Subject: [PATCH 1075/2100] Fix typo in comment

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index a50c089d16..20bf6c3829 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Play
             // - Gameplay doesn't start when it should (until a timeout occurs because nothing is happening for 10+ seconds)
             //
             // In addition, we use `CurrentTime` for this seek instead of `StartTime` as the above seek may have applied inherent
-            // offsets which need to be accounted for (ie. FramedBeatmapClock.TotalApliedOffset).
+            // offsets which need to be accounted for (ie. FramedBeatmapClock.TotalAppliedOffset).
             //
             // See https://github.com/ppy/osu/pull/24451/files/87fee001c786b29db34063ef3350e9a9f024d3ab#diff-28ca02979641e2d98a15fe5d5e806f56acf60ac100258a059fa72503b6cc54e8.
             (SourceClock as IAdjustableClock)?.Seek(CurrentTime);

From 965da343a409fbcf714c05226ddcd8bbffdb9fdd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 14:56:02 +0900
Subject: [PATCH 1076/2100] Fix tournament song bar tests not showing anything
 by default

---
 .../Components/TestSceneSongBar.cs                  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
index 762cfa2519..0f31192a9c 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
@@ -17,11 +18,11 @@ namespace osu.Game.Tournament.Tests.Components
         [Cached]
         private readonly LadderInfo ladder = new LadderInfo();
 
-        [Test]
-        public void TestSongBar()
-        {
-            SongBar songBar = null!;
+        private SongBar songBar = null!;
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
             AddStep("create bar", () => Child = songBar = new SongBar
             {
                 RelativeSizeAxes = Axes.X,
@@ -29,7 +30,11 @@ namespace osu.Game.Tournament.Tests.Components
                 Origin = Anchor.Centre
             });
             AddUntilStep("wait for loaded", () => songBar.IsLoaded);
+        }
 
+        [Test]
+        public void TestSongBar()
+        {
             AddStep("set beatmap", () =>
             {
                 var beatmap = CreateAPIBeatmap(Ruleset.Value);

From 56eb44d15bd2e119dec201562f1db41d22534e0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 16:07:03 +0900
Subject: [PATCH 1077/2100] Change `TestSpectatorClient` to provide some better
 fake data for score / acc

---
 .../Multiplayer/TestSceneMultiSpectatorLeaderboard.cs      | 2 ++
 osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs     | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index 049c02ffde..4bf2ebc1a4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -49,6 +49,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(clocks.Keys.Select(id => new MultiplayerRoomUser(id)).ToArray())
                 {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Expanded = { Value = true }
                 }, Add);
             });
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index 305a615102..5db08810ca 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -124,7 +124,12 @@ namespace osu.Game.Tests.Visual.Spectator
                 if (frames.Count == 0)
                     return;
 
-                var bundle = new FrameDataBundle(new ScoreInfo { Combo = currentFrameIndex }, new ScoreProcessor(rulesetStore.GetRuleset(0)!.CreateInstance()), frames.ToArray());
+                var bundle = new FrameDataBundle(new ScoreInfo
+                {
+                    Combo = currentFrameIndex,
+                    TotalScore = (long)(currentFrameIndex * 123478 * RNG.NextDouble(0.99, 1.01)),
+                    Accuracy = RNG.NextDouble(0.98, 1),
+                }, new ScoreProcessor(rulesetStore.GetRuleset(0)!.CreateInstance()), frames.ToArray());
                 ((ISpectatorClient)this).UserSentFrames(userId, bundle);
 
                 frames.Clear();

From 26d05afadcbacaa9a8dacfb2c98d79a3c4483e81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 18:28:06 +0900
Subject: [PATCH 1078/2100] Add more test coverage to multi spectator screen

---
 .../TestSceneMultiSpectatorScreen.cs          | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index a61c3f1234..cebc75f90c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -79,6 +79,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddWaitStep("wait a bit", 20);
         }
 
+        [TestCase(2)]
+        [TestCase(16)]
+        public void TestTeams(int count)
+        {
+            int[] userIds = getPlayerIds(count);
+
+            start(userIds, teams: true);
+            loadSpectateScreen();
+
+            sendFrames(userIds, 1000);
+            AddWaitStep("wait a bit", 20);
+        }
+
         [Test]
         public void TestMultipleStartRequests()
         {
@@ -450,16 +463,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void start(int userId, int? beatmapId = null) => start(new[] { userId }, beatmapId);
 
-        private void start(int[] userIds, int? beatmapId = null, APIMod[]? mods = null)
+        private void start(int[] userIds, int? beatmapId = null, APIMod[]? mods = null, bool teams = false)
         {
             AddStep("start play", () =>
             {
-                foreach (int id in userIds)
+                for (int i = 0; i < userIds.Length; i++)
                 {
+                    int id = userIds[i];
                     var user = new MultiplayerRoomUser(id)
                     {
                         User = new APIUser { Id = id },
                         Mods = mods ?? Array.Empty<APIMod>(),
+                        MatchState = teams ? new TeamVersusUserState { TeamID = i % 2 } : null,
                     };
 
                     OnlinePlayDependencies.MultiplayerClient.AddUser(user, true);

From f02416f877c758d4d8e7a3fbe78b413260c7b997 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 14:56:48 +0900
Subject: [PATCH 1079/2100] Improve visuals of tournament song bar

This is a stop-gap until we add new versions (and share between game and tournament client).
---
 osu.Game.Tournament/Components/SongBar.cs     | 39 ++++++++++++++-----
 .../Components/TournamentBeatmapPanel.cs      |  6 +--
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index fa0cbda16b..3d060600f7 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -14,7 +14,6 @@ using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Menu;
-using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 
@@ -22,14 +21,14 @@ namespace osu.Game.Tournament.Components
 {
     public partial class SongBar : CompositeDrawable
     {
-        private TournamentBeatmap? beatmap;
+        private IBeatmapInfo? beatmap;
 
         public const float HEIGHT = 145 / 2f;
 
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
-        public TournamentBeatmap? Beatmap
+        public IBeatmapInfo? Beatmap
         {
             set
             {
@@ -37,7 +36,7 @@ namespace osu.Game.Tournament.Components
                     return;
 
                 beatmap = value;
-                update();
+                refreshContent();
             }
         }
 
@@ -49,7 +48,7 @@ namespace osu.Game.Tournament.Components
             set
             {
                 mods = value;
-                update();
+                refreshContent();
             }
         }
 
@@ -71,19 +70,25 @@ namespace osu.Game.Tournament.Components
         protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
+            Masking = true;
+            CornerRadius = 5;
+
             InternalChildren = new Drawable[]
             {
+                new Box
+                {
+                    Colour = colours.Gray3,
+                    RelativeSizeAxes = Axes.Both,
+                },
                 flow = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    LayoutDuration = 500,
-                    LayoutEasing = Easing.OutQuint,
                     Direction = FillDirection.Full,
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -93,7 +98,7 @@ namespace osu.Game.Tournament.Components
             Expanded = true;
         }
 
-        private void update()
+        private void refreshContent()
         {
             if (beatmap == null)
             {
@@ -229,7 +234,7 @@ namespace osu.Game.Tournament.Components
                         }
                     }
                 },
-                new TournamentBeatmapPanel(beatmap)
+                new UnmaskedTournamentBeatmapPanel(beatmap)
                 {
                     RelativeSizeAxes = Axes.X,
                     Width = 0.5f,
@@ -272,4 +277,18 @@ namespace osu.Game.Tournament.Components
             }
         }
     }
+
+    internal partial class UnmaskedTournamentBeatmapPanel : TournamentBeatmapPanel
+    {
+        public UnmaskedTournamentBeatmapPanel(IBeatmapInfo? beatmap, string mod = "")
+            : base(beatmap, mod)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Masking = false;
+        }
+    }
 }
diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index ba922c7c7b..4e0adb30ac 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tournament.Components
 {
     public partial class TournamentBeatmapPanel : CompositeDrawable
     {
-        public readonly TournamentBeatmap? Beatmap;
+        public readonly IBeatmapInfo? Beatmap;
 
         private readonly string mod;
 
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament.Components
 
         private Box flash = null!;
 
-        public TournamentBeatmapPanel(TournamentBeatmap? beatmap, string mod = "")
+        public TournamentBeatmapPanel(IBeatmapInfo? beatmap, string mod = "")
         {
             Beatmap = beatmap;
             this.mod = mod;
@@ -58,7 +58,7 @@ namespace osu.Game.Tournament.Components
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = OsuColour.Gray(0.5f),
-                    OnlineInfo = Beatmap,
+                    OnlineInfo = (Beatmap as IBeatmapSetOnlineInfo),
                 },
                 new FillFlowContainer
                 {

From ab826c35b7515619535fb2bc4959f57afab1fe97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 18:28:59 +0900
Subject: [PATCH 1080/2100] Add score diff display to multiplayer spectator

Basically pulling changes over from the tournament client implementation
---
 .../Screens/Play/HUD/MatchScoreDisplay.cs     | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs b/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
index 58bf4eea4b..e1e388d872 100644
--- a/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Play.HUD
         private Drawable score1Bar;
         private Drawable score2Bar;
 
+        private MatchScoreDiffCounter scoreDiffText;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -98,6 +100,16 @@ namespace osu.Game.Screens.Play.HUD
                         },
                     }
                 },
+                scoreDiffText = new MatchScoreDiffCounter
+                {
+                    Anchor = Anchor.TopCentre,
+                    Margin = new MarginPadding
+                    {
+                        Top = bar_height / 4,
+                        Horizontal = 8
+                    },
+                    Alpha = 0
+                }
             };
         }
 
@@ -139,6 +151,10 @@ namespace osu.Game.Screens.Play.HUD
 
             losingBar.ResizeWidthTo(0, 400, Easing.OutQuint);
             winningBar.ResizeWidthTo(Math.Min(0.4f, MathF.Pow(diff / 1500000f, 0.5f) / 2), 400, Easing.OutQuint);
+
+            scoreDiffText.Alpha = diff != 0 ? 1 : 0;
+            scoreDiffText.Current.Value = -diff;
+            scoreDiffText.Origin = Team1Score.Value > Team2Score.Value ? Anchor.TopLeft : Anchor.TopRight;
         }
 
         protected override void UpdateAfterChildren()
@@ -174,5 +190,14 @@ namespace osu.Game.Screens.Play.HUD
                     ? OsuFont.Torus.With(weight: FontWeight.Bold, size: font_size, fixedWidth: true)
                     : OsuFont.Torus.With(weight: FontWeight.Regular, size: font_size * 0.8f, fixedWidth: true);
         }
+
+        private partial class MatchScoreDiffCounter : CommaSeparatedScoreCounter
+        {
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
+            {
+                s.Spacing = new Vector2(-2);
+                s.Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: bar_height, fixedWidth: true);
+            });
+        }
     }
 }

From 8b9759c569590687ee78591aa713bdbd99d3c4a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 17:22:55 +0900
Subject: [PATCH 1081/2100] Apply nullability to `MatchScoreDisplay`

---
 osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs b/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
index e1e388d872..4a61c7fd1b 100644
--- a/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -24,13 +22,13 @@ namespace osu.Game.Screens.Play.HUD
         public BindableLong Team1Score = new BindableLong();
         public BindableLong Team2Score = new BindableLong();
 
-        protected MatchScoreCounter Score1Text;
-        protected MatchScoreCounter Score2Text;
+        protected MatchScoreCounter Score1Text = null!;
+        protected MatchScoreCounter Score2Text = null!;
 
-        private Drawable score1Bar;
-        private Drawable score2Bar;
+        private Drawable score1Bar = null!;
+        private Drawable score2Bar = null!;
 
-        private MatchScoreDiffCounter scoreDiffText;
+        private MatchScoreDiffCounter scoreDiffText = null!;
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
@@ -166,7 +164,7 @@ namespace osu.Game.Screens.Play.HUD
 
         protected partial class MatchScoreCounter : CommaSeparatedScoreCounter
         {
-            private OsuSpriteText displayedSpriteText;
+            private OsuSpriteText displayedSpriteText = null!;
 
             public MatchScoreCounter()
             {

From d309865b0daac418ad4f7de6a3f512ab4dd2b51b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 17:25:25 +0900
Subject: [PATCH 1082/2100] Update `TournamentMatchScoreDisplay` to share base
 implementation

---
 osu.Game.Tournament/IPC/MatchIPCInfo.cs       |   4 +-
 .../Components/TournamentMatchScoreDisplay.cs | 170 +-----------------
 2 files changed, 6 insertions(+), 168 deletions(-)

diff --git a/osu.Game.Tournament/IPC/MatchIPCInfo.cs b/osu.Game.Tournament/IPC/MatchIPCInfo.cs
index f57518971f..b4575144e7 100644
--- a/osu.Game.Tournament/IPC/MatchIPCInfo.cs
+++ b/osu.Game.Tournament/IPC/MatchIPCInfo.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tournament.IPC
         public Bindable<LegacyMods> Mods { get; } = new Bindable<LegacyMods>();
         public Bindable<TourneyState> State { get; } = new Bindable<TourneyState>();
         public Bindable<string> ChatChannel { get; } = new Bindable<string>();
-        public BindableInt Score1 { get; } = new BindableInt();
-        public BindableInt Score2 { get; } = new BindableInt();
+        public BindableLong Score1 { get; } = new BindableLong();
+        public BindableLong Score2 { get; } = new BindableLong();
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
index 7ae20acc77..f8de34a511 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
@@ -1,181 +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.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.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Tournament.IPC;
-using osuTK;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
-    // TODO: Update to derive from osu-side class?
-    public partial class TournamentMatchScoreDisplay : CompositeDrawable
+    public partial class TournamentMatchScoreDisplay : MatchScoreDisplay
     {
-        private const float bar_height = 18;
-
-        private readonly BindableInt score1 = new BindableInt();
-        private readonly BindableInt score2 = new BindableInt();
-
-        private readonly MatchScoreCounter score1Text;
-        private readonly MatchScoreCounter score2Text;
-
-        private readonly MatchScoreDiffCounter scoreDiffText;
-
-        private readonly Drawable score1Bar;
-        private readonly Drawable score2Bar;
-
-        public TournamentMatchScoreDisplay()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            InternalChildren = new[]
-            {
-                new Box
-                {
-                    Name = "top bar red (static)",
-                    RelativeSizeAxes = Axes.X,
-                    Height = bar_height / 4,
-                    Width = 0.5f,
-                    Colour = TournamentGame.COLOUR_RED,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopRight
-                },
-                new Box
-                {
-                    Name = "top bar blue (static)",
-                    RelativeSizeAxes = Axes.X,
-                    Height = bar_height / 4,
-                    Width = 0.5f,
-                    Colour = TournamentGame.COLOUR_BLUE,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopLeft
-                },
-                score1Bar = new Box
-                {
-                    Name = "top bar red",
-                    RelativeSizeAxes = Axes.X,
-                    Height = bar_height,
-                    Width = 0,
-                    Colour = TournamentGame.COLOUR_RED,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopRight
-                },
-                score1Text = new MatchScoreCounter
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre
-                },
-                score2Bar = new Box
-                {
-                    Name = "top bar blue",
-                    RelativeSizeAxes = Axes.X,
-                    Height = bar_height,
-                    Width = 0,
-                    Colour = TournamentGame.COLOUR_BLUE,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopLeft
-                },
-                score2Text = new MatchScoreCounter
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre
-                },
-                scoreDiffText = new MatchScoreDiffCounter
-                {
-                    Anchor = Anchor.TopCentre,
-                    Margin = new MarginPadding
-                    {
-                        Top = bar_height / 4,
-                        Horizontal = 8
-                    },
-                    Alpha = 0
-                }
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load(MatchIPCInfo ipc)
         {
-            score1.BindValueChanged(_ => updateScores());
-            score1.BindTo(ipc.Score1);
-
-            score2.BindValueChanged(_ => updateScores());
-            score2.BindTo(ipc.Score2);
-        }
-
-        private void updateScores()
-        {
-            score1Text.Current.Value = score1.Value;
-            score2Text.Current.Value = score2.Value;
-
-            var winningText = score1.Value > score2.Value ? score1Text : score2Text;
-            var losingText = score1.Value <= score2.Value ? score1Text : score2Text;
-
-            winningText.Winning = true;
-            losingText.Winning = false;
-
-            var winningBar = score1.Value > score2.Value ? score1Bar : score2Bar;
-            var losingBar = score1.Value <= score2.Value ? score1Bar : score2Bar;
-
-            int diff = Math.Max(score1.Value, score2.Value) - Math.Min(score1.Value, score2.Value);
-
-            losingBar.ResizeWidthTo(0, 400, Easing.OutQuint);
-            winningBar.ResizeWidthTo(Math.Min(0.4f, MathF.Pow(diff / 1500000f, 0.5f) / 2), 400, Easing.OutQuint);
-
-            scoreDiffText.Alpha = diff != 0 ? 1 : 0;
-            scoreDiffText.Current.Value = -diff;
-            scoreDiffText.Origin = score1.Value > score2.Value ? Anchor.TopLeft : Anchor.TopRight;
-        }
-
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-            score1Text.X = -Math.Max(5 + score1Text.DrawWidth / 2, score1Bar.DrawWidth);
-            score2Text.X = Math.Max(5 + score2Text.DrawWidth / 2, score2Bar.DrawWidth);
-        }
-
-        private partial class MatchScoreCounter : CommaSeparatedScoreCounter
-        {
-            private OsuSpriteText displayedSpriteText = null!;
-
-            public MatchScoreCounter()
-            {
-                Margin = new MarginPadding { Top = bar_height, Horizontal = 10 };
-            }
-
-            public bool Winning
-            {
-                set => updateFont(value);
-            }
-
-            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
-            {
-                displayedSpriteText = s;
-                displayedSpriteText.Spacing = new Vector2(-6);
-                updateFont(false);
-            });
-
-            private void updateFont(bool winning)
-                => displayedSpriteText.Font = winning
-                    ? 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
-        {
-            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
-            {
-                s.Spacing = new Vector2(-2);
-                s.Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: bar_height, fixedWidth: true);
-            });
+            Team1Score.BindTo(ipc.Score1);
+            Team2Score.BindTo(ipc.Score2);
         }
     }
 }

From 19f892687a0607afbe4e0d010366dc2a66236073 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:00:35 +0200
Subject: [PATCH 1083/2100] Add precise rotation control to osu! editor

---
 .../Edit/OsuHitObjectComposer.cs              |   5 +
 .../Edit/PreciseRotationPopover.cs            | 107 ++++++++++++++++++
 .../Edit/TransformToolboxGroup.cs             |  80 +++++++++++++
 .../UserInterfaceV2/LabelledTextBox.cs        |   1 +
 .../UserInterfaceV2/SliderWithTextBoxInput.cs |   2 +
 .../Input/Bindings/GlobalActionContainer.cs   |   4 +
 .../GlobalActionKeyBindingStrings.cs          |   5 +
 .../Edit/Components/EditorToolButton.cs       | 107 ++++++++++++++++++
 .../Compose/Components/BlueprintContainer.cs  |   2 +-
 .../Compose/Components/SelectionHandler.cs    |   2 +-
 10 files changed, 313 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
 create mode 100644 osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs
 create mode 100644 osu.Game/Screens/Edit/Components/EditorToolButton.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 0b80750a02..cff2171cbd 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -85,6 +85,11 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             // we may be entering the screen with a selection already active
             updateDistanceSnapGrid();
+
+            RightToolbox.Add(new TransformToolboxGroup
+            {
+                RotationHandler = BlueprintContainer.SelectionHandler.RotationHandler
+            });
         }
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
diff --git a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
new file mode 100644
index 0000000000..0bc7e72751
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
@@ -0,0 +1,107 @@
+// Copyright (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.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Screens.Edit.Components.RadioButtons;
+using osu.Game.Screens.Edit.Compose.Components;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public partial class PreciseRotationPopover : OsuPopover
+    {
+        private readonly SelectionRotationHandler rotationHandler;
+
+        private readonly Bindable<PreciseRotationInfo> rotationInfo = new Bindable<PreciseRotationInfo>(new PreciseRotationInfo(0, RotationOrigin.PlayfieldCentre));
+
+        private SliderWithTextBoxInput<float> angleInput = null!;
+        private EditorRadioButtonCollection rotationOrigin = null!;
+
+        public PreciseRotationPopover(SelectionRotationHandler rotationHandler)
+        {
+            this.rotationHandler = rotationHandler;
+
+            AllowableAnchors = new[] { Anchor.CentreLeft, Anchor.CentreRight };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new FillFlowContainer
+            {
+                Width = 220,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(20),
+                Children = new Drawable[]
+                {
+                    angleInput = new SliderWithTextBoxInput<float>("Angle (degrees):")
+                    {
+                        Current = new BindableNumber<float>
+                        {
+                            MinValue = -180,
+                            MaxValue = 180,
+                            Precision = 1
+                        },
+                        Instantaneous = true
+                    },
+                    rotationOrigin = new EditorRadioButtonCollection
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Items = new[]
+                        {
+                            new RadioButton("Playfield centre",
+                                () => rotationInfo.Value = rotationInfo.Value with { Origin = RotationOrigin.PlayfieldCentre },
+                                () => new SpriteIcon { Icon = FontAwesome.Regular.Square }),
+                            new RadioButton("Selection centre",
+                                () => rotationInfo.Value = rotationInfo.Value with { Origin = RotationOrigin.SelectionCentre },
+                                () => new SpriteIcon { Icon = FontAwesome.Solid.ObjectGroup })
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ScheduleAfterChildren(() => angleInput.TakeFocus());
+            angleInput.Current.BindValueChanged(angle => rotationInfo.Value = rotationInfo.Value with { Degrees = angle.NewValue });
+            rotationOrigin.Items.First().Select();
+
+            rotationInfo.BindValueChanged(rotation =>
+            {
+                rotationHandler.Update(rotation.NewValue.Degrees, rotation.NewValue.Origin == RotationOrigin.PlayfieldCentre ? OsuPlayfield.BASE_SIZE / 2 : null);
+            });
+        }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+            rotationHandler.Begin();
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+
+            if (IsLoaded)
+                rotationHandler.Commit();
+        }
+    }
+
+    public enum RotationOrigin
+    {
+        PlayfieldCentre,
+        SelectionCentre
+    }
+
+    public record PreciseRotationInfo(float Degrees, RotationOrigin Origin);
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs
new file mode 100644
index 0000000000..3da9f5b69b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs
@@ -0,0 +1,80 @@
+// Copyright (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;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Game.Input.Bindings;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Screens.Edit.Components;
+using osu.Game.Screens.Edit.Compose.Components;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public partial class TransformToolboxGroup : EditorToolboxGroup, IKeyBindingHandler<GlobalAction>
+    {
+        private readonly Bindable<bool> canRotate = new BindableBool();
+
+        private EditorToolButton rotateButton = null!;
+
+        public SelectionRotationHandler RotationHandler { get; init; } = null!;
+
+        public TransformToolboxGroup()
+            : base("transform")
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(5),
+                Children = new Drawable[]
+                {
+                    rotateButton = new EditorToolButton("Rotate",
+                        () => new SpriteIcon { Icon = FontAwesome.Solid.Undo },
+                        () => new PreciseRotationPopover(RotationHandler)),
+                    // TODO: scale
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // bindings to `Enabled` on the buttons are decoupled on purpose
+            // due to the weird `OsuButton` behaviour of resetting `Enabled` to `false` when `Action` is set.
+            canRotate.BindTo(RotationHandler.CanRotate);
+            canRotate.BindValueChanged(_ => rotateButton.Enabled.Value = canRotate.Value, true);
+        }
+
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            if (e.Repeat) return false;
+
+            switch (e.Action)
+            {
+                case GlobalAction.EditorToggleRotateControl:
+                {
+                    rotateButton.TriggerClick();
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
index 454be02d0b..8b9d35e343 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
         public string Text
         {
+            get => Component.Text;
             set => Component.Text = value;
         }
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
index fc0e4d2083..37ea2a3f96 100644
--- a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
@@ -85,6 +85,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
             Current.BindValueChanged(updateTextBoxFromSlider, true);
         }
 
+        public bool TakeFocus() => GetContainingInputManager().ChangeFocus(textBox);
+
         private bool updatingFromTextBox;
 
         private void textChanged(ValueChangedEvent<string> change)
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 1090eeb462..9a0a2d5c15 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -105,6 +105,7 @@ namespace osu.Game.Input.Bindings
             // 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),
+            new KeyBinding(new[] { InputKey.Control, InputKey.R }, GlobalAction.EditorToggleRotateControl),
         };
 
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
@@ -378,5 +379,8 @@ namespace osu.Game.Input.Bindings
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameLeaderboard))]
         ToggleInGameLeaderboard,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorToggleRotateControl))]
+        EditorToggleRotateControl,
     }
 }
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index ceefc27968..8356c480dd 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -344,6 +344,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ExportReplay => new TranslatableString(getKey(@"export_replay"), @"Export replay");
 
+        /// <summary>
+        /// "Toggle rotate control"
+        /// </summary>
+        public static LocalisableString EditorToggleRotateControl => new TranslatableString(getKey(@"editor_toggle_rotate_control"), @"Toggle rotate control");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Screens/Edit/Components/EditorToolButton.cs b/osu.Game/Screens/Edit/Components/EditorToolButton.cs
new file mode 100644
index 0000000000..6550362687
--- /dev/null
+++ b/osu.Game/Screens/Edit/Components/EditorToolButton.cs
@@ -0,0 +1,107 @@
+// Copyright (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.Extensions;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Components
+{
+    public partial class EditorToolButton : OsuButton, IHasPopover
+    {
+        public BindableBool Selected { get; } = new BindableBool();
+
+        private readonly Func<Drawable> createIcon;
+        private readonly Func<Popover?> createPopover;
+
+        private Color4 defaultBackgroundColour;
+        private Color4 defaultIconColour;
+        private Color4 selectedBackgroundColour;
+        private Color4 selectedIconColour;
+
+        private Drawable icon = null!;
+
+        public EditorToolButton(LocalisableString text, Func<Drawable> createIcon, Func<Popover?> createPopover)
+        {
+            Text = text;
+            this.createIcon = createIcon;
+            this.createPopover = createPopover;
+
+            RelativeSizeAxes = Axes.X;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            defaultBackgroundColour = colourProvider.Background3;
+            selectedBackgroundColour = colourProvider.Background1;
+
+            defaultIconColour = defaultBackgroundColour.Darken(0.5f);
+            selectedIconColour = selectedBackgroundColour.Lighten(0.5f);
+
+            Add(icon = createIcon().With(b =>
+            {
+                b.Blending = BlendingParameters.Additive;
+                b.Anchor = Anchor.CentreLeft;
+                b.Origin = Anchor.CentreLeft;
+                b.Size = new Vector2(20);
+                b.X = 10;
+            }));
+
+            Action = Selected.Toggle;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Selected.BindValueChanged(_ => updateSelectionState(), true);
+        }
+
+        private void updateSelectionState()
+        {
+            if (!IsLoaded)
+                return;
+
+            BackgroundColour = Selected.Value ? selectedBackgroundColour : defaultBackgroundColour;
+            icon.Colour = Selected.Value ? selectedIconColour : defaultIconColour;
+
+            if (Selected.Value)
+                this.ShowPopover();
+            else
+                this.HidePopover();
+        }
+
+        protected override SpriteText CreateText() => new OsuSpriteText
+        {
+            Depth = -1,
+            Origin = Anchor.CentreLeft,
+            Anchor = Anchor.CentreLeft,
+            X = 40f
+        };
+
+        public Popover? GetPopover() => Enabled.Value
+            ? createPopover()?.With(p =>
+            {
+                p.State.BindValueChanged(state =>
+                {
+                    if (state.NewValue == Visibility.Hidden)
+                        Selected.Value = false;
+                });
+            })
+            : null;
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 1de6c8364c..110beb0fa6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public Container<SelectionBlueprint<T>> SelectionBlueprints { get; private set; }
 
-        protected SelectionHandler<T> SelectionHandler { get; private set; }
+        public SelectionHandler<T> SelectionHandler { get; private set; }
 
         private readonly Dictionary<T, SelectionBlueprint<T>> blueprintMap = new Dictionary<T, SelectionBlueprint<T>>();
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 158b4066bc..3c859c65ff 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved(CanBeNull = true)]
         protected IEditorChangeHandler ChangeHandler { get; private set; }
 
-        protected SelectionRotationHandler RotationHandler { get; private set; }
+        public SelectionRotationHandler RotationHandler { get; private set; }
 
         protected SelectionHandler()
         {

From 5219b8a13b328341d1afad565f6638cceedbdbca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 16 Aug 2023 11:35:09 +0200
Subject: [PATCH 1084/2100] Add test coverage for precise rotation control

---
 .../Editor/TestScenePreciseRotation.cs        | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs
new file mode 100644
index 0000000000..d7dd30d608
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Edit;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Screens.Edit.Components.RadioButtons;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    public partial class TestScenePreciseRotation : TestSceneOsuEditor
+    {
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset);
+
+        [Test]
+        public void TestHotkeyHandling()
+        {
+            AddStep("select single circle", () => EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects.OfType<HitCircle>().First()));
+            AddStep("press rotate hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddUntilStep("no popover present", () => this.ChildrenOfType<PreciseRotationPopover>().Count(), () => Is.Zero);
+
+            AddStep("select first three objects", () =>
+            {
+                EditorBeatmap.SelectedHitObjects.Clear();
+                EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects.Take(3));
+            });
+            AddStep("press rotate hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddUntilStep("popover present", () => this.ChildrenOfType<PreciseRotationPopover>().Count(), () => Is.EqualTo(1));
+            AddStep("press rotate hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddUntilStep("no popover present", () => this.ChildrenOfType<PreciseRotationPopover>().Count(), () => Is.Zero);
+        }
+
+        [Test]
+        public void TestRotateCorrectness()
+        {
+            AddStep("replace objects", () =>
+            {
+                EditorBeatmap.Clear();
+                EditorBeatmap.AddRange(new HitObject[]
+                {
+                    new HitCircle { Position = new Vector2(100) },
+                    new HitCircle { Position = new Vector2(200) },
+                });
+            });
+            AddStep("select both circles", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
+            AddStep("press rotate hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddUntilStep("popover present", getPopover, () => Is.Not.Null);
+
+            AddStep("rotate by 180deg", () => getPopover().ChildrenOfType<TextBox>().Single().Current.Value = "180");
+            AddAssert("first object rotated 180deg around playfield centre",
+                () => EditorBeatmap.HitObjects.OfType<HitCircle>().ElementAt(0).Position,
+                () => Is.EqualTo(OsuPlayfield.BASE_SIZE - new Vector2(100)));
+            AddAssert("second object rotated 180deg around playfield centre",
+                () => EditorBeatmap.HitObjects.OfType<HitCircle>().ElementAt(1).Position,
+                () => Is.EqualTo(OsuPlayfield.BASE_SIZE - new Vector2(200)));
+
+            AddStep("change rotation origin", () => getPopover().ChildrenOfType<EditorRadioButton>().ElementAt(1).TriggerClick());
+            AddAssert("first object rotated 90deg around selection centre",
+                () => EditorBeatmap.HitObjects.OfType<HitCircle>().ElementAt(0).Position, () => Is.EqualTo(new Vector2(200, 200)));
+            AddAssert("second object rotated 90deg around selection centre",
+                () => EditorBeatmap.HitObjects.OfType<HitCircle>().ElementAt(1).Position, () => Is.EqualTo(new Vector2(100, 100)));
+
+            PreciseRotationPopover? getPopover() => this.ChildrenOfType<PreciseRotationPopover>().SingleOrDefault();
+        }
+    }
+}

From 49fc9655d28d3ec6da285ac4f2fdec609893163a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 19:34:37 +0900
Subject: [PATCH 1085/2100] Apply NRT to `osu.Game.Betamaps.Formats` namespace

---
 osu.Game/Beatmaps/Formats/Decoder.cs             |  7 ++-----
 osu.Game/Beatmaps/Formats/IHasComboColours.cs    |  4 +---
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs     | 10 ++++------
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs     | 16 ++++++----------
 .../Beatmaps/Formats/LegacyStoryboardDecoder.cs  |  8 +++-----
 osu.Game/Skinning/ArgonSkin.cs                   |  2 +-
 osu.Game/Skinning/TrianglesSkin.cs               |  2 +-
 7 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/Decoder.cs b/osu.Game/Beatmaps/Formats/Decoder.cs
index 4f0f11d053..c007f5dcdc 100644
--- a/osu.Game/Beatmaps/Formats/Decoder.cs
+++ b/osu.Game/Beatmaps/Formats/Decoder.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;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Game.IO;
 using osu.Game.Rulesets;
 
@@ -45,7 +42,7 @@ namespace osu.Game.Beatmaps.Formats
         /// Register dependencies for use with static decoder classes.
         /// </summary>
         /// <param name="rulesets">A store containing all available rulesets (used by <see cref="LegacyBeatmapDecoder"/>).</param>
-        public static void RegisterDependencies([NotNull] RulesetStore rulesets)
+        public static void RegisterDependencies(RulesetStore rulesets)
         {
             LegacyBeatmapDecoder.RulesetStore = rulesets ?? throw new ArgumentNullException(nameof(rulesets));
         }
@@ -63,7 +60,7 @@ namespace osu.Game.Beatmaps.Formats
                 throw new IOException(@"Unknown decoder type");
 
             // start off with the first line of the file
-            string line = stream.PeekLine()?.Trim();
+            string? line = stream.PeekLine()?.Trim();
 
             while (line != null && line.Length == 0)
             {
diff --git a/osu.Game/Beatmaps/Formats/IHasComboColours.cs b/osu.Game/Beatmaps/Formats/IHasComboColours.cs
index 1d9cc0be65..1608adee7d 100644
--- a/osu.Game/Beatmaps/Formats/IHasComboColours.cs
+++ b/osu.Game/Beatmaps/Formats/IHasComboColours.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
 
@@ -13,7 +11,7 @@ namespace osu.Game.Beatmaps.Formats
         /// <summary>
         /// Retrieves the list of combo colours for presentation only.
         /// </summary>
-        IReadOnlyList<Color4> ComboColours { get; }
+        IReadOnlyList<Color4>? ComboColours { get; }
 
         /// <summary>
         /// The list of custom combo colours.
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 65a01befb4..5da51f6c8e 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 #pragma warning disable 618
 
 using System;
@@ -36,11 +34,11 @@ namespace osu.Game.Beatmaps.Formats
         /// </summary>
         private const double control_point_leniency = 1;
 
-        internal static RulesetStore RulesetStore;
+        internal static RulesetStore? RulesetStore;
 
-        private Beatmap beatmap;
+        private Beatmap beatmap = null!;
 
-        private ConvertHitObjectParser parser;
+        private ConvertHitObjectParser? parser;
 
         private LegacySampleBank defaultSampleBank;
         private int defaultSampleVolume = 100;
@@ -222,7 +220,7 @@ namespace osu.Game.Beatmaps.Formats
                 case @"Mode":
                     int rulesetID = Parsing.ParseInt(pair.Value);
 
-                    beatmap.BeatmapInfo.Ruleset = RulesetStore.GetRuleset(rulesetID) ?? throw new ArgumentException("Ruleset is not available locally.");
+                    beatmap.BeatmapInfo.Ruleset = RulesetStore?.GetRuleset(rulesetID) ?? throw new ArgumentException("Ruleset is not available locally.");
 
                     switch (rulesetID)
                     {
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 041b00c7e1..fc9de13c89 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.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.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
-using JetBrains.Annotations;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Legacy;
@@ -34,8 +31,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private readonly IBeatmap beatmap;
 
-        [CanBeNull]
-        private readonly ISkin skin;
+        private readonly ISkin? skin;
 
         private readonly int onlineRulesetID;
 
@@ -44,7 +40,7 @@ namespace osu.Game.Beatmaps.Formats
         /// </summary>
         /// <param name="beatmap">The beatmap to encode.</param>
         /// <param name="skin">The beatmap's skin, used for encoding combo colours.</param>
-        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] ISkin skin)
+        public LegacyBeatmapEncoder(IBeatmap beatmap, ISkin? skin)
         {
             this.beatmap = beatmap;
             this.skin = skin;
@@ -180,8 +176,8 @@ namespace osu.Game.Beatmaps.Formats
 
             writer.WriteLine("[TimingPoints]");
 
-            SampleControlPoint lastRelevantSamplePoint = null;
-            DifficultyControlPoint lastRelevantDifficultyPoint = null;
+            SampleControlPoint? lastRelevantSamplePoint = null;
+            DifficultyControlPoint? lastRelevantDifficultyPoint = null;
 
             // In osu!taiko and osu!mania, a scroll speed is stored as "slider velocity" in legacy formats.
             // In that case, a scrolling speed change is a global effect and per-hit object difficulty control points are ignored.
@@ -585,7 +581,7 @@ namespace osu.Game.Beatmaps.Formats
             return type;
         }
 
-        private LegacySampleBank toLegacySampleBank(string sampleBank)
+        private LegacySampleBank toLegacySampleBank(string? sampleBank)
         {
             switch (sampleBank?.ToLowerInvariant())
             {
@@ -603,7 +599,7 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
-        private int toLegacyCustomSampleBank(HitSampleInfo hitSampleInfo)
+        private int toLegacyCustomSampleBank(HitSampleInfo? hitSampleInfo)
         {
             if (hitSampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy)
                 return legacy.CustomSampleBank;
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index df5d3edb55..cf4700bf85 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -19,10 +17,10 @@ namespace osu.Game.Beatmaps.Formats
 {
     public class LegacyStoryboardDecoder : LegacyDecoder<Storyboard>
     {
-        private StoryboardSprite storyboardSprite;
-        private CommandTimelineGroup timelineGroup;
+        private StoryboardSprite? storyboardSprite;
+        private CommandTimelineGroup? timelineGroup;
 
-        private Storyboard storyboard;
+        private Storyboard storyboard = null!;
 
         private readonly Dictionary<string, string> variables = new Dictionary<string, string>();
 
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index ba392386de..61b0dc5aa1 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -232,6 +232,6 @@ namespace osu.Game.Skinning
         }
 
         private static Color4 getComboColour(IHasComboColours source, int colourIndex)
-            => source.ComboColours[colourIndex % source.ComboColours.Count];
+            => source.ComboColours![colourIndex % source.ComboColours.Count];
     }
 }
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index a68a7fd5b9..0957f60579 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -203,6 +203,6 @@ namespace osu.Game.Skinning
         }
 
         private static Color4 getComboColour(IHasComboColours source, int colourIndex)
-            => source.ComboColours[colourIndex % source.ComboColours.Count];
+            => source.ComboColours![colourIndex % source.ComboColours.Count];
     }
 }

From 8686b6b1e6ea2a7e3fd096ec838ec0e344f55acd Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 16 Aug 2023 16:44:08 +0200
Subject: [PATCH 1086/2100] fix The last slider point has effect on previous
 inherited

---
 osu.Game/Database/LegacyBeatmapExporter.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index a874353f73..c00977d072 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -70,7 +70,13 @@ namespace osu.Game.Database
 
                 hitObject.StartTime = Math.Floor(hitObject.StartTime);
 
-                if (hitObject is not IHasPath hasPath || BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1) continue;
+                if (hitObject is not IHasPath hasPath) continue;
+
+                // Make sure the last control point is inherit type
+                if (hasPath.Path.ControlPoints.Count > 1)
+                    hasPath.Path.ControlPoints[^1].Type = null;
+
+                if (BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1) continue;
 
                 var newControlPoints = BezierConverter.ConvertToModernBezier(hasPath.Path.ControlPoints);
 

From 59abb59ee862cc83145e7af2efb6f2e17dfcb407 Mon Sep 17 00:00:00 2001
From: Krzysztof Gutkowski <krzysio.gutkowski@gmail.com>
Date: Thu, 17 Aug 2023 00:49:48 +0200
Subject: [PATCH 1087/2100] Set correct date added value when importing stable
 beatmapsets

---
 .../Database/LegacyBeatmapImporterTest.cs     | 31 ++++++++++++++-
 osu.Game/Beatmaps/BeatmapImporter.cs          | 38 ++++++++++++++++++-
 .../Archives/LegacyDirectoryArchiveReader.cs  |  4 +-
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
index b237556d11..638ad94472 100644
--- a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
@@ -1,19 +1,22 @@
 // Copyright (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;
 using NUnit.Framework;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.IO;
+using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Database
 {
     [TestFixture]
-    public class LegacyBeatmapImporterTest
+    public class LegacyBeatmapImporterTest : RealmTest
     {
         private readonly TestLegacyBeatmapImporter importer = new TestLegacyBeatmapImporter();
 
@@ -60,6 +63,32 @@ namespace osu.Game.Tests.Database
             }
         }
 
+        [Test]
+        public void TestStableDateAddedApplied()
+        {
+            RunTestWithRealmAsync(async (realm, storage) =>
+            {
+                using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+                using (var tmpStorage = new TemporaryNativeStorage("stable-songs-folder"))
+                {
+                    var stableStorage = new StableStorage(tmpStorage.GetFullPath(""), host);
+                    var songsStorage = stableStorage.GetStorageForDirectory(StableStorage.STABLE_DEFAULT_SONGS_PATH);
+
+                    System.IO.Compression.ZipFile.ExtractToDirectory(TestResources.GetQuickTestBeatmapForImport(), songsStorage.GetFullPath("renatus"));
+
+                    string[] beatmaps = Directory.GetFiles(songsStorage.GetFullPath("renatus"), "*.osu", SearchOption.TopDirectoryOnly);
+
+                    File.SetLastWriteTimeUtc(beatmaps[beatmaps.Length / 2], new DateTime(2000, 1, 1, 12, 0, 0));
+
+                    await new LegacyBeatmapImporter(new BeatmapImporter(storage, realm)).ImportFromStableAsync(stableStorage);
+
+                    var set = realm.Realm.All<BeatmapSetInfo>();
+
+                    Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1, 12, 0, 0, DateTimeKind.Utc)), set.First().DateAdded);
+                }
+            });
+        }
+
         private class TestLegacyBeatmapImporter : LegacyBeatmapImporter
         {
             public TestLegacyBeatmapImporter()
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index c840b4fa94..6c3f393069 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -302,14 +302,50 @@ namespace osu.Game.Beatmaps
                 beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
             }
 
+            var dateAdded = DateTimeOffset.UtcNow;
+
+            // Apply proper date added for a beatmapset when importing from stable.
+            // Stable tracks said date using the filesystem last modified date on the .osu file.
+            if (reader is LegacyDirectoryArchiveReader legacyReader)
+            {
+                dateAdded = determineDateAdded(legacyReader);
+            }
+
             return new BeatmapSetInfo
             {
                 OnlineID = beatmap.BeatmapInfo.BeatmapSet?.OnlineID ?? -1,
                 // Metadata = beatmap.Metadata,
-                DateAdded = DateTimeOffset.UtcNow
+                DateAdded = dateAdded
             };
         }
 
+        /// <summary>
+        /// Used for beatmapsets in legacy (stable) storage.
+        /// Determine the date a given beatmapset has been added to the game.
+        /// The specific date is determined based on the oldest `.osu` file existing
+        /// in the beatmapset directory.
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <returns></returns>
+        private DateTimeOffset determineDateAdded(LegacyDirectoryArchiveReader reader)
+        {
+            var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
+
+            var dateAdded = File.GetLastWriteTimeUtc(reader.GetPath(beatmaps.First()));
+
+            foreach (string beatmapName in beatmaps)
+            {
+                var currentDateAdded = File.GetLastWriteTimeUtc(reader.GetPath(beatmapName));
+
+                if (currentDateAdded < dateAdded)
+                {
+                    dateAdded = currentDateAdded;
+                }
+            }
+
+            return new DateTimeOffset(dateAdded);
+        }
+
         /// <summary>
         /// Create all required <see cref="BeatmapInfo"/>s for the provided archive.
         /// </summary>
diff --git a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
index dfae58aed7..8a576e33d8 100644
--- a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
+++ b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
@@ -21,7 +21,9 @@ namespace osu.Game.IO.Archives
             this.path = Path.GetFullPath(path);
         }
 
-        public override Stream GetStream(string name) => File.OpenRead(Path.Combine(path, name));
+        public override Stream GetStream(string name) => File.OpenRead(GetPath(name));
+
+        public string GetPath(string name) => Path.Combine(path, name);
 
         public override void Dispose()
         {

From 046cc62db2b3c58096a3a9697c4f6a3ed76a232f Mon Sep 17 00:00:00 2001
From: Krzysztof Gutkowski <krzysio.gutkowski@gmail.com>
Date: Thu, 17 Aug 2023 01:11:09 +0200
Subject: [PATCH 1088/2100] Cleanup tests

---
 osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
index 638ad94472..d6056fa71b 100644
--- a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
@@ -82,9 +82,10 @@ namespace osu.Game.Tests.Database
 
                     await new LegacyBeatmapImporter(new BeatmapImporter(storage, realm)).ImportFromStableAsync(stableStorage);
 
-                    var set = realm.Realm.All<BeatmapSetInfo>();
+                    var beatmapset = realm.Realm.All<BeatmapSetInfo>().First();
 
-                    Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1, 12, 0, 0, DateTimeKind.Utc)), set.First().DateAdded);
+                    Assert.NotNull(beatmapset);
+                    Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1, 12, 0, 0, DateTimeKind.Utc)), beatmapset.DateAdded);
                 }
             });
         }

From 3a3951ebf414aa449319b159e13081e42da60bdd Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 17 Aug 2023 17:26:00 +0900
Subject: [PATCH 1089/2100] remove useless api resolved

---
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index ffd6942b9b..4e1355b52f 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -34,9 +34,6 @@ namespace osu.Game.Screens.Import
         [Resolved]
         private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
 
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
-
         [Resolved]
         private ScoreManager scoreManager { get; set; } = null!;
 

From 61a1460f093b2d5f2af7c6f4252140718119c0bc Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 17 Aug 2023 17:27:14 +0900
Subject: [PATCH 1090/2100] remove useless Using

---
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index 4e1355b52f..3566b50421 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -17,7 +17,6 @@ using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;

From 0db82e5286dc301f5b86cab1c19ae639b8e0d0d9 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 17 Aug 2023 17:27:50 +0900
Subject: [PATCH 1091/2100] beatmapSetInfo never be null

---
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index 3566b50421..614d652f47 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -147,8 +147,6 @@ namespace osu.Game.Screens.Import
 
         private void updateStatus()
         {
-            if (beatmapSetInfo == null) return;
-
             beatmapPanelContainer.Clear();
             beatmapPanelContainer.Child = new BeatmapCardNormal(beatmapSetInfo, allowExpansion: false);
             checkForAutomaticDownload(beatmapSetInfo);

From e2cb0d7afb1223eb8b0f85bdd585a8211a431fb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Aug 2023 17:59:22 +0900
Subject: [PATCH 1092/2100] 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 d64855e5c1..8ebfde8047 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.815.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.817.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 a5a9387e36..7d4a721c91 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.815.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.817.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 d93dfaf67c..fd1ba0f6d1 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.815.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.817.0" />
   </ItemGroup>
 </Project>

From 0858bef66e8adf93bbd4a220232a0c2505a0e948 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Aug 2023 18:12:04 +0900
Subject: [PATCH 1093/2100] Update `SmokeSegment` in line with framework vertex
 changes

---
 osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
index 9d64c354e2..d818c8baee 100644
--- a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
@@ -257,7 +257,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 texture.Bind();
 
                 for (int i = 0; i < points.Count; i++)
-                    drawPointQuad(points[i], textureRect, i + firstVisiblePointIndex);
+                    drawPointQuad(renderer, points[i], textureRect, i + firstVisiblePointIndex);
 
                 UnbindTextureShader(renderer);
                 renderer.PopLocalMatrix();
@@ -325,7 +325,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             private float getRotation(int index) => max_rotation * (StatelessRNG.NextSingle(rotationSeed, index) * 2 - 1);
 
-            private void drawPointQuad(SmokePoint point, RectangleF textureRect, int index)
+            private void drawPointQuad(IRenderer renderer, SmokePoint point, RectangleF textureRect, int index)
             {
                 Debug.Assert(quadBatch != null);
 
@@ -347,25 +347,25 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 var localBotLeft = point.Position + ortho - dir;
                 var localBotRight = point.Position + ortho + dir;
 
-                quadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D(renderer)
                 {
                     Position = localTopLeft,
                     TexturePosition = textureRect.TopLeft,
                     Colour = Color4Extensions.Multiply(ColourAtPosition(localTopLeft), colour),
                 });
-                quadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D(renderer)
                 {
                     Position = localTopRight,
                     TexturePosition = textureRect.TopRight,
                     Colour = Color4Extensions.Multiply(ColourAtPosition(localTopRight), colour),
                 });
-                quadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D(renderer)
                 {
                     Position = localBotRight,
                     TexturePosition = textureRect.BottomRight,
                     Colour = Color4Extensions.Multiply(ColourAtPosition(localBotRight), colour),
                 });
-                quadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D(renderer)
                 {
                     Position = localBotLeft,
                     TexturePosition = textureRect.BottomLeft,

From b15a54c91428cd8a0af019f6acc17c3b0a21318b Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 17 Aug 2023 11:36:00 +0900
Subject: [PATCH 1094/2100] Use new overlay pop-in/pop-out samples

---
 osu.Game/Overlays/ChatOverlay.cs                         | 3 +++
 osu.Game/Overlays/WaveOverlayContainer.cs                | 1 +
 osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 87df08ceec..a47d10c565 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -55,6 +55,9 @@ namespace osu.Game.Overlays
         private const float side_bar_width = 190;
         private const float chat_bar_height = 60;
 
+        protected override string PopInSampleName => @"UI/overlay-big-pop-in";
+        protected override string PopOutSampleName => @"UI/overlay-big-pop-out";
+
         [Resolved]
         private OsuConfigManager config { get; set; } = null!;
 
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index 153f7f5412..848d9e60b7 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Overlays
         protected override bool StartHidden => true;
 
         protected override string PopInSampleName => "UI/wave-pop-in";
+        protected override string PopOutSampleName => "UI/overlay-big-pop-out";
 
         public const float HORIZONTAL_PADDING = 50;
 
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
index 5753c268d9..7b631ebfea 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -32,6 +32,9 @@ namespace osu.Game.Screens.Select.Options
 
         public override bool BlockScreenWideMouse => false;
 
+        protected override string PopInSampleName => "SongSelect/options-pop-in";
+        protected override string PopOutSampleName => "SongSelect/options-pop-out";
+
         public BeatmapOptionsOverlay()
         {
             AutoSizeAxes = Axes.Y;

From 04a1f6a5085e0cc076abba71068d4b8d1031c0ab Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 17 Aug 2023 11:37:07 +0900
Subject: [PATCH 1095/2100] Add panning to certain overlay pop-in/pop-outs

---
 .../Containers/OsuFocusedOverlayContainer.cs      | 15 +++++++++++----
 osu.Game/Overlays/LoginOverlay.cs                 |  2 ++
 osu.Game/Overlays/NotificationOverlay.cs          |  2 ++
 osu.Game/Overlays/SettingsPanel.cs                |  1 +
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index f92cfc2306..162c4b6a59 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Graphics.Containers
         private Sample samplePopOut;
         protected virtual string PopInSampleName => "UI/overlay-pop-in";
         protected virtual string PopOutSampleName => "UI/overlay-pop-out";
+        protected virtual double PopInOutSampleBalance => 0;
 
         protected override bool BlockNonPositionalInput => true;
 
@@ -133,15 +134,21 @@ namespace osu.Game.Graphics.Containers
                         return;
                     }
 
-                    if (didChange)
-                        samplePopIn?.Play();
+                    if (didChange && samplePopIn != null)
+                    {
+                        samplePopIn.Balance.Value = PopInOutSampleBalance;
+                        samplePopIn.Play();
+                    }
 
                     if (BlockScreenWideMouse && DimMainContent) overlayManager?.ShowBlockingOverlay(this);
                     break;
 
                 case Visibility.Hidden:
-                    if (didChange)
-                        samplePopOut?.Play();
+                    if (didChange && samplePopOut != null)
+                    {
+                        samplePopOut.Balance.Value = PopInOutSampleBalance;
+                        samplePopOut.Play();
+                    }
 
                     if (BlockScreenWideMouse) overlayManager?.HideBlockingOverlay(this);
                     break;
diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index a575253e71..8a4bda89d9 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Overlays
 
         private const float transition_time = 400;
 
+        protected override double PopInOutSampleBalance => OsuGameBase.SFX_STEREO_STRENGTH;
+
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index c9d09848f8..ef181830b7 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Overlays
         public LocalisableString Title => NotificationsStrings.HeaderTitle;
         public LocalisableString Description => NotificationsStrings.HeaderDescription;
 
+        protected override double PopInOutSampleBalance => OsuGameBase.SFX_STEREO_STRENGTH;
+
         public const float WIDTH = 320;
 
         public const float TRANSITION_LENGTH = 600;
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index d7f39a9d8f..58c56a5514 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Overlays
         private SeekLimitedSearchTextBox searchTextBox;
 
         protected override string PopInSampleName => "UI/settings-pop-in";
+        protected override double PopInOutSampleBalance => -OsuGameBase.SFX_STEREO_STRENGTH;
 
         private readonly bool showSidebar;
 

From 3d7ba0e18cdc9c739119125243c73a205e3f4fcb Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 17 Aug 2023 17:03:45 +0900
Subject: [PATCH 1096/2100] Add pop-in/pop-out sfx to more overlays

---
 .../Collections/ManageCollectionsDialog.cs    |  3 +++
 .../Graphics/UserInterfaceV2/OsuPopover.cs    | 25 ++++++++++++++++++-
 .../Screens/Edit/Setup/LabelledFileChooser.cs |  3 +++
 .../OnlinePlay/Lounge/DrawableLoungeRoom.cs   |  2 ++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index 31016b807b..cc0f23d030 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Collections
 
         private AudioFilter lowPassFilter = null!;
 
+        protected override string PopInSampleName => @"UI/overlay-big-pop-in";
+        protected override string PopOutSampleName => @"UI/overlay-big-pop-out";
+
         public ManageCollectionsDialog()
         {
             Anchor = Anchor.Centre;
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
index 381193d539..2aa42d0d50 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -21,6 +23,16 @@ namespace osu.Game.Graphics.UserInterfaceV2
         private const float fade_duration = 250;
         private const double scale_duration = 500;
 
+        private Sample? samplePopIn;
+        private Sample? samplePopOut;
+        protected virtual string PopInSampleName => "UI/overlay-pop-in";
+        protected virtual string PopOutSampleName => "UI/overlay-pop-out";
+
+        // required due to LoadAsyncComplete() calling PopOut() during load - similar workaround to `OsuDropdownMenu`
+        private bool wasOpened;
+
+        protected virtual bool PlayPopInOutSamples => true;
+
         public OsuPopover(bool withPadding = true)
         {
             Content.Padding = withPadding ? new MarginPadding(20) : new MarginPadding();
@@ -38,9 +50,11 @@ namespace osu.Game.Graphics.UserInterfaceV2
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OverlayColourProvider? colourProvider, OsuColour colours)
+        private void load(OverlayColourProvider? colourProvider, OsuColour colours, AudioManager audio)
         {
             Background.Colour = Arrow.Colour = colourProvider?.Background4 ?? colours.GreySeaFoamDarker;
+            samplePopIn = audio.Samples.Get(PopInSampleName);
+            samplePopOut = audio.Samples.Get(PopOutSampleName);
         }
 
         protected override Drawable CreateArrow() => Empty();
@@ -49,12 +63,21 @@ namespace osu.Game.Graphics.UserInterfaceV2
         {
             this.ScaleTo(1, scale_duration, Easing.OutElasticHalf);
             this.FadeIn(fade_duration, Easing.OutQuint);
+
+            if (PlayPopInOutSamples)
+            {
+                samplePopIn?.Play();
+                wasOpened = true;
+            }
         }
 
         protected override void PopOut()
         {
             this.ScaleTo(0.7f, scale_duration, Easing.OutQuint);
             this.FadeOut(fade_duration, Easing.OutQuint);
+
+            if (wasOpened && PlayPopInOutSamples)
+                samplePopOut?.Play();
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
diff --git a/osu.Game/Screens/Edit/Setup/LabelledFileChooser.cs b/osu.Game/Screens/Edit/Setup/LabelledFileChooser.cs
index d14357e875..61f33c4bdc 100644
--- a/osu.Game/Screens/Edit/Setup/LabelledFileChooser.cs
+++ b/osu.Game/Screens/Edit/Setup/LabelledFileChooser.cs
@@ -114,6 +114,9 @@ namespace osu.Game.Screens.Edit.Setup
 
         private partial class FileChooserPopover : OsuPopover
         {
+            protected override string PopInSampleName => "UI/overlay-big-pop-in";
+            protected override string PopOutSampleName => "UI/overlay-big-pop-out";
+
             public FileChooserPopover(string[] handledExtensions, Bindable<FileInfo?> currentFile, string? chooserPath)
             {
                 Child = new Container
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
index 70e4b2a589..030408de84 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
@@ -191,6 +191,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             protected override bool BlockNonPositionalInput => true;
 
+            protected override bool PlayPopInOutSamples => false;
+
             public PasswordEntryPopover(Room room)
             {
                 this.room = room;

From d10d7b6ea41f994c586725e127647b171634fae9 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 17 Aug 2023 17:07:02 +0900
Subject: [PATCH 1097/2100] Change some component samples to go better with
 overlay pop-in samples

---
 osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs         | 4 ++--
 osu.Game/Graphics/UserInterface/ShearedToggleButton.cs       | 5 +++++
 osu.Game/Overlays/Mods/AddPresetButton.cs                    | 2 ++
 .../Screens/Edit/Compose/Components/BeatDivisorControl.cs    | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
index de4df96942..0eec04541c 100644
--- a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
@@ -46,8 +46,8 @@ namespace osu.Game.Graphics.UserInterface
         private readonly Container content;
         private readonly Box hover;
 
-        public OsuAnimatedButton()
-            : base(HoverSampleSet.Button)
+        public OsuAnimatedButton(HoverSampleSet sampleSet = HoverSampleSet.Button)
+            : base(sampleSet)
         {
             base.Content.Add(content = new Container
             {
diff --git a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
index d5e0abe9d8..07ee26749a 100644
--- a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Graphics.UserInterface
         private Sample? sampleOff;
         private Sample? sampleOn;
 
+        protected virtual bool PlayClickSampleOnly => false;
+
         /// <summary>
         /// Whether this button is currently toggled to an active state.
         /// </summary>
@@ -68,6 +70,9 @@ namespace osu.Game.Graphics.UserInterface
         {
             sampleClick?.Play();
 
+            if (PlayClickSampleOnly)
+                return;
+
             if (Active.Value)
                 sampleOn?.Play();
             else
diff --git a/osu.Game/Overlays/Mods/AddPresetButton.cs b/osu.Game/Overlays/Mods/AddPresetButton.cs
index 731079d1d9..9063fd54f5 100644
--- a/osu.Game/Overlays/Mods/AddPresetButton.cs
+++ b/osu.Game/Overlays/Mods/AddPresetButton.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Overlays.Mods
 {
     public partial class AddPresetButton : ShearedToggleButton, IHasPopover
     {
+        protected override bool PlayClickSampleOnly => true;
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 59b0bd1785..e36f1e9cad 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -262,6 +262,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             private readonly OsuSpriteText divisorText;
 
             public DivisorDisplay()
+                : base(HoverSampleSet.Default)
             {
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;

From 63080d049f254c2051f47de6c3e77b5f3170eec6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Aug 2023 19:08:18 +0900
Subject: [PATCH 1098/2100] Adjust icons slightly

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

diff --git a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
index 0bc7e72751..86112d9751 100644
--- a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
+++ b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                                 () => new SpriteIcon { Icon = FontAwesome.Regular.Square }),
                             new RadioButton("Selection centre",
                                 () => rotationInfo.Value = rotationInfo.Value with { Origin = RotationOrigin.SelectionCentre },
-                                () => new SpriteIcon { Icon = FontAwesome.Solid.ObjectGroup })
+                                () => new SpriteIcon { Icon = FontAwesome.Solid.VectorSquare })
                         }
                     }
                 }

From c811546868cb8754a32049bdfbd9bc22ab0be171 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Aug 2023 21:09:50 +0900
Subject: [PATCH 1099/2100] 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 a5a9387e36..a2afcd7a9f 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.815.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.817.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 360f9750e1c3311928c57198d77c82b02ae4cfde Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Thu, 17 Aug 2023 16:30:18 +0200
Subject: [PATCH 1100/2100] Allow selecting empty control point groups

---
 osu.Game/Screens/Edit/Timing/ControlPointList.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointList.cs b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
index 555c36aac0..64e2d5c1a8 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointList.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
@@ -147,6 +147,10 @@ namespace osu.Game.Screens.Edit.Timing
                 trackedType = null;
             else
             {
+                // If the selected group has no control points, clear the tracked type.
+                // Otherwise the user will be unable to select a group with no control points.
+                if (selectedGroup.Value.ControlPoints.Count == 0)
+                    trackedType = null;
                 // If the selected group only has one control point, update the tracking type.
                 if (selectedGroup.Value.ControlPoints.Count == 1)
                     trackedType = selectedGroup.Value?.ControlPoints.Single().GetType();

From 3481c41a2212750937c87125c5db62d246da54ff Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Fri, 18 Aug 2023 04:34:10 +0200
Subject: [PATCH 1101/2100] Fix `segmentEnds` being calculated incorrectly

---
 osu.Game/Rulesets/Objects/SliderPath.cs       | 19 +++++++++++--------
 .../Rulesets/Objects/SliderPathExtensions.cs  | 10 +++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index f48ffbe5a4..171298e6c0 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Objects
         {
             ensureValid();
 
-            return segmentEnds.Select(i => cumulativeLength[Math.Clamp(i, 0, cumulativeLength.Count - 1)] / calculatedLength);
+            return segmentEnds.Select(i => cumulativeLength[i] / Distance);
         }
 
         private void invalidate()
@@ -251,8 +251,9 @@ namespace osu.Game.Rulesets.Objects
                         calculatedPath.Add(t);
                 }
 
-                // Remember the index of the segment end
-                segmentEnds.Add(calculatedPath.Count - 1);
+                if (i > 0)
+                    // Remember the index of the segment end
+                    segmentEnds.Add(calculatedPath.Count - 1);
 
                 // Start the new segment at the current vertex
                 start = i;
@@ -314,15 +315,11 @@ namespace osu.Game.Rulesets.Objects
 
                 if (calculatedLength > expectedDistance)
                 {
-                    // The path will be shortened further, in which case we should trim any more unnecessary lengths and their associated path segments
+                    // The path will be shortened further, in which case we should trim any more unnecessary lengths
                     while (cumulativeLength.Count > 0 && cumulativeLength[^1] >= expectedDistance)
                     {
                         cumulativeLength.RemoveAt(cumulativeLength.Count - 1);
                         calculatedPath.RemoveAt(pathEndIndex--);
-
-                        // Shorten the last segment to the expected distance
-                        if (segmentEnds.Count > 0)
-                            segmentEnds[^1]--;
                     }
                 }
 
@@ -339,6 +336,12 @@ namespace osu.Game.Rulesets.Objects
 
                 calculatedPath[pathEndIndex] = calculatedPath[pathEndIndex - 1] + dir * (float)(expectedDistance - cumulativeLength[^1]);
                 cumulativeLength.Add(expectedDistance);
+
+                // Shorten the segments to the expected distance
+                for (int i = 0; i < segmentEnds.Count; i++)
+                {
+                    segmentEnds[i] = Math.Min(segmentEnds[i], cumulativeLength.Count - 1);
+                }
             }
         }
 
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 21448404ef..58ce20cd32 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -45,9 +45,9 @@ namespace osu.Game.Rulesets.Objects
             double[] distinctSegmentEnds = truncateEndingDuplicates(segmentEnds);
 
             // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
-            if (segmentEnds.Length >= 2 && Precision.AlmostEquals(segmentEnds[^1], segmentEnds[^2]) && distinctSegmentEnds.Length > 1)
+            if (segmentEnds.Length >= 2 && Precision.AlmostEquals(segmentEnds[^1], segmentEnds[^2]) && distinctSegmentEnds.Length > 0)
             {
-                int numVisibleSegments = distinctSegmentEnds.Length - 2;
+                int numVisibleSegments = distinctSegmentEnds.Length - 1;
                 var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();
 
                 int lastVisibleControlPointIndex = controlPoints.IndexOf(nonInheritedControlPoints[numVisibleSegments]);
@@ -69,9 +69,9 @@ namespace osu.Game.Rulesets.Objects
             inheritedLinearPoints.ForEach(p => p.Type = null);
 
             // Recalculate perfect curve at the end of the slider path.
-            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 1)
+            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 0)
             {
-                double lastSegmentStart = distinctSegmentEnds[^2];
+                double lastSegmentStart = distinctSegmentEnds.Length > 1 ? distinctSegmentEnds[^2] : 0;
                 double lastSegmentEnd = distinctSegmentEnds[^1];
 
                 var circleArcPath = new List<Vector2>();
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Objects
 
             var result = arr.ToList();
 
-            while (Precision.AlmostEquals(result[^1], result[^2]) && result.Count > 1)
+            while (result.Count > 1 && Precision.AlmostEquals(result[^1], result[^2]))
                 result.RemoveAt(result.Count - 1);
 
             return result.ToArray();

From fc2fac577fcdb1d329b83e2cb2e30fc5e7ea78ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:05:25 +0900
Subject: [PATCH 1102/2100] Inverse and xmldoc `ShearedToggleButton` sample
 allowance bool

---
 .../UserInterface/ShearedToggleButton.cs      | 20 +++++++++++--------
 osu.Game/Overlays/Mods/AddPresetButton.cs     |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
index 07ee26749a..05ed531d02 100644
--- a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
@@ -14,7 +14,11 @@ namespace osu.Game.Graphics.UserInterface
         private Sample? sampleOff;
         private Sample? sampleOn;
 
-        protected virtual bool PlayClickSampleOnly => false;
+        /// <summary>
+        /// Sheared toggle buttons by default play two samples when toggled: a click and a toggle (on/off).
+        /// Sometimes this might be too much. Setting this to <c>false</c> will silence the toggle sound.
+        /// </summary>
+        protected virtual bool PlayToggleSamples => true;
 
         /// <summary>
         /// Whether this button is currently toggled to an active state.
@@ -70,13 +74,13 @@ namespace osu.Game.Graphics.UserInterface
         {
             sampleClick?.Play();
 
-            if (PlayClickSampleOnly)
-                return;
-
-            if (Active.Value)
-                sampleOn?.Play();
-            else
-                sampleOff?.Play();
+            if (PlayToggleSamples)
+            {
+                if (Active.Value)
+                    sampleOn?.Play();
+                else
+                    sampleOff?.Play();
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/AddPresetButton.cs b/osu.Game/Overlays/Mods/AddPresetButton.cs
index 9063fd54f5..276afd9bec 100644
--- a/osu.Game/Overlays/Mods/AddPresetButton.cs
+++ b/osu.Game/Overlays/Mods/AddPresetButton.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Mods
 {
     public partial class AddPresetButton : ShearedToggleButton, IHasPopover
     {
-        protected override bool PlayClickSampleOnly => true;
+        protected override bool PlayToggleSamples => false;
 
         [Resolved]
         private OsuColour colours { get; set; } = null!;

From 75750957c7cd93a2cac7d0090d146c214239eed2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:09:13 +0900
Subject: [PATCH 1103/2100] Add note about why pop in samples are disabled for
 `PasswordEntryPopover`

---
 osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
index 030408de84..a45583a2ec 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
@@ -191,6 +191,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             protected override bool BlockNonPositionalInput => true;
 
+            // When a room is clicked, it already plays a click sound, which clashes pretty badly with the pop in sound.
+            // Dunno about this one. I'd probably remove the click sound from the panel in cases they are password protected and play these pop in / out sounds.
             protected override bool PlayPopInOutSamples => false;
 
             public PasswordEntryPopover(Room room)

From 9023059bc0cbbbe7caaa6e7fe8dd7be913f478e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:27:09 +0900
Subject: [PATCH 1104/2100] Convert to switch statement

---
 .../Screens/Edit/Timing/ControlPointList.cs   | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointList.cs b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
index 64e2d5c1a8..22e37b9efb 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointList.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
@@ -147,17 +147,25 @@ namespace osu.Game.Screens.Edit.Timing
                 trackedType = null;
             else
             {
-                // If the selected group has no control points, clear the tracked type.
-                // Otherwise the user will be unable to select a group with no control points.
-                if (selectedGroup.Value.ControlPoints.Count == 0)
-                    trackedType = null;
-                // If the selected group only has one control point, update the tracking type.
-                if (selectedGroup.Value.ControlPoints.Count == 1)
-                    trackedType = selectedGroup.Value?.ControlPoints.Single().GetType();
-                // If the selected group has more than one control point, choose the first as the tracking type
-                // if we don't already have a singular tracked type.
-                else if (trackedType == null)
-                    trackedType = selectedGroup.Value?.ControlPoints.FirstOrDefault()?.GetType();
+                switch (selectedGroup.Value.ControlPoints.Count)
+                {
+                    // If the selected group has no control points, clear the tracked type.
+                    // Otherwise the user will be unable to select a group with no control points.
+                    case 0:
+                        trackedType = null;
+                        break;
+
+                    // If the selected group only has one control point, update the tracking type.
+                    case 1:
+                        trackedType = selectedGroup.Value?.ControlPoints.Single().GetType();
+                        break;
+
+                    // If the selected group has more than one control point, choose the first as the tracking type
+                    // if we don't already have a singular tracked type.
+                    default:
+                        trackedType ??= selectedGroup.Value?.ControlPoints.FirstOrDefault()?.GetType();
+                        break;
+                }
             }
 
             if (trackedType != null)

From eb2460d18014d3a14d0b2001be69b1bc778cfd5e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:40:00 +0900
Subject: [PATCH 1105/2100] Remove dead metadata transfer code

---
 osu.Game/Beatmaps/BeatmapImporter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 6c3f393069..21a694b3ba 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -314,7 +314,6 @@ namespace osu.Game.Beatmaps
             return new BeatmapSetInfo
             {
                 OnlineID = beatmap.BeatmapInfo.BeatmapSet?.OnlineID ?? -1,
-                // Metadata = beatmap.Metadata,
                 DateAdded = dateAdded
             };
         }

From 864f1bdb3e6781dd8c947f517d830610c5a376b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:54:39 +0900
Subject: [PATCH 1106/2100] Move population of import time to the `Populate`
 method

Feels like a better place to be doing this. I think we want to keep any
kind of potentially expensive work in the `Populate` method.
---
 osu.Game/Beatmaps/BeatmapImporter.cs | 40 +++++++++++-----------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 21a694b3ba..7e82516bed 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -152,6 +152,8 @@ namespace osu.Game.Beatmaps
             if (archive != null)
                 beatmapSet.Beatmaps.AddRange(createBeatmapDifficulties(beatmapSet, realm));
 
+            beatmapSet.DateAdded = getDateAdded(archive);
+
             foreach (BeatmapInfo b in beatmapSet.Beatmaps)
             {
                 b.BeatmapSet = beatmapSet;
@@ -302,47 +304,37 @@ namespace osu.Game.Beatmaps
                 beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
             }
 
-            var dateAdded = DateTimeOffset.UtcNow;
-
-            // Apply proper date added for a beatmapset when importing from stable.
-            // Stable tracks said date using the filesystem last modified date on the .osu file.
-            if (reader is LegacyDirectoryArchiveReader legacyReader)
-            {
-                dateAdded = determineDateAdded(legacyReader);
-            }
-
             return new BeatmapSetInfo
             {
                 OnlineID = beatmap.BeatmapInfo.BeatmapSet?.OnlineID ?? -1,
-                DateAdded = dateAdded
             };
         }
 
         /// <summary>
-        /// Used for beatmapsets in legacy (stable) storage.
         /// Determine the date a given beatmapset has been added to the game.
-        /// The specific date is determined based on the oldest `.osu` file existing
-        /// in the beatmapset directory.
+        /// For legacy imports, we can use the oldest file write time for any `.osu` file in the directory.
+        /// For any other import types, use "now".
         /// </summary>
-        /// <param name="reader"></param>
-        /// <returns></returns>
-        private DateTimeOffset determineDateAdded(LegacyDirectoryArchiveReader reader)
+        private DateTimeOffset getDateAdded(ArchiveReader? reader)
         {
-            var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
+            DateTimeOffset dateAdded = DateTimeOffset.UtcNow;
 
-            var dateAdded = File.GetLastWriteTimeUtc(reader.GetPath(beatmaps.First()));
-
-            foreach (string beatmapName in beatmaps)
+            if (reader is LegacyDirectoryArchiveReader legacyReader)
             {
-                var currentDateAdded = File.GetLastWriteTimeUtc(reader.GetPath(beatmapName));
+                var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
 
-                if (currentDateAdded < dateAdded)
+                dateAdded = File.GetLastWriteTimeUtc(legacyReader.GetPath(beatmaps.First()));
+
+                foreach (string beatmapName in beatmaps)
                 {
-                    dateAdded = currentDateAdded;
+                    var currentDateAdded = File.GetLastWriteTimeUtc(legacyReader.GetPath(beatmapName));
+
+                    if (currentDateAdded < dateAdded)
+                        dateAdded = currentDateAdded;
                 }
             }
 
-            return new DateTimeOffset(dateAdded);
+            return dateAdded;
         }
 
         /// <summary>

From 5e0b89a1a862c20a938dc3b7d1e63be87e717ff9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:56:43 +0900
Subject: [PATCH 1107/2100] Rename `GetPath` to `GetFullPath` to better match
 expectations

---
 osu.Game/Beatmaps/BeatmapImporter.cs                 | 4 ++--
 osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 7e82516bed..14719da1bc 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -323,11 +323,11 @@ namespace osu.Game.Beatmaps
             {
                 var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
 
-                dateAdded = File.GetLastWriteTimeUtc(legacyReader.GetPath(beatmaps.First()));
+                dateAdded = File.GetLastWriteTimeUtc(legacyReader.GetFullPath(beatmaps.First()));
 
                 foreach (string beatmapName in beatmaps)
                 {
-                    var currentDateAdded = File.GetLastWriteTimeUtc(legacyReader.GetPath(beatmapName));
+                    var currentDateAdded = File.GetLastWriteTimeUtc(legacyReader.GetFullPath(beatmapName));
 
                     if (currentDateAdded < dateAdded)
                         dateAdded = currentDateAdded;
diff --git a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
index 8a576e33d8..1503705022 100644
--- a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
+++ b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
@@ -21,9 +21,9 @@ namespace osu.Game.IO.Archives
             this.path = Path.GetFullPath(path);
         }
 
-        public override Stream GetStream(string name) => File.OpenRead(GetPath(name));
+        public override Stream GetStream(string name) => File.OpenRead(GetFullPath(name));
 
-        public string GetPath(string name) => Path.Combine(path, name);
+        public string GetFullPath(string filename) => Path.Combine(path, filename);
 
         public override void Dispose()
         {

From 80a143ae85cd2e2b53213c891c6521b8457cd7a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 18:00:33 +0900
Subject: [PATCH 1108/2100] Tidy up test a bit more

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

diff --git a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
index d6056fa71b..0144c0bf97 100644
--- a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Platform;
@@ -74,7 +75,7 @@ namespace osu.Game.Tests.Database
                     var stableStorage = new StableStorage(tmpStorage.GetFullPath(""), host);
                     var songsStorage = stableStorage.GetStorageForDirectory(StableStorage.STABLE_DEFAULT_SONGS_PATH);
 
-                    System.IO.Compression.ZipFile.ExtractToDirectory(TestResources.GetQuickTestBeatmapForImport(), songsStorage.GetFullPath("renatus"));
+                    ZipFile.ExtractToDirectory(TestResources.GetQuickTestBeatmapForImport(), songsStorage.GetFullPath("renatus"));
 
                     string[] beatmaps = Directory.GetFiles(songsStorage.GetFullPath("renatus"), "*.osu", SearchOption.TopDirectoryOnly);
 
@@ -82,10 +83,10 @@ namespace osu.Game.Tests.Database
 
                     await new LegacyBeatmapImporter(new BeatmapImporter(storage, realm)).ImportFromStableAsync(stableStorage);
 
-                    var beatmapset = realm.Realm.All<BeatmapSetInfo>().First();
+                    var importedSet = realm.Realm.All<BeatmapSetInfo>().Single();
 
-                    Assert.NotNull(beatmapset);
-                    Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1, 12, 0, 0, DateTimeKind.Utc)), beatmapset.DateAdded);
+                    Assert.NotNull(importedSet);
+                    Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1, 12, 0, 0, DateTimeKind.Utc)), importedSet.DateAdded);
                 }
             });
         }

From a2fd7707a16bccb055dd25997644173198851633 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 20:38:17 +0900
Subject: [PATCH 1109/2100] Allow toggling SVs in the editor

---
 .../UI/DrawableCatchRuleset.cs                |  3 +-
 .../Skinning/ManiaSkinnableTestScene.cs       |  2 +-
 .../Edit/DrawableManiaEditorRuleset.cs        | 17 ++++++-
 .../Edit/ManiaHitObjectComposer.cs            | 28 +++++++++-
 .../Mods/ManiaModConstantSpeed.cs             |  2 +-
 .../UI/DrawableManiaRuleset.cs                | 17 ++-----
 .../UI/DrawableTaikoRuleset.cs                |  3 +-
 .../TestSceneDrawableScrollingRuleset.cs      |  3 +-
 .../UI/Scrolling/DrawableScrollingRuleset.cs  | 51 ++++++++++++-------
 .../Rulesets/UI/Scrolling/IScrollingInfo.cs   |  4 +-
 .../Scrolling/ScrollingHitObjectContainer.cs  | 14 +++--
 .../TernaryButtons/DrawableTernaryButton.cs   |  2 +-
 .../Tests/Visual/ScrollingTestContainer.cs    |  2 +-
 13 files changed, 98 insertions(+), 50 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index 7930a07551..f0a327d7ac 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public partial class DrawableCatchRuleset : DrawableScrollingRuleset<CatchHitObject>
     {
-        protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Constant;
-
         protected override bool UserScrollSpeedAdjustment => false;
 
         public DrawableCatchRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods = null)
@@ -30,6 +28,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             Direction.Value = ScrollingDirection.Down;
             TimeRange.Value = GetTimeRange(beatmap.Difficulty.ApproachRate);
+            VisualisationMethod = ScrollVisualisationMethod.Constant;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index ba0c97a121..abf01aa4a4 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 
             IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
             IBindable<double> IScrollingInfo.TimeRange { get; } = new Bindable<double>(5000);
-            IScrollAlgorithm IScrollingInfo.Algorithm { get; } = new ConstantScrollAlgorithm();
+            IBindable<IScrollAlgorithm> IScrollingInfo.Algorithm { get; } = new Bindable<IScrollAlgorithm>(new ConstantScrollAlgorithm());
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index dadd725a2f..013dd3dcbd 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osuTK;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -15,12 +17,25 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public partial class DrawableManiaEditorRuleset : DrawableManiaRuleset
     {
+        public readonly IBindable<TernaryState> ShowSpeedChanges = new Bindable<TernaryState>();
+
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
         public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods)
             : base(ruleset, beatmap, mods)
         {
-            ScrollMethod = ScrollVisualisationMethod.Constant;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ShowSpeedChanges.BindValueChanged(state =>
+            {
+                VisualisationMethod = state.NewValue == TernaryState.True
+                    ? ScrollVisualisationMethod.Sequential
+                    : ScrollVisualisationMethod.Constant;
+            }, true);
         }
 
         protected override Playfield CreatePlayfield() => new ManiaEditorPlayfield(Beatmap.Stages)
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 5e577a2964..44e238efac 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -6,8 +6,13 @@
 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.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Objects;
@@ -16,6 +21,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
@@ -23,6 +29,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public partial class ManiaHitObjectComposer : HitObjectComposer<ManiaHitObject>
     {
+        private readonly Bindable<TernaryState> showSpeedChanges = new Bindable<TernaryState>();
+
         private DrawableManiaEditorRuleset drawableRuleset;
         private ManiaBeatSnapGrid beatSnapGrid;
         private InputManager inputManager;
@@ -36,6 +44,21 @@ namespace osu.Game.Rulesets.Mania.Edit
         private void load()
         {
             AddInternal(beatSnapGrid = new ManiaBeatSnapGrid());
+
+            LeftToolbox.Add(new EditorToolboxGroup("playfield")
+            {
+                Child = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0, 5),
+                    Children = new[]
+                    {
+                        new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
+                    }
+                },
+            });
         }
 
         protected override void LoadComplete()
@@ -59,7 +82,10 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
-            drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods);
+            drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods)
+            {
+                ShowSpeedChanges = { BindTarget = showSpeedChanges }
+            };
 
             // This is the earliest we can cache the scrolling info to ourselves, before masks are added to the hierarchy and inject it
             dependencies.CacheAs(drawableRuleset.ScrollingInfo);
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
index 66269f5572..d8e6bcd424 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {
             var maniaRuleset = (DrawableManiaRuleset)drawableRuleset;
-            maniaRuleset.ScrollMethod = ScrollVisualisationMethod.Constant;
+            maniaRuleset.VisualisationMethod = ScrollVisualisationMethod.Constant;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 2d373c0471..eb99434e04 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -52,22 +51,12 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
-        public ScrollVisualisationMethod ScrollMethod
+        public new ScrollVisualisationMethod VisualisationMethod
         {
-            get => scrollMethod;
-            set
-            {
-                if (IsLoaded)
-                    throw new InvalidOperationException($"Can't alter {nameof(ScrollMethod)} after ruleset is already loaded");
-
-                scrollMethod = value;
-            }
+            get => base.VisualisationMethod;
+            set => base.VisualisationMethod = value;
         }
 
-        private ScrollVisualisationMethod scrollMethod = ScrollVisualisationMethod.Sequential;
-
-        protected override ScrollVisualisationMethod VisualisationMethod => scrollMethod;
-
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
         private readonly BindableInt configScrollSpeed = new BindableInt();
         private double smoothTimeRange;
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 64d406a308..979e03f201 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public new TaikoInputManager KeyBindingInputManager => (TaikoInputManager)base.KeyBindingInputManager;
 
-        protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Overlapping;
-
         protected override bool UserScrollSpeedAdjustment => false;
 
         private SkinnableDrawable scroller;
@@ -45,6 +43,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             : base(ruleset, beatmap, mods)
         {
             Direction.Value = ScrollingDirection.Left;
+            VisualisationMethod = ScrollVisualisationMethod.Overlapping;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 287b7d43b4..4c898feb48 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -311,14 +311,13 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             protected override bool RelativeScaleBeatLengths => RelativeScaleBeatLengthsOverride;
 
-            protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Overlapping;
-
             public new Bindable<double> TimeRange => base.TimeRange;
 
             public TestDrawableScrollingRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
                 : base(ruleset, beatmap, mods)
             {
                 TimeRange.Value = time_range;
+                VisualisationMethod = ScrollVisualisationMethod.Overlapping;
             }
 
             public override DrawableHitObject<TestHitObject> CreateDrawableRepresentation(TestHitObject h)
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index 4c7564b791..d082d26792 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -64,8 +64,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
             MaxValue = time_span_max
         };
 
-        protected virtual ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Sequential;
-
         ScrollVisualisationMethod IDrawableScrollingRuleset.VisualisationMethod => VisualisationMethod;
 
         /// <summary>
@@ -99,20 +97,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         [BackgroundDependencyLoader]
         private void load()
         {
-            switch (VisualisationMethod)
-            {
-                case ScrollVisualisationMethod.Sequential:
-                    scrollingInfo.Algorithm = new SequentialScrollAlgorithm(ControlPoints);
-                    break;
-
-                case ScrollVisualisationMethod.Overlapping:
-                    scrollingInfo.Algorithm = new OverlappingScrollAlgorithm(ControlPoints);
-                    break;
-
-                case ScrollVisualisationMethod.Constant:
-                    scrollingInfo.Algorithm = new ConstantScrollAlgorithm();
-                    break;
-            }
+            updateScrollAlgorithm();
 
             double lastObjectTime = Beatmap.HitObjects.Any() ? Beatmap.GetLastObjectTime() : double.MaxValue;
             double baseBeatLength = TimingControlPoint.DEFAULT_BEAT_LENGTH;
@@ -178,6 +163,36 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 throw new ArgumentException($"{nameof(Playfield)} must be a {nameof(ScrollingPlayfield)} when using {nameof(DrawableScrollingRuleset<TObject>)}.");
         }
 
+        private ScrollVisualisationMethod visualisationMethod = ScrollVisualisationMethod.Sequential;
+
+        protected ScrollVisualisationMethod VisualisationMethod
+        {
+            get => visualisationMethod;
+            set
+            {
+                visualisationMethod = value;
+                updateScrollAlgorithm();
+            }
+        }
+
+        private void updateScrollAlgorithm()
+        {
+            switch (VisualisationMethod)
+            {
+                case ScrollVisualisationMethod.Sequential:
+                    scrollingInfo.Algorithm.Value = new SequentialScrollAlgorithm(ControlPoints);
+                    break;
+
+                case ScrollVisualisationMethod.Overlapping:
+                    scrollingInfo.Algorithm.Value = new OverlappingScrollAlgorithm(ControlPoints);
+                    break;
+
+                case ScrollVisualisationMethod.Constant:
+                    scrollingInfo.Algorithm.Value = new ConstantScrollAlgorithm();
+                    break;
+            }
+        }
+
         /// <summary>
         /// Adjusts the scroll speed of <see cref="HitObject"/>s.
         /// </summary>
@@ -217,7 +232,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             public IBindable<double> TimeRange { get; } = new BindableDouble();
 
-            public IScrollAlgorithm Algorithm { get; set; }
+            public readonly Bindable<IScrollAlgorithm> Algorithm = new Bindable<IScrollAlgorithm>(new ConstantScrollAlgorithm());
+
+            IBindable<IScrollAlgorithm> IScrollingInfo.Algorithm => Algorithm;
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs b/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs
index cd85932599..4a79c1a447 100644
--- a/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs
@@ -15,13 +15,13 @@ namespace osu.Game.Rulesets.UI.Scrolling
         IBindable<ScrollingDirection> Direction { get; }
 
         /// <summary>
-        ///
+        /// The span of time that is visible by the length of the scrolling axes.
         /// </summary>
         IBindable<double> TimeRange { get; }
 
         /// <summary>
         /// The algorithm which controls <see cref="HitObject"/> positions and sizes.
         /// </summary>
-        IScrollAlgorithm Algorithm { get; }
+        IBindable<IScrollAlgorithm> Algorithm { get; }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index b93a427196..129918da14 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -13,6 +13,7 @@ using osu.Framework.Layout;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI.Scrolling
@@ -21,6 +22,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
     {
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        private readonly IBindable<IScrollAlgorithm> algorithm = new Bindable<IScrollAlgorithm>();
 
         /// <summary>
         /// Whether the scrolling direction is horizontal or vertical.
@@ -59,9 +61,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             direction.BindTo(scrollingInfo.Direction);
             timeRange.BindTo(scrollingInfo.TimeRange);
+            algorithm.BindTo(scrollingInfo.Algorithm);
 
             direction.ValueChanged += _ => layoutCache.Invalidate();
             timeRange.ValueChanged += _ => layoutCache.Invalidate();
+            algorithm.ValueChanged += _ => layoutCache.Invalidate();
         }
 
         /// <summary>
@@ -73,7 +77,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         public double TimeAtPosition(float localPosition, double currentTime)
         {
             float scrollPosition = axisInverted ? -localPosition : localPosition;
-            return scrollingInfo.Algorithm.TimeAt(scrollPosition, currentTime, timeRange.Value, scrollLength);
+            return algorithm.Value.TimeAt(scrollPosition, currentTime, timeRange.Value, scrollLength);
         }
 
         /// <summary>
@@ -95,7 +99,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// </summary>
         public float PositionAtTime(double time, double currentTime, double? originTime = null)
         {
-            float scrollPosition = scrollingInfo.Algorithm.PositionAt(time, currentTime, timeRange.Value, scrollLength, originTime);
+            float scrollPosition = algorithm.Value.PositionAt(time, currentTime, timeRange.Value, scrollLength, originTime);
             return axisInverted ? -scrollPosition : scrollPosition;
         }
 
@@ -122,7 +126,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// </summary>
         public float LengthAtTime(double startTime, double endTime)
         {
-            return scrollingInfo.Algorithm.GetLength(startTime, endTime, timeRange.Value, scrollLength);
+            return algorithm.Value.GetLength(startTime, endTime, timeRange.Value, scrollLength);
         }
 
         private float scrollLength => scrollingAxis == Direction.Horizontal ? DrawWidth : DrawHeight;
@@ -169,7 +173,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             foreach (var entry in Entries)
                 setComputedLifetimeStart(entry);
 
-            scrollingInfo.Algorithm.Reset();
+            algorithm.Value.Reset();
 
             layoutCache.Validate();
         }
@@ -224,7 +228,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
 
-            return scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
+            return algorithm.Value.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
         }
 
         private void setComputedLifetimeStart(HitObjectLifetimeEntry entry)
diff --git a/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs b/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
index 873551db77..95d5dd36d8 100644
--- a/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
+++ b/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
@@ -14,7 +14,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.TernaryButtons
 {
-    internal partial class DrawableTernaryButton : OsuButton
+    public partial class DrawableTernaryButton : OsuButton
     {
         private Color4 defaultBackgroundColour;
         private Color4 defaultIconColour;
diff --git a/osu.Game/Tests/Visual/ScrollingTestContainer.cs b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
index b8b39e16b5..bce4299688 100644
--- a/osu.Game/Tests/Visual/ScrollingTestContainer.cs
+++ b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual
             IBindable<double> IScrollingInfo.TimeRange => TimeRange;
 
             public readonly TestScrollAlgorithm Algorithm = new TestScrollAlgorithm();
-            IScrollAlgorithm IScrollingInfo.Algorithm => Algorithm;
+            IBindable<IScrollAlgorithm> IScrollingInfo.Algorithm => new Bindable<IScrollAlgorithm>(Algorithm);
         }
 
         public class TestScrollAlgorithm : IScrollAlgorithm

From ff07fbae150998b2da9fb64c07e374ce2036c48d Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 18 Aug 2023 12:20:40 +0200
Subject: [PATCH 1110/2100] fix GetSegmentEnds

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 028f8b6839..e6d5949d7c 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -40,11 +40,13 @@ namespace osu.Game.Rulesets.Objects
 
         private readonly List<Vector2> calculatedPath = new List<Vector2>();
         private readonly List<double> cumulativeLength = new List<double>();
-        private readonly List<int> segmentEnds = new List<int>();
         private readonly Cached pathCache = new Cached();
 
         private double calculatedLength;
 
+        private readonly List<int> segmentEnds = new List<int>();
+        private double[] segmentEndDistances = Array.Empty<double>();
+
         /// <summary>
         /// Creates a new <see cref="SliderPath"/>.
         /// </summary>
@@ -202,7 +204,7 @@ namespace osu.Game.Rulesets.Objects
         {
             ensureValid();
 
-            return segmentEnds.Select(i => cumulativeLength[i] / calculatedLength);
+            return segmentEndDistances.Select(d => d / Distance);
         }
 
         private void invalidate()
@@ -251,8 +253,9 @@ namespace osu.Game.Rulesets.Objects
                         calculatedPath.Add(t);
                 }
 
-                // Remember the index of the segment end
-                segmentEnds.Add(calculatedPath.Count - 1);
+                if (i > 0)
+                    // Remember the index of the segment end
+                    segmentEnds.Add(calculatedPath.Count - 1);
 
                 // Start the new segment at the current vertex
                 start = i;
@@ -298,6 +301,14 @@ namespace osu.Game.Rulesets.Objects
                 cumulativeLength.Add(calculatedLength);
             }
 
+            // Store the distances of the segment ends now, because after shortening the indices may be out of range
+            segmentEndDistances = new double[segmentEnds.Count];
+
+            for (int i = 0; i < segmentEnds.Count; i++)
+            {
+                segmentEndDistances[i] = cumulativeLength[segmentEnds[i]];
+            }
+
             if (ExpectedDistance.Value is double expectedDistance && calculatedLength != expectedDistance)
             {
                 // In osu-stable, if the last two control points of a slider are equal, extension is not performed.
@@ -319,10 +330,6 @@ namespace osu.Game.Rulesets.Objects
                     {
                         cumulativeLength.RemoveAt(cumulativeLength.Count - 1);
                         calculatedPath.RemoveAt(pathEndIndex--);
-
-                        // Shorten the last segment to the expected distance
-                        if (segmentEnds.Count > 0)
-                            segmentEnds[^1]--;
                     }
                 }
 

From fbf4d3ac81c5d377670c45beb815306281cf660d Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 18 Aug 2023 12:36:34 +0200
Subject: [PATCH 1111/2100] Add test

---
 .../Visual/Gameplay/TestSceneSliderPath.cs    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
index dfa9fdf03b..4a2794c14f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
@@ -185,6 +185,34 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("shorten to -10 length", () => path.ExpectedDistance.Value = -10);
         }
 
+        [Test]
+        public void TestGetSegmentEnds()
+        {
+            var positions = new[]
+            {
+                Vector2.Zero,
+                new Vector2(100, 0),
+                new Vector2(100),
+                new Vector2(200, 100),
+            };
+            double[] distances = { 100d, 200d, 300d };
+
+            AddStep("create path", () => path.ControlPoints.AddRange(positions.Select(p => new PathControlPoint(p, PathType.Linear))));
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 300)));
+            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(positions.Skip(1)));
+            AddStep("lengthen last segment", () => path.ExpectedDistance.Value = 400);
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 400)));
+            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(positions.Skip(1)));
+            AddStep("shorten last segment", () => path.ExpectedDistance.Value = 150);
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 150)));
+            AddAssert("segment end positions not recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(new[]
+            {
+                positions[1],
+                new Vector2(100, 50),
+                new Vector2(100, 50),
+            }));
+        }
+
         private List<PathControlPoint> createSegment(PathType type, params Vector2[] controlPoints)
         {
             var points = controlPoints.Select(p => new PathControlPoint { Position = p }).ToList();

From 8d84ea3712cc6e38fdc80a24a5c4a53e078518fb Mon Sep 17 00:00:00 2001
From: FreezyLemon <contact@freezylemon.com>
Date: Fri, 18 Aug 2023 21:05:12 +0200
Subject: [PATCH 1112/2100] Allow "none" value in LastYearPlacing

This "none" value (zero) will be the default value for
any new team and will display as "N/A" in the SeedingScreen.
---
 osu.Game.Tournament/Models/TournamentTeam.cs           | 2 +-
 osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 5df8c2a620..ae0ac77936 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tournament.Models
 
         public Bindable<int> LastYearPlacing = new BindableInt
         {
-            MinValue = 1,
+            MinValue = 0,
             MaxValue = 256
         };
 
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index 120a76c127..899d462e4e 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -274,7 +274,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                             new TeamDisplay(team) { Margin = new MarginPadding { Bottom = 30 } },
                             new RowDisplay("Average Rank:", $"#{team.AverageRank:#,0}"),
                             new RowDisplay("Seed:", team.Seed.Value),
-                            new RowDisplay("Last year's placing:", team.LastYearPlacing.Value > 0 ? $"#{team.LastYearPlacing:#,0}" : "0"),
+                            new RowDisplay("Last year's placing:", team.LastYearPlacing.Value > 0 ? $"#{team.LastYearPlacing:#,0}" : "N/A"),
                             new Container { Margin = new MarginPadding { Bottom = 30 } },
                         }
                     },

From 0e691d5935255c58ac04ea35de99e3ebe6096f76 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sat, 19 Aug 2023 00:16:05 +0200
Subject: [PATCH 1113/2100] Revert changes in `SliderPath`

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 171298e6c0..028f8b6839 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Objects
         {
             ensureValid();
 
-            return segmentEnds.Select(i => cumulativeLength[i] / Distance);
+            return segmentEnds.Select(i => cumulativeLength[i] / calculatedLength);
         }
 
         private void invalidate()
@@ -251,9 +251,8 @@ namespace osu.Game.Rulesets.Objects
                         calculatedPath.Add(t);
                 }
 
-                if (i > 0)
-                    // Remember the index of the segment end
-                    segmentEnds.Add(calculatedPath.Count - 1);
+                // Remember the index of the segment end
+                segmentEnds.Add(calculatedPath.Count - 1);
 
                 // Start the new segment at the current vertex
                 start = i;
@@ -315,11 +314,15 @@ namespace osu.Game.Rulesets.Objects
 
                 if (calculatedLength > expectedDistance)
                 {
-                    // The path will be shortened further, in which case we should trim any more unnecessary lengths
+                    // The path will be shortened further, in which case we should trim any more unnecessary lengths and their associated path segments
                     while (cumulativeLength.Count > 0 && cumulativeLength[^1] >= expectedDistance)
                     {
                         cumulativeLength.RemoveAt(cumulativeLength.Count - 1);
                         calculatedPath.RemoveAt(pathEndIndex--);
+
+                        // Shorten the last segment to the expected distance
+                        if (segmentEnds.Count > 0)
+                            segmentEnds[^1]--;
                     }
                 }
 
@@ -336,12 +339,6 @@ namespace osu.Game.Rulesets.Objects
 
                 calculatedPath[pathEndIndex] = calculatedPath[pathEndIndex - 1] + dir * (float)(expectedDistance - cumulativeLength[^1]);
                 cumulativeLength.Add(expectedDistance);
-
-                // Shorten the segments to the expected distance
-                for (int i = 0; i < segmentEnds.Count; i++)
-                {
-                    segmentEnds[i] = Math.Min(segmentEnds[i], cumulativeLength.Count - 1);
-                }
             }
         }
 

From 44a85139e483adc31709dd13dde0b671c65dd804 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sat, 19 Aug 2023 02:40:18 +0200
Subject: [PATCH 1114/2100] Update `Reverse()` based on the changes in #24581

---
 .../Rulesets/Objects/SliderPathExtensions.cs  | 54 ++++---------------
 1 file changed, 10 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 58ce20cd32..6c88f01249 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -32,47 +31,32 @@ namespace osu.Game.Rulesets.Objects
 
             var inheritedLinearPoints = controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.Linear && p.Type is null).ToList();
 
-            if (controlPoints[0].Type == null)
-            {
-                inheritedLinearPoints.Add(controlPoints[0]);
-            }
-
             // Inherited points after a linear point, as well as the first control point if it inherited,
             // should be treated as linear points, so their types are temporarily changed to linear.
             inheritedLinearPoints.ForEach(p => p.Type = PathType.Linear);
 
             double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
-            double[] distinctSegmentEnds = truncateEndingDuplicates(segmentEnds);
 
-            // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
-            if (segmentEnds.Length >= 2 && Precision.AlmostEquals(segmentEnds[^1], segmentEnds[^2]) && distinctSegmentEnds.Length > 0)
+            // Remove segments after the end of the slider.
+            for (int numSegmentsToRemove = segmentEnds.Count(se => se >= 1) - 1; numSegmentsToRemove > 0 && controlPoints.Count > 0;)
             {
-                int numVisibleSegments = distinctSegmentEnds.Length - 1;
-                var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();
-
-                int lastVisibleControlPointIndex = controlPoints.IndexOf(nonInheritedControlPoints[numVisibleSegments]);
-
-                // Make sure to include all inherited control points directly after the last visible non-inherited control point.
-                while (lastVisibleControlPointIndex + 1 < controlPoints.Count)
+                if (controlPoints.Last().Type is not null)
                 {
-                    lastVisibleControlPointIndex++;
-
-                    if (controlPoints[lastVisibleControlPointIndex].Type is not null)
-                        break;
+                    numSegmentsToRemove--;
+                    segmentEnds = segmentEnds[..^1];
                 }
 
-                // Remove all control points after the first invisible non-inherited control point.
-                controlPoints.RemoveRange(lastVisibleControlPointIndex + 1, controlPoints.Count - lastVisibleControlPointIndex - 1);
+                controlPoints.RemoveAt(controlPoints.Count - 1);
             }
 
             // Restore original control point types.
             inheritedLinearPoints.ForEach(p => p.Type = null);
 
-            // Recalculate perfect curve at the end of the slider path.
-            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 0)
+            // Recalculate middle perfect curve control points at the end of the slider path.
+            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && segmentEnds.Any())
             {
-                double lastSegmentStart = distinctSegmentEnds.Length > 1 ? distinctSegmentEnds[^2] : 0;
-                double lastSegmentEnd = distinctSegmentEnds[^1];
+                double lastSegmentStart = segmentEnds.Length > 1 ? segmentEnds[^2] : 0;
+                double lastSegmentEnd = segmentEnds[^1];
 
                 var circleArcPath = new List<Vector2>();
                 sliderPath.GetPathToProgress(circleArcPath, lastSegmentStart / lastSegmentEnd, 1);
@@ -83,24 +67,6 @@ namespace osu.Game.Rulesets.Objects
             sliderPath.reverseControlPoints(out positionalOffset);
         }
 
-        /// <summary>
-        /// Keeps removing the last element of the provided array until the last two elements are not equal.
-        /// </summary>
-        /// <param name="arr">The array to truncate.</param>
-        /// <returns>The truncated array.</returns>
-        private static double[] truncateEndingDuplicates(double[] arr)
-        {
-            if (arr.Length < 2)
-                return arr;
-
-            var result = arr.ToList();
-
-            while (result.Count > 1 && Precision.AlmostEquals(result[^1], result[^2]))
-                result.RemoveAt(result.Count - 1);
-
-            return result.ToArray();
-        }
-
         /// <summary>
         /// Reverses the order of the provided <see cref="SliderPath"/>'s <see cref="PathControlPoint"/>s.
         /// </summary>

From 548e6dc23b68f1941829890fc17d18be49855d94 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Sat, 19 Aug 2023 03:04:09 +0200
Subject: [PATCH 1115/2100] feat(MessageNotifier): flash window on PM or
 mention

---
 osu.Game/Online/Chat/MessageNotifier.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index 65aac723da..b91cf06847 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -127,6 +127,8 @@ namespace osu.Game.Online.Chat
             if (!notifyOnPrivateMessage.Value || channel.Type != ChannelType.PM)
                 return false;
 
+            (host as DesktopGameHost)?.FlashWindow();
+
             notifications.Post(new PrivateMessageNotification(message, channel));
             return true;
         }
@@ -135,6 +137,8 @@ namespace osu.Game.Online.Chat
         {
             if (!notifyOnUsername.Value || !CheckContainsUsername(message.Content, localUser.Value.Username)) return;
 
+            (host as DesktopGameHost)?.FlashWindow();
+
             notifications.Post(new MentionNotification(message, channel));
         }
 

From 2b0959482356e0bf5e0774c263747529b0b88f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Aug 2023 14:33:26 +0200
Subject: [PATCH 1116/2100] Use nunit constraints in test for better debug
 experience

---
 .../Visual/Gameplay/TestSceneSliderPath.cs         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
index 4a2794c14f..16e4ae13d9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
@@ -198,14 +198,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             double[] distances = { 100d, 200d, 300d };
 
             AddStep("create path", () => path.ControlPoints.AddRange(positions.Select(p => new PathControlPoint(p, PathType.Linear))));
-            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 300)));
-            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(positions.Skip(1)));
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds(), () => Is.EqualTo(distances.Select(d => d / 300)));
+            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)), () => Is.EqualTo(positions.Skip(1)));
+
             AddStep("lengthen last segment", () => path.ExpectedDistance.Value = 400);
-            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 400)));
-            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(positions.Skip(1)));
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds(), () => Is.EqualTo(distances.Select(d => d / 400)));
+            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)), () => Is.EqualTo(positions.Skip(1)));
+
             AddStep("shorten last segment", () => path.ExpectedDistance.Value = 150);
-            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 150)));
-            AddAssert("segment end positions not recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(new[]
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds(), () => Is.EqualTo(distances.Select(d => d / 150)));
+            AddAssert("segment end positions not recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)), () => Is.EqualTo(new[]
             {
                 positions[1],
                 new Vector2(100, 50),

From 0a55830c16c8adfcd29b3dd931cc806d64cd2e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Aug 2023 14:34:20 +0200
Subject: [PATCH 1117/2100] Add braces for clarification

I like no-braces for single-line ifs as much as anyone, but with inline
comments involved it gets rather dicey.
---
 osu.Game/Rulesets/Objects/SliderPath.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index e6d5949d7c..12fd45257a 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -254,8 +254,10 @@ namespace osu.Game.Rulesets.Objects
                 }
 
                 if (i > 0)
+                {
                     // Remember the index of the segment end
                     segmentEnds.Add(calculatedPath.Count - 1);
+                }
 
                 // Start the new segment at the current vertex
                 start = i;

From 3d52a1267e722596ec9438a55df9d5e49643b3e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Aug 2023 15:08:30 +0200
Subject: [PATCH 1118/2100] Fix test failures via test-local popover containers

---
 .../Editor/TestSceneOsuDistanceSnapGrid.cs                   | 5 +++--
 .../Editing/TestSceneHitObjectComposerDistanceSnapping.cs    | 3 ++-
 osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index 0c064ecfa6..9338d5453d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -9,6 +9,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
@@ -70,12 +71,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             base.Content.Children = new Drawable[]
             {
                 editorClock = new EditorClock(editorBeatmap),
-                snapProvider,
+                new PopoverContainer { Child = snapProvider },
                 Content
             };
         }
 
-        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+        protected override Container<Drawable> Content { get; } = new PopoverContainer { RelativeSizeAxes = Axes.Both };
 
         [SetUp]
         public void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 6399507aa0..e30caac95e 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.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.Cursor;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps.ControlPoints;
@@ -29,7 +30,7 @@ namespace osu.Game.Tests.Editing
         [Cached(typeof(IBeatSnapProvider))]
         private readonly EditorBeatmap editorBeatmap;
 
-        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+        protected override Container<Drawable> Content { get; } = new PopoverContainer { RelativeSizeAxes = Axes.Both };
 
         public TestSceneHitObjectComposerDistanceSnapping()
         {
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
index a38c481003..ed3bffe5c2 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -178,7 +178,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("distance spacing increased by 0.5", () => editorBeatmap.BeatmapInfo.DistanceSpacing == originalSpacing + 0.5);
         }
 
-        public partial class EditorBeatmapContainer : Container
+        public partial class EditorBeatmapContainer : PopoverContainer
         {
             private readonly IWorkingBeatmap working;
 

From 3c191ff9ea5a35f507fb85d32b44b73c37b489ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Aug 2023 15:09:59 +0200
Subject: [PATCH 1119/2100] Expand allowable rotation range to [-360, 360]

---
 osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
index 86112d9751..f09d6b78e6 100644
--- a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
+++ b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
@@ -45,8 +45,8 @@ namespace osu.Game.Rulesets.Osu.Edit
                     {
                         Current = new BindableNumber<float>
                         {
-                            MinValue = -180,
-                            MaxValue = 180,
+                            MinValue = -360,
+                            MaxValue = 360,
                             Precision = 1
                         },
                         Instantaneous = true

From 56b1062c2f441773e8097403491b3f9601178543 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sat, 19 Aug 2023 19:39:29 +0200
Subject: [PATCH 1120/2100] expand xmldoc

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 12fd45257a..1c02b18a0f 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -198,8 +198,16 @@ namespace osu.Game.Rulesets.Objects
         }
 
         /// <summary>
-        /// Returns the progress values at which segments of the path end.
+        /// Returns the progress values at which (control point) segments of the path end.
+        /// Ranges from 0 (beginning of the path) to 1 (end of the path) to infinity (beyond the end of the path).
         /// </summary>
+        /// <example>In case <see cref="Distance"/> is less than <see cref="CalculatedDistance"/>,
+        /// the last segment ends after the end of the path, hence it returns a value greater than 1.
+        /// <para/>
+        /// In case <see cref="Distance"/> is greater than <see cref="CalculatedDistance"/>,
+        /// the last segment ends before the end of the path, hence it returns a value less than 1.</example>
+        /// <remarks><see cref="PositionAt"/> truncates the progression values to [0,1],
+        /// so you can't use this method to retrieve the positions of segment ends beyond the end of the path.</remarks>
         public IEnumerable<double> GetSegmentEnds()
         {
             ensureValid();

From d2798c7a1ca1d9c79438fd8319662b5aba098c4e Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Sun, 20 Aug 2023 17:55:19 +0200
Subject: [PATCH 1121/2100] don't allow negative scaling

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 72216f040e..a952cf3035 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -71,6 +71,9 @@ namespace osu.Game.Overlays.SkinEditor
                     scale.Y = scale.X / selectionRect.Width * selectionRect.Height;
             }
 
+            // If scaling reverses the selection, don't scale.
+            if (adjustedRect.Width + scale.X < 0 || adjustedRect.Height + scale.Y < 0) return true;
+
             if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
             if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
 
@@ -79,8 +82,8 @@ namespace osu.Game.Overlays.SkinEditor
 
             // scale adjust applied to each individual item should match that of the quad itself.
             var scaledDelta = new Vector2(
-                MathF.Max(adjustedRect.Width / selectionRect.Width, 0),
-                MathF.Max(adjustedRect.Height / selectionRect.Height, 0)
+                adjustedRect.Width / selectionRect.Width,
+                adjustedRect.Height / selectionRect.Height
             );
 
             foreach (var b in SelectedBlueprints)

From 249dcc2ced2e14eca2938fbd48362518edefd691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Aug 2023 23:36:07 +0200
Subject: [PATCH 1122/2100] Bump Android target SDK version to 33

---
 osu.Android/AndroidManifest.xml                           | 2 +-
 osu.Game.Rulesets.Catch.Tests.Android/AndroidManifest.xml | 2 +-
 osu.Game.Rulesets.Mania.Tests.Android/AndroidManifest.xml | 2 +-
 osu.Game.Rulesets.Osu.Tests.Android/AndroidManifest.xml   | 2 +-
 osu.Game.Rulesets.Taiko.Tests.Android/AndroidManifest.xml | 2 +-
 osu.Game.Tests.Android/AndroidManifest.xml                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Android/AndroidManifest.xml b/osu.Android/AndroidManifest.xml
index bc2f49b1a9..fb54c8e151 100644
--- a/osu.Android/AndroidManifest.xml
+++ b/osu.Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="sh.ppy.osulazer" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!" android:icon="@drawable/lazer" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests.Android/AndroidManifest.xml b/osu.Game.Rulesets.Catch.Tests.Android/AndroidManifest.xml
index bf7c0bfeca..52b34959b9 100644
--- a/osu.Game.Rulesets.Catch.Tests.Android/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Catch.Tests.Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- using a different name because package name cannot contain 'catch' -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Catch_Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!catch Test" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests.Android/AndroidManifest.xml b/osu.Game.Rulesets.Mania.Tests.Android/AndroidManifest.xml
index 4a1545a423..f5a49210ea 100644
--- a/osu.Game.Rulesets.Mania.Tests.Android/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Mania.Tests.Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Mania.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!mania Test" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests.Android/AndroidManifest.xml b/osu.Game.Rulesets.Osu.Tests.Android/AndroidManifest.xml
index 45d27dda70..ed4725dd94 100644
--- a/osu.Game.Rulesets.Osu.Tests.Android/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Osu.Tests.Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Osu.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!standard Test" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/AndroidManifest.xml b/osu.Game.Rulesets.Taiko.Tests.Android/AndroidManifest.xml
index 452b9683ec..cc88d3080a 100644
--- a/osu.Game.Rulesets.Taiko.Tests.Android/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Taiko.Tests.Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Taiko.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!taiko Test" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Tests.Android/AndroidManifest.xml b/osu.Game.Tests.Android/AndroidManifest.xml
index f25b2e5328..6f91fb928c 100644
--- a/osu.Game.Tests.Android/AndroidManifest.xml
+++ b/osu.Game.Tests.Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!visual Test" />
 </manifest>
\ No newline at end of file

From 912f31dabc7160fbd32ccb0a47fd733e427274e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Aug 2023 23:37:11 +0200
Subject: [PATCH 1123/2100] Declare media permissions in game project for
 editor usage

---
 osu.Android/AndroidManifest.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Android/AndroidManifest.xml b/osu.Android/AndroidManifest.xml
index fb54c8e151..af102a1e4e 100644
--- a/osu.Android/AndroidManifest.xml
+++ b/osu.Android/AndroidManifest.xml
@@ -2,4 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="sh.ppy.osulazer" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!" android:icon="@drawable/lazer" />
+	<!-- for editor usage -->
+	<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+	<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
 </manifest>
\ No newline at end of file

From a942b6ff745193ff9b3b0f8c624d5905a4495225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 07:27:02 +0200
Subject: [PATCH 1124/2100] Replace inline comment with actual explanation of
 what's happening

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

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index c00977d072..ece705f685 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -72,7 +72,16 @@ namespace osu.Game.Database
 
                 if (hitObject is not IHasPath hasPath) continue;
 
-                // Make sure the last control point is inherit type
+                // stable's hit object parsing expects the entire slider to use only one type of curve,
+                // and happens to use the last non-empty curve type read for the entire slider.
+                // this clear of the last control point type handles an edge case
+                // wherein the last control point of an otherwise-single-segment slider path has a different type than previous,
+                // which would lead to sliders being mangled when exported back to stable.
+                // normally, that would be handled by the `BezierConverter.ConvertToModernBezier()` call below,
+                // which outputs a slider path containing only Bezier control points,
+                // but a non-inherited last control point is (rightly) not considered to be starting a new segment,
+                // therefore it would fail to clear the `CountSegments() <= 1` check.
+                // by clearing explicitly we both fix the issue and avoid unnecessary conversions to Bezier.
                 if (hasPath.Path.ControlPoints.Count > 1)
                     hasPath.Path.ControlPoints[^1].Type = null;
 

From dd1ac461db2c779c5f9a24bfedbdb3437f503c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 08:23:58 +0200
Subject: [PATCH 1125/2100] Reformat xmldoc

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 1c02b18a0f..34113285a4 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -201,13 +201,20 @@ namespace osu.Game.Rulesets.Objects
         /// Returns the progress values at which (control point) segments of the path end.
         /// Ranges from 0 (beginning of the path) to 1 (end of the path) to infinity (beyond the end of the path).
         /// </summary>
-        /// <example>In case <see cref="Distance"/> is less than <see cref="CalculatedDistance"/>,
+        /// <remarks>
+        /// <see cref="PositionAt"/> truncates the progression values to [0,1],
+        /// so you can't use this method in conjunction with that one to retrieve the positions of segment ends beyond the end of the path.
+        /// </remarks>
+        /// <example>
+        /// <para>
+        /// In case <see cref="Distance"/> is less than <see cref="CalculatedDistance"/>,
         /// the last segment ends after the end of the path, hence it returns a value greater than 1.
-        /// <para/>
+        /// </para>
+        /// <para>
         /// In case <see cref="Distance"/> is greater than <see cref="CalculatedDistance"/>,
-        /// the last segment ends before the end of the path, hence it returns a value less than 1.</example>
-        /// <remarks><see cref="PositionAt"/> truncates the progression values to [0,1],
-        /// so you can't use this method to retrieve the positions of segment ends beyond the end of the path.</remarks>
+        /// the last segment ends before the end of the path, hence it returns a value less than 1.
+        /// </para>
+        /// </example>
         public IEnumerable<double> GetSegmentEnds()
         {
             ensureValid();

From 479c463751e0159049bb63fe27937072a9b836c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 08:27:08 +0200
Subject: [PATCH 1126/2100] Explain why segment end positions are not recovered
 in test

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
index 16e4ae13d9..635d9f9604 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
@@ -207,6 +207,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("shorten last segment", () => path.ExpectedDistance.Value = 150);
             AddAssert("segment ends are correct", () => path.GetSegmentEnds(), () => Is.EqualTo(distances.Select(d => d / 150)));
+            // see remarks in `GetSegmentEnds()` xmldoc (`SliderPath.PositionAt()` clamps progress to [0,1]).
             AddAssert("segment end positions not recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)), () => Is.EqualTo(new[]
             {
                 positions[1],

From 5009fd379421f928bca35028b00e6b88374bdb5e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 20 Aug 2023 17:57:45 +0900
Subject: [PATCH 1127/2100] Add test coverage of song bar crash

---
 .../Components/TestSceneSongBar.cs            | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
index 0f31192a9c..d52b453185 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
@@ -2,27 +2,34 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.Legacy;
-using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Tests.Components
 {
     [TestFixture]
-    public partial class TestSceneSongBar : OsuTestScene
+    public partial class TestSceneSongBar : TournamentTestScene
     {
-        [Cached]
-        private readonly LadderInfo ladder = new LadderInfo();
-
         private SongBar songBar = null!;
 
         [SetUpSteps]
-        public void SetUpSteps()
+        public override void SetUpSteps()
         {
+            base.SetUpSteps();
+
+            AddStep("setup picks bans", () =>
+            {
+                Ladder.CurrentMatch.Value!.PicksBans.Add(new BeatmapChoice
+                {
+                    BeatmapID = CreateSampleBeatmap().OnlineID,
+                    Team = TeamColour.Red,
+                    Type = ChoiceType.Pick,
+                });
+            });
+
             AddStep("create bar", () => Child = songBar = new SongBar
             {
                 RelativeSizeAxes = Axes.X,
@@ -38,12 +45,14 @@ namespace osu.Game.Tournament.Tests.Components
             AddStep("set beatmap", () =>
             {
                 var beatmap = CreateAPIBeatmap(Ruleset.Value);
+
                 beatmap.CircleSize = 3.4f;
                 beatmap.ApproachRate = 6.8f;
                 beatmap.OverallDifficulty = 5.5f;
                 beatmap.StarRating = 4.56f;
                 beatmap.Length = 123456;
                 beatmap.BPM = 133;
+                beatmap.OnlineID = CreateSampleBeatmap().OnlineID;
 
                 songBar.Beatmap = new TournamentBeatmap(beatmap);
             });

From 1067769b24e924bb34d4cc8975e94e162c7198c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 15:33:58 +0900
Subject: [PATCH 1128/2100] Remove masking on song bar

Turns out this breaks when a border style is applied for picks/bans, and it wasn't doing much for visuals anyway.
---
 osu.Game.Tournament/Components/SongBar.cs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 3d060600f7..cde826628e 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -234,7 +234,7 @@ namespace osu.Game.Tournament.Components
                         }
                     }
                 },
-                new UnmaskedTournamentBeatmapPanel(beatmap)
+                new TournamentBeatmapPanel(beatmap)
                 {
                     RelativeSizeAxes = Axes.X,
                     Width = 0.5f,
@@ -277,18 +277,4 @@ namespace osu.Game.Tournament.Components
             }
         }
     }
-
-    internal partial class UnmaskedTournamentBeatmapPanel : TournamentBeatmapPanel
-    {
-        public UnmaskedTournamentBeatmapPanel(IBeatmapInfo? beatmap, string mod = "")
-            : base(beatmap, mod)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Masking = false;
-        }
-    }
 }

From f03c64462e5bd6a21626e7030cfaaf13a50c2e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 08:58:49 +0200
Subject: [PATCH 1129/2100] Better convey meaning of zero last year placement
 via tooltip

---
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 241692d515..250d5acaae 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -10,7 +10,9 @@ using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Models;
@@ -128,7 +130,7 @@ namespace osu.Game.Tournament.Screens.Editors
                                 Width = 0.2f,
                                 Current = Model.Seed
                             },
-                            new SettingsSlider<int>
+                            new SettingsSlider<int, LastYearPlacementSlider>
                             {
                                 LabelText = "Last Year Placement",
                                 Width = 0.33f,
@@ -175,6 +177,11 @@ namespace osu.Game.Tournament.Screens.Editors
                 };
             }
 
+            private partial class LastYearPlacementSlider : RoundedSliderBar<int>
+            {
+                public override LocalisableString TooltipText => Current.Value == 0 ? "N/A" : base.TooltipText;
+            }
+
             public partial class PlayerEditor : CompositeDrawable
             {
                 private readonly TournamentTeam team;

From 827d48adcc5fb3d334c5175879898b604871b4d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 16:10:48 +0900
Subject: [PATCH 1130/2100] Fix test coverage not actually covering crash

---
 osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
index d52b453185..e0444b6126 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Tournament.Tests.Components
     public partial class TestSceneSongBar : TournamentTestScene
     {
         private SongBar songBar = null!;
+        private TournamentBeatmap ladderBeatmap = null!;
 
         [SetUpSteps]
         public override void SetUpSteps()
@@ -22,9 +23,10 @@ namespace osu.Game.Tournament.Tests.Components
 
             AddStep("setup picks bans", () =>
             {
+                ladderBeatmap = CreateSampleBeatmap();
                 Ladder.CurrentMatch.Value!.PicksBans.Add(new BeatmapChoice
                 {
-                    BeatmapID = CreateSampleBeatmap().OnlineID,
+                    BeatmapID = ladderBeatmap.OnlineID,
                     Team = TeamColour.Red,
                     Type = ChoiceType.Pick,
                 });
@@ -52,7 +54,7 @@ namespace osu.Game.Tournament.Tests.Components
                 beatmap.StarRating = 4.56f;
                 beatmap.Length = 123456;
                 beatmap.BPM = 133;
-                beatmap.OnlineID = CreateSampleBeatmap().OnlineID;
+                beatmap.OnlineID = ladderBeatmap.OnlineID;
 
                 songBar.Beatmap = new TournamentBeatmap(beatmap);
             });

From e7d61e00022a4a09e8164eb809e2a1dc6b34dfa6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 17:59:24 +0900
Subject: [PATCH 1131/2100] Fix star fountain directions not matching stable

---
 .../Visual/Menus/TestSceneStarFountain.cs     |  2 +-
 osu.Game/Screens/Menu/KiaiMenuFountains.cs    | 30 +++++++++++++++----
 osu.Game/Screens/Menu/StarFountain.cs         |  6 ++--
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs b/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs
index b12f3e7946..bb327e5962 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Menus
                 foreach (var fountain in Children.OfType<StarFountain>())
                 {
                     if (RNG.NextSingle() > 0.8f)
-                        fountain.Shoot();
+                        fountain.Shoot(RNG.Next(-1, 2));
                 }
             }, 150);
         }
diff --git a/osu.Game/Screens/Menu/KiaiMenuFountains.cs b/osu.Game/Screens/Menu/KiaiMenuFountains.cs
index a4d58e398a..07c06dcdb9 100644
--- a/osu.Game/Screens/Menu/KiaiMenuFountains.cs
+++ b/osu.Game/Screens/Menu/KiaiMenuFountains.cs
@@ -2,10 +2,10 @@
 // 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.Framework.Utils;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 
@@ -13,6 +13,9 @@ namespace osu.Game.Screens.Menu
 {
     public partial class KiaiMenuFountains : BeatSyncedContainer
     {
+        private StarFountain leftFountain = null!;
+        private StarFountain rightFountain = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -20,13 +23,13 @@ namespace osu.Game.Screens.Menu
 
             Children = new[]
             {
-                new StarFountain
+                leftFountain = new StarFountain
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     X = 250,
                 },
-                new StarFountain
+                rightFountain = new StarFountain
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -58,8 +61,25 @@ namespace osu.Game.Screens.Menu
             if (lastTrigger != null && Clock.CurrentTime - lastTrigger < 500)
                 return;
 
-            foreach (var fountain in Children.OfType<StarFountain>())
-                fountain.Shoot();
+            int direction = RNG.Next(-1, 2);
+
+            switch (direction)
+            {
+                case -1:
+                    leftFountain.Shoot(1);
+                    rightFountain.Shoot(-1);
+                    break;
+
+                case 0:
+                    leftFountain.Shoot(0);
+                    rightFountain.Shoot(0);
+                    break;
+
+                case 1:
+                    leftFountain.Shoot(-1);
+                    rightFountain.Shoot(1);
+                    break;
+            }
 
             lastTrigger = Clock.CurrentTime;
         }
diff --git a/osu.Game/Screens/Menu/StarFountain.cs b/osu.Game/Screens/Menu/StarFountain.cs
index 0d35f6e0e0..fd59ec3573 100644
--- a/osu.Game/Screens/Menu/StarFountain.cs
+++ b/osu.Game/Screens/Menu/StarFountain.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Menu
             InternalChild = spewer = new StarFountainSpewer();
         }
 
-        public void Shoot() => spewer.Shoot();
+        public void Shoot(int direction) => spewer.Shoot(direction);
 
         protected override void SkinChanged(ISkinSource skin)
         {
@@ -81,10 +81,10 @@ namespace osu.Game.Screens.Menu
                 return lastShootDirection * x_velocity_from_direction * (float)(1 - 2 * (Clock.CurrentTime - lastShootTime!.Value) / shoot_duration) + getRandomVariance(x_velocity_random_variance);
             }
 
-            public void Shoot()
+            public void Shoot(int direction)
             {
                 lastShootTime = Clock.CurrentTime;
-                lastShootDirection = RNG.Next(-1, 2);
+                lastShootDirection = direction;
             }
 
             private static float getRandomVariance(float variance) => RNG.NextSingle(-variance, variance);

From 5f040a991b3f1492c97d247799a3245b2b825ee1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 19:05:20 +0900
Subject: [PATCH 1132/2100] Fix potential crash when loading menu items due to
 cross-thread ops

---
 osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index eb046932e6..2f2cb7e5f8 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -40,8 +40,14 @@ namespace osu.Game.Graphics.UserInterface
             AddInternal(hoverClickSounds = new HoverClickSounds());
 
             updateTextColour();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             Item.Action.BindDisabledChanged(_ => updateState(), true);
+            FinishTransforms();
         }
 
         private void updateTextColour()

From 662073c47220d513ed3ef510d70ab0ccb850e334 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 19:35:04 +0900
Subject: [PATCH 1133/2100] Fix some incorrect comments / test step
 descriptions
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.Tests/Database/BackgroundDataStoreProcessorTests.cs | 2 +-
 osu.Game/Scoring/ScoreInfo.cs                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index 23b88b7395..f766faec9a 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Database
         {
             ScoreInfo scoreInfo = null!;
 
-            AddStep("Add score which requires upgrade (but has no beatmap)", () =>
+            AddStep("Add score which requires upgrade (and has beatmap)", () =>
             {
                 Realm.Write(r =>
                 {
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index c3a45332e4..526c4217ef 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Scoring
         /// Should be used to ensure we don't repeatedly attempt to update the same scores each startup even though we already know they will fail.
         /// </summary>
         /// <remarks>
-        /// See https://github.com/ppy/osu/issues/24301 for one example of how this can occur(missing beatmap file on disk).
+        /// See https://github.com/ppy/osu/issues/24301 for one example of how this can occur (missing beatmap file on disk).
         /// </remarks>
         public bool TotalScoreUpgradeFailed { get; set; }
 

From b3e7416972f097242bf8c9fe407dec3567d489d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 19:36:22 +0900
Subject: [PATCH 1134/2100] Rename new flag and update xmldoc to match

---
 .../Database/BackgroundDataStoreProcessorTests.cs         | 4 ++--
 osu.Game/BackgroundDataStoreProcessor.cs                  | 8 ++++----
 osu.Game/Scoring/ScoreInfo.cs                             | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index f766faec9a..da46392e4b 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Tests.Database
             AddStep("Run background processor", () => Add(new TestBackgroundDataStoreProcessor()));
 
             AddUntilStep("Score version upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(LegacyScoreEncoder.LATEST_VERSION));
-            AddAssert("Score not marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed), () => Is.False);
+            AddAssert("Score not marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.BackgroundReprocessingFailed), () => Is.False);
         }
 
         [Test]
@@ -174,7 +174,7 @@ namespace osu.Game.Tests.Database
 
             AddStep("Run background processor", () => Add(new TestBackgroundDataStoreProcessor()));
 
-            AddUntilStep("Score marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed), () => Is.True);
+            AddUntilStep("Score marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.BackgroundReprocessingFailed), () => Is.True);
             AddAssert("Score version not upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(30000002));
         }
 
diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index ae9e9527de..f29b100ee8 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -186,7 +186,7 @@ namespace osu.Game
 
             realmAccess.Run(r =>
             {
-                foreach (var score in r.All<ScoreInfo>().Where(s => !s.TotalScoreUpgradeFailed))
+                foreach (var score in r.All<ScoreInfo>().Where(s => !s.BackgroundReprocessingFailed))
                 {
                     if (score.BeatmapInfo != null
                         && score.Statistics.Sum(kvp => kvp.Value) > 0
@@ -225,7 +225,7 @@ namespace osu.Game
                 catch (Exception e)
                 {
                     Logger.Log(@$"Failed to populate maximum statistics for {id}: {e}");
-                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.TotalScoreUpgradeFailed = true);
+                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.BackgroundReprocessingFailed = true);
                 }
             }
         }
@@ -235,7 +235,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.TotalScoreUpgradeFailed && s.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
+                                                                             .Where(s => !s.BackgroundReprocessingFailed && s.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
                                                                              .AsEnumerable().Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
@@ -284,7 +284,7 @@ namespace osu.Game
                 catch (Exception e)
                 {
                     Logger.Log($"Failed to convert total score for {id}: {e}");
-                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.TotalScoreUpgradeFailed = true);
+                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.BackgroundReprocessingFailed = true);
                     ++failedCount;
                 }
             }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 526c4217ef..2efea2105c 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -82,13 +82,13 @@ namespace osu.Game.Scoring
         public long? LegacyTotalScore { get; set; }
 
         /// <summary>
-        /// If an reprocess of total score failed to update this score to the latest version, this flag will become <c>true</c>.
-        /// Should be used to ensure we don't repeatedly attempt to update the same scores each startup even though we already know they will fail.
+        /// If background processing of this beatmap failed in some way, this flag will become <c>true</c>.
+        /// Should be used to ensure we don't repeatedly attempt to reprocess the same scores each startup even though we already know they will fail.
         /// </summary>
         /// <remarks>
         /// See https://github.com/ppy/osu/issues/24301 for one example of how this can occur (missing beatmap file on disk).
         /// </remarks>
-        public bool TotalScoreUpgradeFailed { get; set; }
+        public bool BackgroundReprocessingFailed { get; set; }
 
         public int MaxCombo { get; set; }
 

From 82de7385d1c07dc0bd3e21a46ee6220e82a59244 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 21 Aug 2023 12:59:58 +0200
Subject: [PATCH 1135/2100] Revert "Fix TestSceneFruitRandomness"

This reverts commit b9d0a8a9f69fadacf1d1578fccd9101798583d47.
---
 osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index 8e7f77285c..de3d9d6530 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddSliderStep("start time", 500, 600, 0, x =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = x;
-                drawableFruit.RefreshStateTransforms();
-                drawableBanana.RefreshStateTransforms();
             });
         }
 
@@ -46,8 +44,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("Initialize start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
-                drawableFruit.RefreshStateTransforms();
-                drawableBanana.RefreshStateTransforms();
 
                 fruitRotation = drawableFruit.DisplayRotation;
                 bananaRotation = drawableBanana.DisplayRotation;
@@ -58,8 +54,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("change start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = another_start_time;
-                drawableFruit.RefreshStateTransforms();
-                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("fruit rotation is changed", () => drawableFruit.DisplayRotation != fruitRotation);
@@ -70,8 +64,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("reset start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
-                drawableFruit.RefreshStateTransforms();
-                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("rotation and size restored", () =>

From c7b1c75379983860a2dec8bd2de92d4331a0fc75 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 21 Aug 2023 13:00:01 +0200
Subject: [PATCH 1136/2100] Revert "Fix typo"

This reverts commit 90f2acaf0a9d1bfa5ac8d4cc653798604a3fdf21.
---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 76cfc049e3..e919e4d088 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.UI
 
         private void unbindUpdated(DrawableHitObject hitObject)
         {
-            hitObject.DefaultsApplied -= onDefaultsApplied;
+            hitObject.DefaultsApplied += onDefaultsApplied;
         }
 
         private void unbindAllUpdated()

From 5bc11ed35806ac8fac87c82118ff904905df3127 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 21 Aug 2023 13:02:23 +0200
Subject: [PATCH 1137/2100] Revert "Ensure invariant of monotone time"

This reverts commit 5d1ccc2601a739e2d8ed61b8d9b64a0efa580f7f.
---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 30 +------------------
 osu.Game/Rulesets/UI/Playfield.cs          | 35 ++++------------------
 2 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index e919e4d088..099be486b3 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -51,11 +51,6 @@ namespace osu.Game.Rulesets.UI
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
-        /// <summary>
-        /// Invoked when a <see cref="HitObject"/> is updated.
-        /// </summary>
-        public event Action<HitObject> HitObjectUpdated;
-
         public HitObjectContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -113,7 +108,6 @@ namespace osu.Game.Rulesets.UI
             drawable.OnNewResult += onNewResult;
 
             bindStartTime(drawable);
-            bindUpdated(drawable);
             AddInternal(drawable);
         }
 
@@ -122,7 +116,7 @@ namespace osu.Game.Rulesets.UI
             drawable.OnNewResult -= onNewResult;
 
             unbindStartTime(drawable);
-            unbindUpdated(drawable);
+
             RemoveInternal(drawable, false);
         }
 
@@ -182,27 +176,6 @@ namespace osu.Game.Rulesets.UI
             startTimeMap.Clear();
         }
 
-        private void bindUpdated(DrawableHitObject hitObject)
-        {
-            hitObject.DefaultsApplied += onDefaultsApplied;
-        }
-
-        private void unbindUpdated(DrawableHitObject hitObject)
-        {
-            hitObject.DefaultsApplied += onDefaultsApplied;
-        }
-
-        private void unbindAllUpdated()
-        {
-            foreach (var h in AliveObjects)
-                unbindUpdated(h);
-        }
-
-        private void onDefaultsApplied(DrawableHitObject obj)
-        {
-            HitObjectUpdated?.Invoke(obj.HitObject);
-        }
-
         protected override int Compare(Drawable x, Drawable y)
         {
             if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
@@ -219,7 +192,6 @@ namespace osu.Game.Rulesets.UI
         {
             base.Dispose(isDisposing);
             unbindAllStartTimes();
-            unbindAllUpdated();
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 9a4d082a06..e9c35555c8 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.UI
 
         private readonly HitObjectEntryManager entryManager = new HitObjectEntryManager();
 
-        private readonly LinkedList<HitObjectLifetimeEntry> judgedEntries;
+        private readonly Stack<HitObjectLifetimeEntry> judgedEntries;
 
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
@@ -125,13 +125,12 @@ namespace osu.Game.Rulesets.UI
                 h.NewResult += onNewResult;
                 h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
                 h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
-                h.HitObjectUpdated += onHitObjectUpdated;
             }));
 
             entryManager.OnEntryAdded += onEntryAdded;
             entryManager.OnEntryRemoved += onEntryRemoved;
 
-            judgedEntries = new LinkedList<HitObjectLifetimeEntry>();
+            judgedEntries = new Stack<HitObjectLifetimeEntry>();
         }
 
         [BackgroundDependencyLoader]
@@ -271,16 +270,15 @@ namespace osu.Game.Rulesets.UI
             }
 
             // When rewinding, revert future judgements in the reverse order.
-            while (judgedEntries.Last is not null)
+            while (judgedEntries.Count > 0)
             {
-                var result = judgedEntries.Last.Value.Result;
+                var result = judgedEntries.Peek().Result;
                 Debug.Assert(result?.RawTime != null);
 
                 if (Time.Current >= result.RawTime.Value)
                     break;
 
-                revertResult(judgedEntries.Last.Value);
-                judgedEntries.RemoveLast();
+                revertResult(judgedEntries.Pop());
             }
         }
 
@@ -473,31 +471,10 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
-        private void onHitObjectUpdated(HitObject _)
-        {
-            // The time of judged entries may have changed, so we need to re-sort the list to preserve the invariant of monotone time.
-            // Insertion sort on linked-list is O(n) for nearly-sorted lists, which is the case here.
-            var current = judgedEntries.First;
-
-            while (current?.Next is not null)
-            {
-                var next = current.Next;
-
-                if (current.Value.Result?.RawTime > next.Value.Result?.RawTime)
-                {
-                    judgedEntries.Remove(next);
-                    judgedEntries.AddBefore(current, next);
-                    current = next.Previous;
-                }
-                else
-                    current = next;
-            }
-        }
-
         private void onNewResult(DrawableHitObject drawable, JudgementResult result)
         {
             Debug.Assert(result != null && drawable.Entry?.Result == result && result.RawTime != null);
-            judgedEntries.AddLast(drawable.Entry.AsNonNull());
+            judgedEntries.Push(drawable.Entry.AsNonNull());
 
             NewResult?.Invoke(drawable, result);
         }

From c82e997644529adb475bec516ead328d260c1fda Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 21 Aug 2023 13:02:41 +0200
Subject: [PATCH 1138/2100] Revert "Revert "Fix TestSceneFruitRandomness""

This reverts commit 82de7385d1c07dc0bd3e21a46ee6220e82a59244.
---
 osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index de3d9d6530..8e7f77285c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddSliderStep("start time", 500, 600, 0, x =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = x;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
         }
 
@@ -44,6 +46,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("Initialize start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
 
                 fruitRotation = drawableFruit.DisplayRotation;
                 bananaRotation = drawableBanana.DisplayRotation;
@@ -54,6 +58,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("change start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = another_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("fruit rotation is changed", () => drawableFruit.DisplayRotation != fruitRotation);
@@ -64,6 +70,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("reset start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("rotation and size restored", () =>

From e283aa2843104bf58bf027486cee0d595c65fa3a Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 21 Aug 2023 13:09:31 +0200
Subject: [PATCH 1139/2100] Update inline comments

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index f141263e27..c442fac0b8 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -330,7 +330,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             ClearNestedHitObjects();
 
             // Changes in state trigger defaults applied trigger state updates.
-            // When a new hitobject is applied, OnApply() automatically performs a state update anyway.
+            // When a new hitobject is applied, OnApply() automatically performs a state update.
             HitObject.DefaultsApplied -= onDefaultsApplied;
 
             entry.RevertResult -= onRevertResult;
@@ -391,6 +391,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Apply(Entry);
 
             // Applied defaults indicate a change in hit object state.
+            // We need to update the judgement result time to the new end time
+            // and update state to ensure the hit object fades out at the correct time.
             if (Result is not null)
             {
                 Result.TimeOffset = 0;

From bdac05263164d51af00fa23d4fe84f1e1fcf905c Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Mon, 21 Aug 2023 15:29:41 +0200
Subject: [PATCH 1140/2100] refactor(MessageNotifier): apply changes required
 by framework

---
 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 b91cf06847..de38d3ef26 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Online.Chat
             if (!notifyOnPrivateMessage.Value || channel.Type != ChannelType.PM)
                 return false;
 
-            (host as DesktopGameHost)?.FlashWindow();
+            host.Window?.Flash();
 
             notifications.Post(new PrivateMessageNotification(message, channel));
             return true;
@@ -137,7 +137,7 @@ namespace osu.Game.Online.Chat
         {
             if (!notifyOnUsername.Value || !CheckContainsUsername(message.Content, localUser.Value.Username)) return;
 
-            (host as DesktopGameHost)?.FlashWindow();
+            host.Window?.Flash();
 
             notifications.Post(new MentionNotification(message, channel));
         }

From 8533cba0bf6a02b05b8e9bfe99aaee2822dfe5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 17:27:05 +0200
Subject: [PATCH 1141/2100] Fix mismatching schema version in comment

---
 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 36781b0454..db4f0d9864 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Database
         /// 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.
         /// 33   2023-08-16    Reset default chat toggle key binding to avoid conflict with newly added leaderboard toggle key binding.
-        /// 35   2023-08-21    Add TotalScoreUpgradeFailed flag to ScoreInfo to track upgrade failures.
+        /// 34   2023-08-21    Add TotalScoreUpgradeFailed flag to ScoreInfo to track upgrade failures.
         /// </summary>
         private const int schema_version = 34;
 

From 273dcf9150f441c475c524455b12376a96d3930f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 17:44:35 +0200
Subject: [PATCH 1142/2100] Also update the reference to added flag in schema
 change breakdown

---
 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 db4f0d9864..cd97bb6430 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Database
         /// 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.
         /// 33   2023-08-16    Reset default chat toggle key binding to avoid conflict with newly added leaderboard toggle key binding.
-        /// 34   2023-08-21    Add TotalScoreUpgradeFailed flag to ScoreInfo to track upgrade failures.
+        /// 34   2023-08-21    Add BackgroundReprocessingFailed flag to ScoreInfo to track upgrade failures.
         /// </summary>
         private const int schema_version = 34;
 

From 5454d1caa1927428fe339e3d5b47ddfe45f9dfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 6 Aug 2023 17:40:55 +0200
Subject: [PATCH 1143/2100] Remove global action container input queue
 workaround

As described in #24248, the workaround employed by
`GlobalActionContainer`, wherein it tried to handle actions with
priority before its children by being placed in front of the children
and not _actually containing_ said children, is blocking the resolution
of some rather major input handling issues that allow key releases to be
received by deparented drawables.

To resolve, migrate `GlobalActionContainer` to use `Prioritised`, which
can be done without regressing certain mouse button flows after
ppy/osu-framework#5966.
---
 .../Input/Bindings/GlobalActionContainer.cs   | 34 +++++--------------
 osu.Game/OsuGameBase.cs                       | 19 ++++++-----
 .../Visual/OsuManualInputManagerTestScene.cs  |  8 ++++-
 3 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 9a0a2d5c15..296232d9ea 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -3,33 +3,26 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
 
 namespace osu.Game.Input.Bindings
 {
-    public partial class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput
+    public partial class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput, IKeyBindingHandler<GlobalAction>
     {
-        private readonly Drawable? handler;
-
-        private InputManager? parentInputManager;
+        private readonly IKeyBindingHandler<GlobalAction>? handler;
 
         public GlobalActionContainer(OsuGameBase? game)
             : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
-            if (game is IKeyBindingHandler<GlobalAction>)
-                handler = game;
+            if (game is IKeyBindingHandler<GlobalAction> h)
+                handler = h;
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            parentInputManager = GetContainingInputManager();
-        }
+        protected override bool Prioritised => true;
 
         // IMPORTANT: Take care when changing order of the items in the enumerable.
         // It is used to decide the order of precedence, with the earlier items having higher precedence.
@@ -161,20 +154,9 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
         };
 
-        protected override IEnumerable<Drawable> KeyBindingInputQueue
-        {
-            get
-            {
-                // To ensure the global actions are handled with priority, this GlobalActionContainer is actually placed after game content.
-                // It does not contain children as expected, so we need to forward the NonPositionalInputQueue from the parent input manager to correctly
-                // allow the whole game to handle these actions.
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) => handler?.OnPressed(e) == true;
 
-                // An eventual solution to this hack is to create localised action containers for individual components like SongSelect, but this will take some rearranging.
-                var inputQueue = parentInputManager?.NonPositionalInputQueue ?? base.KeyBindingInputQueue;
-
-                return handler != null ? inputQueue.Prepend(handler) : inputQueue;
-            }
-        }
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => handler?.OnReleased(e);
     }
 
     public enum GlobalAction
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 6737caa5f9..75b46a0a4d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -392,17 +392,18 @@ namespace osu.Game
             {
                 SafeAreaOverrideEdges = SafeAreaOverrideEdges,
                 RelativeSizeAxes = Axes.Both,
-                Child = CreateScalingContainer().WithChildren(new Drawable[]
+                Child = CreateScalingContainer().WithChild(globalBindings = new GlobalActionContainer(this)
                 {
-                    (GlobalCursorDisplay = new GlobalCursorDisplay
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both
-                    }).WithChild(content = new OsuTooltipContainer(GlobalCursorDisplay.MenuCursor)
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    }),
-                    // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
-                    globalBindings = new GlobalActionContainer(this)
+                        (GlobalCursorDisplay = new GlobalCursorDisplay
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }).WithChild(content = new OsuTooltipContainer(GlobalCursorDisplay.MenuCursor)
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }),
+                    }
                 })
             });
 
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index 37260b3b13..ffe40243ab 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -57,7 +57,13 @@ namespace osu.Game.Tests.Visual
             }
 
             if (CreateNestedActionContainer)
-                mainContent.Add(new GlobalActionContainer(null));
+            {
+                var globalActionContainer = new GlobalActionContainer(null)
+                {
+                    Child = mainContent
+                };
+                mainContent = globalActionContainer;
+            }
 
             base.Content.AddRange(new Drawable[]
             {

From 9f4f81c150895ddc08bb4680bbcbd981a03f9d0d Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Mon, 21 Aug 2023 19:36:11 +0200
Subject: [PATCH 1144/2100] accumulating negative scaling

---
 .../SkinEditor/SkinSelectionHandler.cs        | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index a952cf3035..c90a1d8edf 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Overlays.SkinEditor
             UpdatePosition = updateDrawablePosition
         };
 
+        private float accumulatedNegativeScaling;
+
         public override bool HandleScale(Vector2 scale, Anchor anchor)
         {
             // convert scale to screen space
@@ -71,8 +73,25 @@ namespace osu.Game.Overlays.SkinEditor
                     scale.Y = scale.X / selectionRect.Width * selectionRect.Height;
             }
 
-            // If scaling reverses the selection, don't scale.
-            if (adjustedRect.Width + scale.X < 0 || adjustedRect.Height + scale.Y < 0) return true;
+            // If scaling reverses the selection, don't scale and accumulate the amount of scaling.
+            if (adjustedRect.Width + scale.X < 0 || adjustedRect.Height + scale.Y < 0)
+            {
+                accumulatedNegativeScaling += scale.Length; // - new Vector2(selectionRect.Width, selectionRect.Height).Length;
+
+                return true;
+            }
+
+            // Compensate for accumulated negative scaling.
+            if (Precision.AlmostBigger(accumulatedNegativeScaling, 0) && !Precision.AlmostEquals(accumulatedNegativeScaling, 0))
+            {
+                float length = scale.Length;
+                accumulatedNegativeScaling -= length;
+
+                // If the accumulated negative scaling is still positive, don't scale.
+                if (Precision.AlmostBigger(accumulatedNegativeScaling, 0)) return true;
+                scale *= Math.Abs(accumulatedNegativeScaling) / length;
+                accumulatedNegativeScaling = 0;
+            }
 
             if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
             if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
@@ -150,6 +169,12 @@ namespace osu.Game.Overlays.SkinEditor
 
         public static void ApplyClosestAnchor(Drawable drawable) => applyAnchor(drawable, getClosestAnchor(drawable));
 
+        protected override void OnOperationEnded()
+        {
+            base.OnOperationEnded();
+            accumulatedNegativeScaling = 0;
+        }
+
         protected override void OnSelectionChanged()
         {
             base.OnSelectionChanged();

From 96c58c86ea85c1e2e85cb578a730be649993351d Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Mon, 21 Aug 2023 23:36:54 +0200
Subject: [PATCH 1145/2100] refactor: make flashing available in
 `Notifications`

This will be used in `NotificationOverlay` when a `Notification` is posted.
---
 osu.Game/Online/Chat/MessageNotifier.cs         | 4 ----
 osu.Game/Overlays/NotificationOverlay.cs        | 9 +++++++++
 osu.Game/Overlays/Notifications/Notification.cs | 5 +++++
 osu.Game/Screens/Play/PlayerLoader.cs           | 2 ++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index de38d3ef26..65aac723da 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -127,8 +127,6 @@ namespace osu.Game.Online.Chat
             if (!notifyOnPrivateMessage.Value || channel.Type != ChannelType.PM)
                 return false;
 
-            host.Window?.Flash();
-
             notifications.Post(new PrivateMessageNotification(message, channel));
             return true;
         }
@@ -137,8 +135,6 @@ namespace osu.Game.Online.Chat
         {
             if (!notifyOnUsername.Value || !CheckContainsUsername(message.Content, localUser.Value.Username)) return;
 
-            host.Window?.Flash();
-
             notifications.Post(new MentionNotification(message, channel));
         }
 
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index c9d09848f8..08c567af82 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -43,6 +43,9 @@ namespace osu.Game.Overlays
         [Resolved]
         private AudioManager audio { get; set; } = null!;
 
+        [Resolved]
+        private OsuGame game { get; set; } = null!;
+
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
@@ -176,6 +179,12 @@ namespace osu.Game.Overlays
 
             playDebouncedSample(notification.PopInSampleName);
 
+            if (notification.FlashTaskbar)
+            {
+                game.Window?.Flash(notification.IsImportant);
+                notification.Closed += () => game.Window?.CancelFlash();
+            }
+
             if (State.Value == Visibility.Hidden)
             {
                 notification.IsInToastTray = true;
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 8cdc373417..53fc152c96 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -38,6 +38,11 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public virtual bool IsImportant => true;
 
+        /// <summary>
+        /// Whether this notification should trigger a taskbar flash if the window is un-focused when posted.
+        /// </summary>
+        public bool FlashTaskbar { get; init; } = true;
+
         /// <summary>
         /// Run on user activating the notification. Return true to close.
         /// </summary>
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 872425e3fd..eccfc4dc7b 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -568,6 +568,7 @@ namespace osu.Game.Screens.Play
             public MutedNotification()
             {
                 Text = NotificationsStrings.GameVolumeTooLow;
+                FlashTaskbar = false;
             }
 
             [BackgroundDependencyLoader]
@@ -623,6 +624,7 @@ namespace osu.Game.Screens.Play
             public BatteryWarningNotification()
             {
                 Text = NotificationsStrings.BatteryLow;
+                FlashTaskbar = false;
             }
 
             [BackgroundDependencyLoader]

From e321303ef665a623436a9bf0e04cf91aebd3323b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 12:32:42 +0900
Subject: [PATCH 1146/2100] Add application category type to enable game mode
 on new macOS versions

---
 osu.iOS/Info.plist | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.iOS/Info.plist b/osu.iOS/Info.plist
index 0ce1d952d0..cf51fe995b 100644
--- a/osu.iOS/Info.plist
+++ b/osu.iOS/Info.plist
@@ -34,9 +34,9 @@
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>
-	<string>We don&apos;t really use the camera.</string>
+	<string>We don't really use the camera.</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>We don&apos;t really use the microphone.</string>
+	<string>We don't really use the microphone.</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationLandscapeRight</string>
@@ -130,5 +130,7 @@
 			<string>Editor</string>
 		</dict>
 	</array>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.music-games</string>
 </dict>
 </plist>

From e8337c592a69e1905e75d459bf5ff6aad6c0d47f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 22 Aug 2023 12:50:13 +0900
Subject: [PATCH 1147/2100] Update framework and apply changes to support
 masking SSBO

---
 .../UI/Cursor/CursorTrail.cs                  | 20 ++++++++++++++-----
 .../Resources/Shaders/sh_TestVertex.vs        |  2 +-
 osu.Game/Screens/Loader.cs                    |  5 +----
 osu.Game/osu.Game.csproj                      |  2 +-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index a29faac5a0..0774d34488 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     if (time - part.Time >= 1)
                         continue;
 
-                    vertexBatch.Add(new TexturedTrailVertex
+                    vertexBatch.Add(new TexturedTrailVertex(renderer)
                     {
                         Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomLeft,
@@ -295,7 +295,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex
+                    vertexBatch.Add(new TexturedTrailVertex(renderer)
                     {
                         Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomRight,
@@ -304,7 +304,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex
+                    vertexBatch.Add(new TexturedTrailVertex(renderer)
                     {
                         Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopRight,
@@ -313,7 +313,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex
+                    vertexBatch.Add(new TexturedTrailVertex(renderer)
                     {
                         Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopLeft,
@@ -362,12 +362,22 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             [VertexMember(1, VertexAttribPointerType.Float)]
             public float Time;
 
+            [VertexMember(1, VertexAttribPointerType.Int)]
+            private readonly int maskingIndex;
+
+            public TexturedTrailVertex(IRenderer renderer)
+            {
+                this = default;
+                maskingIndex = renderer.CurrentMaskingIndex;
+            }
+
             public bool Equals(TexturedTrailVertex other)
             {
                 return Position.Equals(other.Position)
                        && TexturePosition.Equals(other.TexturePosition)
                        && Colour.Equals(other.Colour)
-                       && Time.Equals(other.Time);
+                       && Time.Equals(other.Time)
+                       && maskingIndex == other.maskingIndex;
             }
         }
     }
diff --git a/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs b/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
index 505554bb33..80ed686ba5 100644
--- a/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
+++ b/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
@@ -13,7 +13,7 @@ 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);
+	highp vec3 maskingPos = g_MaskingInfo.ToMaskingSpace * vec3(m_Position, 1.0);
 	v_MaskingPosition = maskingPos.xy / maskingPos.z;
 
 	v_Colour = m_Colour;
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index 372cfe748e..962c7d9d14 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -126,12 +126,9 @@ namespace osu.Game.Screens
             private void load(ShaderManager manager)
             {
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE));
-                loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.BLUR));
-
+                loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2_NO_MASKING, FragmentShaderDescriptor.BLUR));
                 loadTargets.Add(manager.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE));
-
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, "TriangleBorder"));
-
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_3, FragmentShaderDescriptor.TEXTURE));
             }
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7d4a721c91..08107c2fad 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.817.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.822.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" />

From f09b81841810df3e63a9bc6bfa11a369803f0d89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 13:17:12 +0900
Subject: [PATCH 1148/2100] 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 08107c2fad..4c3205178a 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.822.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.822.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From be1a712f33bfa755a049d9b2763a22f45f8a1498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 08:54:41 +0200
Subject: [PATCH 1149/2100] Make `OsuGame` dependency nullable

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

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 08c567af82..6dd344ca99 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays
         private AudioManager audio { get; set; } = null!;
 
         [Resolved]
-        private OsuGame game { get; set; } = null!;
+        private OsuGame? game { get; set; }
 
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
@@ -181,8 +181,8 @@ namespace osu.Game.Overlays
 
             if (notification.FlashTaskbar)
             {
-                game.Window?.Flash(notification.IsImportant);
-                notification.Closed += () => game.Window?.CancelFlash();
+                game?.Window?.Flash(notification.IsImportant);
+                notification.Closed += () => game?.Window?.CancelFlash();
             }
 
             if (State.Value == Visibility.Hidden)

From aa29e00578a01768d1ee7bf537e5b2a335c46b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 08:58:10 +0200
Subject: [PATCH 1150/2100] Remove `FlashTaskbar` and use `IsImportant`
 directly instead

---
 osu.Game/Overlays/NotificationOverlay.cs        | 4 ++--
 osu.Game/Overlays/Notifications/Notification.cs | 5 -----
 osu.Game/Screens/Play/PlayerLoader.cs           | 2 --
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 6dd344ca99..b93d5f1e12 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -179,9 +179,9 @@ namespace osu.Game.Overlays
 
             playDebouncedSample(notification.PopInSampleName);
 
-            if (notification.FlashTaskbar)
+            if (notification.IsImportant)
             {
-                game?.Window?.Flash(notification.IsImportant);
+                game?.Window?.Flash();
                 notification.Closed += () => game?.Window?.CancelFlash();
             }
 
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 53fc152c96..8cdc373417 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -38,11 +38,6 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public virtual bool IsImportant => true;
 
-        /// <summary>
-        /// Whether this notification should trigger a taskbar flash if the window is un-focused when posted.
-        /// </summary>
-        public bool FlashTaskbar { get; init; } = true;
-
         /// <summary>
         /// Run on user activating the notification. Return true to close.
         /// </summary>
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index eccfc4dc7b..872425e3fd 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -568,7 +568,6 @@ namespace osu.Game.Screens.Play
             public MutedNotification()
             {
                 Text = NotificationsStrings.GameVolumeTooLow;
-                FlashTaskbar = false;
             }
 
             [BackgroundDependencyLoader]
@@ -624,7 +623,6 @@ namespace osu.Game.Screens.Play
             public BatteryWarningNotification()
             {
                 Text = NotificationsStrings.BatteryLow;
-                FlashTaskbar = false;
             }
 
             [BackgroundDependencyLoader]

From 142abe1fd0a87a2144ee4f61c40cff1c96ce4605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 09:00:59 +0200
Subject: [PATCH 1151/2100] Make highlight messages important in order to
 trigger window flash

---
 osu.Game/Online/Chat/MessageNotifier.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index 65aac723da..56f490cb21 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -182,8 +182,6 @@ namespace osu.Game.Online.Chat
             private readonly Message message;
             private readonly Channel channel;
 
-            public override bool IsImportant => false;
-
             [BackgroundDependencyLoader]
             private void load(OsuColour colours, ChatOverlay chatOverlay, INotificationOverlay notificationOverlay)
             {

From 5be533578499d25c54e18ea76ec2aae2a32a9b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 09:37:54 +0200
Subject: [PATCH 1152/2100] Reword comment to be better

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

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index c442fac0b8..e31656e0ff 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -329,8 +329,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Entry.NestedEntries.RemoveAll(nestedEntry => nestedEntry is SyntheticHitObjectEntry);
             ClearNestedHitObjects();
 
-            // Changes in state trigger defaults applied trigger state updates.
-            // When a new hitobject is applied, OnApply() automatically performs a state update.
+            // Changes to `HitObject` properties trigger default application, which triggers `State` updates.
+            // When a new hitobject is applied, `OnApply()` automatically performs a state update.
             HitObject.DefaultsApplied -= onDefaultsApplied;
 
             entry.RevertResult -= onRevertResult;

From 290d18ad690accc2a54c3290e3403f6c2534fb45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 17:31:19 +0900
Subject: [PATCH 1153/2100] Split out difficulties in beatmap carousel in a bit
 of a hacky way

Seems like the simplest path forward for now, without a full rewrite.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 82 ++++++++++++++++------
 osu.Game/Screens/Select/FilterCriteria.cs  |  5 ++
 2 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 9af9a0ce72..d1a9b4176b 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -78,6 +78,8 @@ namespace osu.Game.Screens.Select
 
         private CarouselBeatmapSet? selectedBeatmapSet;
 
+        private IEnumerable<BeatmapSetInfo> originalBeatmapSetsDetached = Enumerable.Empty<BeatmapSetInfo>();
+
         /// <summary>
         /// Raised when the <see cref="SelectedBeatmapInfo"/> is changed.
         /// </summary>
@@ -127,13 +129,29 @@ namespace osu.Game.Screens.Select
 
         private void loadBeatmapSets(IEnumerable<BeatmapSetInfo> beatmapSets)
         {
+            originalBeatmapSetsDetached = beatmapSets.Detach();
+
             CarouselRoot newRoot = new CarouselRoot(this);
 
-            newRoot.AddItems(beatmapSets.Select(s => createCarouselSet(s.Detach())).OfType<CarouselBeatmapSet>());
+            if (beatmapsSplitOut)
+            {
+                var carouselBeatmapSets = originalBeatmapSetsDetached.SelectMany(s => s.Beatmaps).Select(b =>
+                {
+                    var set = new BeatmapSetInfo(new[] { b });
+                    return createCarouselSet(set);
+                }).OfType<CarouselBeatmapSet>();
+
+                newRoot.AddItems(carouselBeatmapSets);
+            }
+            else
+            {
+                var carouselBeatmapSets = originalBeatmapSetsDetached.Select(createCarouselSet).OfType<CarouselBeatmapSet>();
+                newRoot.AddItems(carouselBeatmapSets);
+            }
 
             root = newRoot;
 
-            if (selectedBeatmapSet != null && !beatmapSets.Contains(selectedBeatmapSet.BeatmapSet))
+            if (selectedBeatmapSet != null && !originalBeatmapSetsDetached.Contains(selectedBeatmapSet.BeatmapSet))
                 selectedBeatmapSet = null;
 
             Scroll.Clear(false);
@@ -330,8 +348,8 @@ namespace osu.Game.Screens.Select
 
                 // Only require to action here if the beatmap is missing.
                 // This avoids processing these events unnecessarily when new beatmaps are imported, for example.
-                if (root.BeatmapSetsByID.TryGetValue(beatmapSet.ID, out var existingSet)
-                    && existingSet.BeatmapSet.Beatmaps.All(b => b.ID != beatmapInfo.ID))
+                if (root.BeatmapSetsByID.TryGetValue(beatmapSet.ID, out var existingSets)
+                    && existingSets.SelectMany(s => s.Beatmaps).All(b => b.BeatmapInfo.ID != beatmapInfo.ID))
                 {
                     UpdateBeatmapSet(beatmapSet.Detach());
                 }
@@ -345,15 +363,18 @@ namespace osu.Game.Screens.Select
 
         private void removeBeatmapSet(Guid beatmapSetID) => Schedule(() =>
         {
-            if (!root.BeatmapSetsByID.TryGetValue(beatmapSetID, out var existingSet))
+            if (!root.BeatmapSetsByID.TryGetValue(beatmapSetID, out var existingSets))
                 return;
 
-            foreach (var beatmap in existingSet.Beatmaps)
-                randomSelectedBeatmaps.Remove(beatmap);
+            foreach (var set in existingSets)
+            {
+                foreach (var beatmap in set.Beatmaps)
+                    randomSelectedBeatmaps.Remove(beatmap);
+                previouslyVisitedRandomSets.Remove(set);
 
-            previouslyVisitedRandomSets.Remove(existingSet);
+                root.RemoveItem(set);
+            }
 
-            root.RemoveItem(existingSet);
             itemsCache.Invalidate();
 
             if (!Scroll.UserScrolling)
@@ -371,13 +392,16 @@ namespace osu.Game.Screens.Select
                 previouslySelectedID = selectedBeatmap?.BeatmapInfo.ID;
 
             var newSet = createCarouselSet(beatmapSet);
-            var removedSet = root.RemoveChild(beatmapSet.ID);
+            var removedSets = root.RemoveChild(beatmapSet.ID);
 
-            // If we don't remove this here, it may remain in a hidden state until scrolled off screen.
-            // Doesn't really affect anything during actual user interaction, but makes testing annoying.
-            var removedDrawable = Scroll.FirstOrDefault(c => c.Item == removedSet);
-            if (removedDrawable != null)
-                expirePanelImmediately(removedDrawable);
+            foreach (var removedSet in removedSets)
+            {
+                // If we don't remove this here, it may remain in a hidden state until scrolled off screen.
+                // Doesn't really affect anything during actual user interaction, but makes testing annoying.
+                var removedDrawable = Scroll.FirstOrDefault(c => c.Item == removedSet);
+                if (removedDrawable != null)
+                    expirePanelImmediately(removedDrawable);
+            }
 
             if (newSet != null)
             {
@@ -632,6 +656,8 @@ namespace osu.Game.Screens.Select
             applyActiveCriteria(debounce);
         }
 
+        private bool beatmapsSplitOut;
+
         private void applyActiveCriteria(bool debounce, bool alwaysResetScrollPosition = true)
         {
             PendingFilter?.Cancel();
@@ -652,6 +678,13 @@ namespace osu.Game.Screens.Select
             {
                 PendingFilter = null;
 
+                if (activeCriteria.SplitOutDifficulties != beatmapsSplitOut)
+                {
+                    beatmapsSplitOut = activeCriteria.SplitOutDifficulties;
+                    loadBeatmapSets(originalBeatmapSetsDetached);
+                    return;
+                }
+
                 root.Filter(activeCriteria);
                 itemsCache.Invalidate();
 
@@ -1055,7 +1088,7 @@ namespace osu.Game.Screens.Select
             // May only be null during construction (State.Value set causes PerformSelection to be triggered).
             private readonly BeatmapCarousel? carousel;
 
-            public readonly Dictionary<Guid, CarouselBeatmapSet> BeatmapSetsByID = new Dictionary<Guid, CarouselBeatmapSet>();
+            public readonly Dictionary<Guid, List<CarouselBeatmapSet>> BeatmapSetsByID = new Dictionary<Guid, List<CarouselBeatmapSet>>();
 
             public CarouselRoot(BeatmapCarousel carousel)
             {
@@ -1069,20 +1102,25 @@ namespace osu.Game.Screens.Select
             public override void AddItem(CarouselItem i)
             {
                 CarouselBeatmapSet set = (CarouselBeatmapSet)i;
-                BeatmapSetsByID.Add(set.BeatmapSet.ID, set);
+                if (BeatmapSetsByID.TryGetValue(set.BeatmapSet.ID, out var sets))
+                    sets.Add(set);
+                else
+                    BeatmapSetsByID.Add(set.BeatmapSet.ID, new List<CarouselBeatmapSet> { set });
 
                 base.AddItem(i);
             }
 
-            public CarouselBeatmapSet? RemoveChild(Guid beatmapSetID)
+            public IEnumerable<CarouselBeatmapSet> RemoveChild(Guid beatmapSetID)
             {
-                if (BeatmapSetsByID.TryGetValue(beatmapSetID, out var carouselBeatmapSet))
+                if (BeatmapSetsByID.TryGetValue(beatmapSetID, out var carouselBeatmapSets))
                 {
-                    RemoveItem(carouselBeatmapSet);
-                    return carouselBeatmapSet;
+                    foreach (var set in carouselBeatmapSets)
+                        RemoveItem(set);
+
+                    return carouselBeatmapSets;
                 }
 
-                return null;
+                return Enumerable.Empty<CarouselBeatmapSet>();
             }
 
             public override void RemoveItem(CarouselItem i)
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index ab4f85fc92..a2ae114126 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -19,6 +19,11 @@ namespace osu.Game.Screens.Select
         public GroupMode Group;
         public SortMode Sort;
 
+        /// <summary>
+        /// Whether the display of beatmap sets should be split apart per-difficulty for the current criteria.
+        /// </summary>
+        public bool SplitOutDifficulties => Sort == SortMode.Difficulty;
+
         public BeatmapSetInfo? SelectedBeatmapSet;
 
         public OptionalRange<double> StarDifficulty;

From 2b1c6ae612cb4e6cecbd6736748da942fa724e39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 18:38:23 +0900
Subject: [PATCH 1154/2100] Ensure ID is maintained in temporary
 `BeatmapSetInfo`s

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index d1a9b4176b..5157e37a31 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -137,8 +137,10 @@ namespace osu.Game.Screens.Select
             {
                 var carouselBeatmapSets = originalBeatmapSetsDetached.SelectMany(s => s.Beatmaps).Select(b =>
                 {
-                    var set = new BeatmapSetInfo(new[] { b });
-                    return createCarouselSet(set);
+                    return createCarouselSet(new BeatmapSetInfo(new[] { b })
+                    {
+                        ID = b.BeatmapSet!.ID,
+                    });
                 }).OfType<CarouselBeatmapSet>();
 
                 newRoot.AddItems(carouselBeatmapSets);

From ecbf0f138e2c7b3cf5716020a1aad4f8a834dfd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 18:38:43 +0900
Subject: [PATCH 1155/2100] Fix incorrect handling when new beatmaps arrive

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 35 ++++++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 5157e37a31..2227eb801a 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -393,7 +393,6 @@ namespace osu.Game.Screens.Select
             if (selectedBeatmapSet?.BeatmapSet.ID == beatmapSet.ID)
                 previouslySelectedID = selectedBeatmap?.BeatmapInfo.ID;
 
-            var newSet = createCarouselSet(beatmapSet);
             var removedSets = root.RemoveChild(beatmapSet.ID);
 
             foreach (var removedSet in removedSets)
@@ -405,13 +404,37 @@ namespace osu.Game.Screens.Select
                     expirePanelImmediately(removedDrawable);
             }
 
-            if (newSet != null)
+            if (beatmapsSplitOut)
             {
-                root.AddItem(newSet);
+                foreach (var beatmap in beatmapSet.Beatmaps)
+                {
+                    var newSet = createCarouselSet(new BeatmapSetInfo(new[] { beatmap })
+                    {
+                        ID = beatmapSet.ID
+                    });
 
-                // check if we can/need to maintain our current selection.
-                if (previouslySelectedID != null)
-                    select((CarouselItem?)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
+                    if (newSet != null)
+                    {
+                        root.AddItem(newSet);
+
+                        // check if we can/need to maintain our current selection.
+                        if (previouslySelectedID != null)
+                            select((CarouselItem?)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
+                    }
+                }
+            }
+            else
+            {
+                var newSet = createCarouselSet(beatmapSet);
+
+                if (newSet != null)
+                {
+                    root.AddItem(newSet);
+
+                    // check if we can/need to maintain our current selection.
+                    if (previouslySelectedID != null)
+                        select((CarouselItem?)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
+                }
             }
 
             itemsCache.Invalidate();

From 018be4c20f408ee98bb00a3897e2658b4f016596 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 18:40:34 +0900
Subject: [PATCH 1156/2100] Fix selection not being retained when switching
 between split mode

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 2227eb801a..c5e46a00b6 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -131,6 +131,12 @@ namespace osu.Game.Screens.Select
         {
             originalBeatmapSetsDetached = beatmapSets.Detach();
 
+            if (selectedBeatmapSet != null && !originalBeatmapSetsDetached.Contains(selectedBeatmapSet.BeatmapSet))
+                selectedBeatmapSet = null;
+
+            var selectedSetBefore = selectedBeatmapSet;
+            var selectedBetmapBefore = selectedBeatmap;
+
             CarouselRoot newRoot = new CarouselRoot(this);
 
             if (beatmapsSplitOut)
@@ -148,14 +154,12 @@ namespace osu.Game.Screens.Select
             else
             {
                 var carouselBeatmapSets = originalBeatmapSetsDetached.Select(createCarouselSet).OfType<CarouselBeatmapSet>();
+
                 newRoot.AddItems(carouselBeatmapSets);
             }
 
             root = newRoot;
 
-            if (selectedBeatmapSet != null && !originalBeatmapSetsDetached.Contains(selectedBeatmapSet.BeatmapSet))
-                selectedBeatmapSet = null;
-
             Scroll.Clear(false);
             itemsCache.Invalidate();
             ScrollToSelected();
@@ -164,6 +168,15 @@ namespace osu.Game.Screens.Select
 
             if (loadedTestBeatmaps)
                 signalBeatmapsLoaded();
+
+            // Restore selection
+            if (selectedBetmapBefore != null && selectedSetBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedSetBefore.BeatmapSet.ID, out var newSelectionCandidates))
+            {
+                CarouselBeatmap? found = newSelectionCandidates.SelectMany(s => s.Beatmaps).SingleOrDefault(b => b.BeatmapInfo.ID == selectedBetmapBefore.BeatmapInfo.ID);
+
+                if (found != null)
+                    found.State.Value = CarouselItemState.Selected;
+            }
         }
 
         private readonly List<CarouselItem> visibleItems = new List<CarouselItem>();

From c9f611a713916ea36f9a98eb93de4c02c11cbfc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 14:30:55 +0200
Subject: [PATCH 1157/2100] Enable NRT in `TestSceneObjectOrderedHitPolicy`

---
 .../TestSceneObjectOrderedHitPolicy.cs                    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index ee70441688..8c2d8ea84e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -380,7 +378,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => judgementResults.Single(r => r.HitObject == hitObject).Type, () => Is.EqualTo(result));
         }
 
-        private void addJudgementAssert(string name, Func<OsuHitObject> hitObject, HitResult result)
+        private void addJudgementAssert(string name, Func<OsuHitObject?> hitObject, HitResult result)
         {
             AddAssert($"{name} judgement is {result}",
                 () => judgementResults.Single(r => r.HitObject == hitObject()).Type == result);
@@ -392,8 +390,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, offset, 100));
         }
 
-        private ScoreAccessibleReplayPlayer currentPlayer;
-        private List<JudgementResult> judgementResults;
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
+        private List<JudgementResult> judgementResults = null!;
 
         private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames)
         {

From ab4d47b594dd45358110db8b68a76705e1089b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 14:37:58 +0200
Subject: [PATCH 1158/2100] Rewrite assertions to use nunit constraints

---
 .../TestSceneObjectOrderedHitPolicy.cs                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 8c2d8ea84e..9ee55d95a5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -381,13 +381,13 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void addJudgementAssert(string name, Func<OsuHitObject?> hitObject, HitResult result)
         {
             AddAssert($"{name} judgement is {result}",
-                () => judgementResults.Single(r => r.HitObject == hitObject()).Type == result);
+                () => judgementResults.Single(r => r.HitObject == hitObject()).Type, () => Is.EqualTo(result));
         }
 
         private void addJudgementOffsetAssert(OsuHitObject hitObject, double offset)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",
-                () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, offset, 100));
+                () => judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, () => Is.EqualTo(offset).Within(100));
         }
 
         private ScoreAccessibleReplayPlayer currentPlayer = null!;

From 9fd59b807f23c27f298d146c25f737305d73ecfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 15:06:06 +0200
Subject: [PATCH 1159/2100] Rewrite `TestSceneObjectOrderedHitPolicy` to not
 rely on custom hitwindows

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 117 +++++++-----------
 1 file changed, 47 insertions(+), 70 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 9ee55d95a5..1dd9116da2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Screens;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
@@ -17,6 +16,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -28,8 +28,13 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public partial class TestSceneObjectOrderedHitPolicy : RateAdjustedBeatmapTestScene
     {
-        private const double early_miss_window = 1000; // time after -1000 to -500 is considered a miss
-        private const double late_miss_window = 500; // time after +500 is considered a miss
+        private readonly OsuHitWindows referenceHitWindows;
+
+        public TestSceneObjectOrderedHitPolicy()
+        {
+            referenceHitWindows = new OsuHitWindows();
+            referenceHitWindows.SetDifficulty(0);
+        }
 
         /// <summary>
         /// Tests clicking a future circle before the first circle's start time, while the first circle HAS NOT been judged.
@@ -44,12 +49,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_first_circle,
                     Position = positionFirstCircle
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_second_circle,
                     Position = positionSecondCircle
@@ -63,7 +68,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
-            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+            // note lock prevented the object from being hit, so the judgement offset should be very late.
+            addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
         }
 
         /// <summary>
@@ -79,12 +85,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_first_circle,
                     Position = positionFirstCircle
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_second_circle,
                     Position = positionSecondCircle
@@ -98,7 +104,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
-            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+            // note lock prevented the object from being hit, so the judgement offset should be very late.
+            addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
         }
 
         /// <summary>
@@ -114,12 +121,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_first_circle,
                     Position = positionFirstCircle
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_second_circle,
                     Position = positionSecondCircle
@@ -133,7 +140,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
-            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+            // note lock prevented the object from being hit, so the judgement offset should be very late.
+            addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
         }
 
         /// <summary>
@@ -149,12 +157,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_first_circle,
                     Position = positionFirstCircle
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_second_circle,
                     Position = positionSecondCircle
@@ -167,8 +175,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Time = time_first_circle - 100, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
             });
 
-            addJudgementAssert(hitObjects[0], HitResult.Great);
-            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert(hitObjects[0], HitResult.Meh);
+            addJudgementAssert(hitObjects[1], HitResult.Meh);
             addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
             addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
         }
@@ -186,12 +194,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_first_circle,
                     Position = positionFirstCircle
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_second_circle,
                     Position = positionSecondCircle
@@ -204,8 +212,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Time = time_first_circle, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
             });
 
-            addJudgementAssert(hitObjects[0], HitResult.Great);
-            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert(hitObjects[0], HitResult.Meh);
+            addJudgementAssert(hitObjects[1], HitResult.Ok);
             addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
             addJudgementOffsetAssert(hitObjects[1], -100); // time_second_circle - first_circle_time
         }
@@ -223,19 +231,19 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_circle,
                     Position = positionCircle
                 },
-                new TestSlider
+                new Slider
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
-                        new Vector2(25, 0),
+                        new Vector2(50, 0),
                     })
                 }
             };
@@ -265,19 +273,19 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_circle,
                     Position = positionCircle
                 },
-                new TestSlider
+                new Slider
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
-                        new Vector2(25, 0),
+                        new Vector2(50, 0),
                     })
                 }
             };
@@ -285,11 +293,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             performTest(hitObjects, new List<ReplayFrame>
             {
                 new OsuReplayFrame { Time = time_slider, Position = positionSlider, Actions = { OsuAction.LeftButton } },
-                new OsuReplayFrame { Time = time_circle + late_miss_window - 100, Position = positionCircle, Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_circle + late_miss_window - 90, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_circle + referenceHitWindows.WindowFor(HitResult.Meh) - 100, Position = positionCircle, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_circle + referenceHitWindows.WindowFor(HitResult.Meh) - 90, Position = positionSlider, Actions = { OsuAction.LeftButton } },
             });
 
-            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[0], HitResult.Ok);
             addJudgementAssert(hitObjects[1], HitResult.Great);
             addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
@@ -302,7 +310,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestHitCircleBeforeSpinner()
         {
             const double time_spinner = 1500;
-            const double time_circle = 1800;
+            const double time_circle = 1600;
             Vector2 positionCircle = Vector2.Zero;
 
             var hitObjects = new List<OsuHitObject>
@@ -313,7 +321,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     Position = new Vector2(256, 192),
                     EndTime = time_spinner + 1000,
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_circle,
                     Position = positionCircle
@@ -331,7 +339,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
-            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Meh);
         }
 
         [Test]
@@ -344,12 +352,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_circle,
                     Position = positionCircle
                 },
-                new TestSlider
+                new Slider
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
@@ -400,7 +408,11 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
                 {
                     HitObjects = hitObjects,
-                    Difficulty = new BeatmapDifficulty { SliderTickRate = 3 },
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        OverallDifficulty = 0,
+                        SliderTickRate = 3
+                    },
                     BeatmapInfo =
                     {
                         Ruleset = new OsuRuleset().RulesetInfo
@@ -428,28 +440,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
-        private class TestHitCircle : HitCircle
-        {
-            protected override HitWindows CreateHitWindows() => new TestHitWindows();
-        }
-
-        private class TestSlider : Slider
-        {
-            public TestSlider()
-            {
-                SliderVelocity = 0.1f;
-
-                DefaultsApplied += _ =>
-                {
-                    HeadCircle.HitWindows = new TestHitWindows();
-                    TailCircle.HitWindows = new TestHitWindows();
-
-                    HeadCircle.HitWindows.SetDifficulty(0);
-                    TailCircle.HitWindows.SetDifficulty(0);
-                };
-            }
-        }
-
         private class TestSpinner : Spinner
         {
             protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
@@ -459,19 +449,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             }
         }
 
-        private class TestHitWindows : HitWindows
-        {
-            private static readonly DifficultyRange[] ranges =
-            {
-                new DifficultyRange(HitResult.Great, 500, 500, 500),
-                new DifficultyRange(HitResult.Miss, early_miss_window, early_miss_window, early_miss_window),
-            };
-
-            public override bool IsHitResultAllowed(HitResult result) => result == HitResult.Great || result == HitResult.Miss;
-
-            protected override DifficultyRange[] GetRanges() => ranges;
-        }
-
         private partial class ScoreAccessibleReplayPlayer : ReplayPlayer
         {
             public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;

From a1b4a5621592234f4787d26a88d1b03830661c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 18:04:20 +0200
Subject: [PATCH 1160/2100] Add capability to export ordered object policy test
 cases for stable crosscheck

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 86 ++++++++++++++++++-
 1 file changed, 83 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 1dd9116da2..5205400a7e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -3,12 +3,17 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
 using NUnit.Framework;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Formats;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -20,6 +25,7 @@ using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual;
 using osuTK;
@@ -30,6 +36,13 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         private readonly OsuHitWindows referenceHitWindows;
 
+        /// <summary>
+        /// This is provided as a convenience for testing note lock behaviour against osu!stable.
+        /// Setting this field to a non-null path will cause beatmap files and replays used in all test cases
+        /// to be exported to disk so that they can be cross-checked against stable.
+        /// </summary>
+        private readonly string? exportLocation = null;
+
         public TestSceneObjectOrderedHitPolicy()
         {
             referenceHitWindows = new OsuHitWindows();
@@ -401,12 +414,21 @@ namespace osu.Game.Rulesets.Osu.Tests
         private ScoreAccessibleReplayPlayer currentPlayer = null!;
         private List<JudgementResult> judgementResults = null!;
 
-        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames)
+        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames, [CallerMemberName] string testCaseName = "")
         {
-            AddStep("load player", () =>
+            IBeatmap playableBeatmap = null!;
+            Score score = null!;
+
+            AddStep("create beatmap", () =>
             {
+                var cpi = new ControlPointInfo();
+                cpi.Add(0, new TimingControlPoint { BeatLength = 1000 });
                 Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
                 {
+                    Metadata =
+                    {
+                        Title = testCaseName
+                    },
                     HitObjects = hitObjects,
                     Difficulty = new BeatmapDifficulty
                     {
@@ -417,11 +439,69 @@ namespace osu.Game.Rulesets.Osu.Tests
                     {
                         Ruleset = new OsuRuleset().RulesetInfo
                     },
+                    ControlPointInfo = cpi
+                });
+                playableBeatmap = Beatmap.Value.GetPlayableBeatmap(new OsuRuleset().RulesetInfo);
+            });
+
+            AddStep("create score", () =>
+            {
+                score = new Score
+                {
+                    Replay = new Replay
+                    {
+                        Frames = new List<ReplayFrame>
+                        {
+                            // required for correct playback in stable
+                            new OsuReplayFrame(0, new Vector2(256, -500)),
+                            new OsuReplayFrame(0, new Vector2(256, -500))
+                        }.Concat(frames).ToList()
+                    },
+                    ScoreInfo =
+                    {
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapInfo = playableBeatmap.BeatmapInfo
+                    }
+                };
+            });
+
+            if (exportLocation != null)
+            {
+                AddStep("create beatmap", () =>
+                {
+                    var beatmapEncoder = new LegacyBeatmapEncoder(playableBeatmap, null);
+
+                    using (var stream = File.Open(Path.Combine(exportLocation, $"{testCaseName}.osu"), FileMode.Create))
+                    {
+                        var memoryStream = new MemoryStream();
+                        using (var writer = new StreamWriter(memoryStream, Encoding.UTF8, leaveOpen: true))
+                            beatmapEncoder.Encode(writer);
+
+                        memoryStream.Seek(0, SeekOrigin.Begin);
+                        memoryStream.CopyTo(stream);
+                        memoryStream.Seek(0, SeekOrigin.Begin);
+                        playableBeatmap.BeatmapInfo.MD5Hash = memoryStream.ComputeMD5Hash();
+                    }
                 });
 
+                AddStep("export score", () =>
+                {
+                    var scoreToEncode = score.DeepClone();
+                    scoreToEncode.Replay.Frames = scoreToEncode.Replay.Frames.Cast<OsuReplayFrame>()
+                                                               .Select(frame => new OsuReplayFrame(frame.Time + LegacyBeatmapDecoder.EARLY_VERSION_TIMING_OFFSET, frame.Position, frame.Actions.ToArray()))
+                                                               .ToList<ReplayFrame>();
+
+                    using var stream = File.Open(Path.Combine(exportLocation, $"{testCaseName}.osr"), FileMode.Create);
+                    var encoder = new LegacyScoreEncoder(scoreToEncode, playableBeatmap);
+                    encoder.Encode(stream);
+                });
+            }
+
+            AddStep("load player", () =>
+            {
                 SelectedMods.Value = new[] { new OsuModClassic() };
 
-                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+                var p = new ScoreAccessibleReplayPlayer(score);
 
                 p.OnLoadComplete += _ =>
                 {

From 64786aaee8d99de8757648635cf1daa3d7ec75d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 10:43:48 +0200
Subject: [PATCH 1161/2100] Adjust test cases slightly to avoid running into
 hitwindow edge issue

Some note lock test cases do not play out correctly when exported out
to stable due to a completely separate issue, namely #11311.
Adjust the test cases for now to isolate failure vectors.
---
 .../TestSceneObjectOrderedHitPolicy.cs             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 5205400a7e..fd8973c375 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -184,14 +184,14 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_first_circle - 200, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
-                new OsuReplayFrame { Time = time_first_circle - 100, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
+                new OsuReplayFrame { Time = time_first_circle - 190, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle - 90, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Meh);
             addJudgementAssert(hitObjects[1], HitResult.Meh);
-            addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
-            addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
+            addJudgementOffsetAssert(hitObjects[0], -190); // time_first_circle - 190
+            addJudgementOffsetAssert(hitObjects[0], -90); // time_second_circle - first_circle_time - 90
         }
 
         /// <summary>
@@ -221,13 +221,13 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_first_circle - 200, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle - 190, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_first_circle, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Meh);
             addJudgementAssert(hitObjects[1], HitResult.Ok);
-            addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
+            addJudgementOffsetAssert(hitObjects[0], -190); // time_first_circle - 190
             addJudgementOffsetAssert(hitObjects[1], -100); // time_second_circle - first_circle_time
         }
 
@@ -343,7 +343,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_spinner - 100, Position = positionCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_spinner - 90, Position = positionCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_spinner + 10, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
                 new OsuReplayFrame { Time = time_spinner + 20, Position = new Vector2(256, 172), Actions = { OsuAction.RightButton } },
                 new OsuReplayFrame { Time = time_spinner + 30, Position = new Vector2(276, 192), Actions = { OsuAction.RightButton } },

From 91c2cadb4737839e36d087c02658b4872cd2456a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 19:13:32 +0900
Subject: [PATCH 1162/2100] Add missing colon in mod settings tooltip

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index f9812d6c00..6d40826afe 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Mods
                     var bindable = (IBindable)property.GetValue(this)!;
 
                     if (!bindable.IsDefault)
-                        tooltipTexts.Add($"{attr.Label} {bindable}");
+                        tooltipTexts.Add($"{attr.Label}: {bindable}");
                 }
 
                 return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));

From 5555f73e97f22f9c6f0425bc4c9459bef88f3be5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 19:38:18 +0900
Subject: [PATCH 1163/2100] Update test to match new behaviour

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 61f95dc628..b0aff8b4db 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -758,7 +758,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        public void TestSortingWithFiltered()
+        public void TestSortingWithDifficultyFiltered()
         {
             List<BeatmapSetInfo> sets = new List<BeatmapSetInfo>();
 
@@ -777,13 +777,32 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             loadBeatmaps(sets);
 
+            AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
+
+            checkVisibleItemCount(false, 9);
+            checkVisibleItemCount(true, 1);
+
             AddStep("Filter to normal", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Normal" }, false));
-            AddAssert("Check first set at end", () => carousel.BeatmapSets.First().Equals(sets.Last()));
-            AddAssert("Check last set at start", () => carousel.BeatmapSets.Last().Equals(sets.First()));
+            checkVisibleItemCount(false, 3);
+            checkVisibleItemCount(true, 1);
+
+            AddUntilStep("Check all visible sets have one normal", () =>
+            {
+                return carousel.Items.OfType<DrawableCarouselBeatmapSet>()
+                               .Where(p => p.IsPresent)
+                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Normal", StringComparison.Ordinal)) == 3;
+            });
 
             AddStep("Filter to insane", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Insane" }, false));
-            AddAssert("Check first set at start", () => carousel.BeatmapSets.First().Equals(sets.First()));
-            AddAssert("Check last set at end", () => carousel.BeatmapSets.Last().Equals(sets.Last()));
+            checkVisibleItemCount(false, 3);
+            checkVisibleItemCount(true, 1);
+
+            AddUntilStep("Check all visible sets have one insane", () =>
+            {
+                return carousel.Items.OfType<DrawableCarouselBeatmapSet>()
+                               .Where(p => p.IsPresent)
+                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Insane", StringComparison.Ordinal)) == 3;
+            });
         }
 
         [Test]

From a64381f8553dd49b9c5c5142aa2934c333b101a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 19:43:08 +0900
Subject: [PATCH 1164/2100] Add test coverage of add/remove when difficulties
 are split out

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 47 +++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index b0aff8b4db..5af6d862b2 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         private BeatmapInfo currentSelection => carousel.SelectedBeatmapInfo;
 
         private const int set_count = 5;
+        private const int diff_count = 3;
 
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
@@ -501,6 +502,36 @@ namespace osu.Game.Tests.Visual.SongSelect
             waitForSelection(set_count);
         }
 
+        [Test]
+        public void TestAddRemoveDifficultySort()
+        {
+            loadBeatmaps();
+
+            AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
+
+            checkVisibleItemCount(false, set_count * diff_count);
+
+            var firstAdded = TestResources.CreateTestBeatmapSetInfo(diff_count);
+            var secondAdded = TestResources.CreateTestBeatmapSetInfo(diff_count);
+
+            AddStep("Add new set", () => carousel.UpdateBeatmapSet(firstAdded));
+            AddStep("Add new set", () => carousel.UpdateBeatmapSet(secondAdded));
+
+            checkVisibleItemCount(false, (set_count + 2) * diff_count);
+
+            AddStep("Remove set", () => carousel.RemoveBeatmapSet(firstAdded));
+
+            checkVisibleItemCount(false, (set_count + 1) * diff_count);
+
+            setSelected(set_count + 1, 1);
+
+            AddStep("Remove set", () => carousel.RemoveBeatmapSet(secondAdded));
+
+            checkVisibleItemCount(false, (set_count) * diff_count);
+
+            waitForSelection(set_count);
+        }
+
         [Test]
         public void TestSelectionEnteringFromEmptyRuleset()
         {
@@ -662,7 +693,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 for (int i = 0; i < 3; i++)
                 {
-                    var set = TestResources.CreateTestBeatmapSetInfo(3);
+                    var set = TestResources.CreateTestBeatmapSetInfo(diff_count);
 
                     // only need to set the first as they are a shared reference.
                     var beatmap = set.Beatmaps.First();
@@ -709,7 +740,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 for (int i = 0; i < 3; i++)
                 {
-                    var set = TestResources.CreateTestBeatmapSetInfo(3);
+                    var set = TestResources.CreateTestBeatmapSetInfo(diff_count);
 
                     // only need to set the first as they are a shared reference.
                     var beatmap = set.Beatmaps.First();
@@ -768,7 +799,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 for (int i = 0; i < 3; i++)
                 {
-                    var set = TestResources.CreateTestBeatmapSetInfo(3);
+                    var set = TestResources.CreateTestBeatmapSetInfo(diff_count);
                     set.Beatmaps[0].StarRating = 3 - i;
                     set.Beatmaps[2].StarRating = 6 + i;
                     sets.Add(set);
@@ -857,7 +888,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("create hidden set", () =>
             {
-                hidingSet = TestResources.CreateTestBeatmapSetInfo(3);
+                hidingSet = TestResources.CreateTestBeatmapSetInfo(diff_count);
                 hidingSet.Beatmaps[1].Hidden = true;
 
                 hiddenList.Clear();
@@ -904,7 +935,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("add mixed ruleset beatmapset", () =>
             {
-                testMixed = TestResources.CreateTestBeatmapSetInfo(3);
+                testMixed = TestResources.CreateTestBeatmapSetInfo(diff_count);
 
                 for (int i = 0; i <= 2; i++)
                 {
@@ -926,7 +957,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             BeatmapSetInfo testSingle = null;
             AddStep("add single ruleset beatmapset", () =>
             {
-                testSingle = TestResources.CreateTestBeatmapSetInfo(3);
+                testSingle = TestResources.CreateTestBeatmapSetInfo(diff_count);
                 testSingle.Beatmaps.ForEach(b =>
                 {
                     b.Ruleset = rulesets.AvailableRulesets.ElementAt(1);
@@ -949,7 +980,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 manySets.Clear();
 
                 for (int i = 1; i <= 50; i++)
-                    manySets.Add(TestResources.CreateTestBeatmapSetInfo(3));
+                    manySets.Add(TestResources.CreateTestBeatmapSetInfo(diff_count));
             });
 
             loadBeatmaps(manySets);
@@ -1113,7 +1144,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 {
                     beatmapSets.Add(randomDifficulties
                         ? TestResources.CreateTestBeatmapSetInfo()
-                        : TestResources.CreateTestBeatmapSetInfo(3));
+                        : TestResources.CreateTestBeatmapSetInfo(diff_count));
                 }
             }
 

From 5eac604f8b2cf59a5346956d99a7fea0fdda0cd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 19:44:39 +0900
Subject: [PATCH 1165/2100] Add coverage of selection retention when
 difficulties are split out

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 5af6d862b2..daa8c9c4c2 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -1005,6 +1005,43 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selection was remembered", () => eagerSelectedIDs.Count == 1);
         }
 
+        [Test]
+        public void TestCarouselRemembersSelectionDifficultySort()
+        {
+            List<BeatmapSetInfo> manySets = new List<BeatmapSetInfo>();
+
+            AddStep("Populuate beatmap sets", () =>
+            {
+                manySets.Clear();
+
+                for (int i = 1; i <= 50; i++)
+                    manySets.Add(TestResources.CreateTestBeatmapSetInfo(diff_count));
+            });
+
+            loadBeatmaps(manySets);
+
+            AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
+
+            advanceSelection(direction: 1, diff: false);
+
+            for (int i = 0; i < 5; i++)
+            {
+                AddStep("Toggle non-matching filter", () =>
+                {
+                    carousel.Filter(new FilterCriteria { SearchText = Guid.NewGuid().ToString() }, false);
+                });
+
+                AddStep("Restore no filter", () =>
+                {
+                    carousel.Filter(new FilterCriteria(), false);
+                    eagerSelectedIDs.Add(carousel.SelectedBeatmapSet!.ID);
+                });
+            }
+
+            // always returns to same selection as long as it's available.
+            AddAssert("Selection was remembered", () => eagerSelectedIDs.Count == 1);
+        }
+
         [Test]
         public void TestFilteringByUserStarDifficulty()
         {

From d6aded3ac31b232884f0642bedc793f41b377b2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 20:11:55 +0900
Subject: [PATCH 1166/2100] 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 8ebfde8047..2d15bce85a 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.817.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.823.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 4c3205178a..cd57c33109 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.822.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.823.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.822.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 fd1ba0f6d1..d515a035da 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.817.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.823.0" />
   </ItemGroup>
 </Project>

From 72d27152225f760c6526d3ecc186d3ff469224c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 20:21:43 +0900
Subject: [PATCH 1167/2100] Show mod settings as "on" or "off" rather than
 "True" or "False"

---
 osu.Game/Rulesets/Mods/Mod.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 6d40826afe..a9ecf89df1 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -71,8 +71,21 @@ namespace osu.Game.Rulesets.Mods
                 {
                     var bindable = (IBindable)property.GetValue(this)!;
 
+                    string valueText;
+
+                    switch (bindable)
+                    {
+                        case Bindable<bool> b:
+                            valueText = b.Value ? "on" : "off";
+                            break;
+
+                        default:
+                            valueText = bindable.ToString() ?? string.Empty;
+                            break;
+                    }
+
                     if (!bindable.IsDefault)
-                        tooltipTexts.Add($"{attr.Label}: {bindable}");
+                        tooltipTexts.Add($"{attr.Label}: {valueText}");
                 }
 
                 return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));

From 052bf2a6e07745ba9832345e896249ab6452ca44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 13:54:11 +0200
Subject: [PATCH 1168/2100] Use alternative solution for timing offset woes on
 export

---
 .../TestSceneObjectOrderedHitPolicy.cs                 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index fd8973c375..eff96febaa 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -437,7 +437,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                     },
                     BeatmapInfo =
                     {
-                        Ruleset = new OsuRuleset().RulesetInfo
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapVersion = LegacyBeatmapEncoder.FIRST_LAZER_VERSION // for correct offset treatment by score encoder
                     },
                     ControlPointInfo = cpi
                 });
@@ -486,13 +487,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 AddStep("export score", () =>
                 {
-                    var scoreToEncode = score.DeepClone();
-                    scoreToEncode.Replay.Frames = scoreToEncode.Replay.Frames.Cast<OsuReplayFrame>()
-                                                               .Select(frame => new OsuReplayFrame(frame.Time + LegacyBeatmapDecoder.EARLY_VERSION_TIMING_OFFSET, frame.Position, frame.Actions.ToArray()))
-                                                               .ToList<ReplayFrame>();
-
                     using var stream = File.Open(Path.Combine(exportLocation, $"{testCaseName}.osr"), FileMode.Create);
-                    var encoder = new LegacyScoreEncoder(scoreToEncode, playableBeatmap);
+                    var encoder = new LegacyScoreEncoder(score, playableBeatmap);
                     encoder.Encode(stream);
                 });
             }

From a8e4237e34d198d97106d76a86950846ce2bc54d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 03:23:18 +0900
Subject: [PATCH 1169/2100] Enable sentry "global mode" as per recommendation

Sentry documentation suggests this should be on for a client-facing app.

We haven't run into issues without it until now, but might as well set it correctly?
---
 osu.Game/Utils/SentryLogger.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
index 8c39a2d15a..61622a7122 100644
--- a/osu.Game/Utils/SentryLogger.cs
+++ b/osu.Game/Utils/SentryLogger.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Utils
 
                 options.AutoSessionTracking = true;
                 options.IsEnvironmentUser = false;
+                options.IsGlobalModeEnabled = true;
                 // The reported release needs to match version as reported to Sentry in .github/workflows/sentry-release.yml
                 options.Release = $"osu@{game.Version.Replace($@"-{OsuGameBase.BUILD_SUFFIX}", string.Empty)}";
             });

From 4881130caeccc728dbb789665fd161da1cfb0b53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 03:32:12 +0900
Subject: [PATCH 1170/2100] Limit set/diff count in test to better fit on
 screen

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index daa8c9c4c2..d68fa6100c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -791,17 +791,20 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestSortingWithDifficultyFiltered()
         {
+            const int local_diff_count = 3;
+            const int local_set_count = 2;
+
             List<BeatmapSetInfo> sets = new List<BeatmapSetInfo>();
 
             AddStep("Populuate beatmap sets", () =>
             {
                 sets.Clear();
 
-                for (int i = 0; i < 3; i++)
+                for (int i = 0; i < local_set_count; i++)
                 {
-                    var set = TestResources.CreateTestBeatmapSetInfo(diff_count);
+                    var set = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
                     set.Beatmaps[0].StarRating = 3 - i;
-                    set.Beatmaps[2].StarRating = 6 + i;
+                    set.Beatmaps[1].StarRating = 6 + i;
                     sets.Add(set);
                 }
             });
@@ -810,29 +813,29 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
 
-            checkVisibleItemCount(false, 9);
+            checkVisibleItemCount(false, local_set_count * local_diff_count);
             checkVisibleItemCount(true, 1);
 
             AddStep("Filter to normal", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Normal" }, false));
-            checkVisibleItemCount(false, 3);
+            checkVisibleItemCount(false, local_set_count);
             checkVisibleItemCount(true, 1);
 
             AddUntilStep("Check all visible sets have one normal", () =>
             {
                 return carousel.Items.OfType<DrawableCarouselBeatmapSet>()
                                .Where(p => p.IsPresent)
-                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Normal", StringComparison.Ordinal)) == 3;
+                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Normal", StringComparison.Ordinal)) == local_set_count;
             });
 
             AddStep("Filter to insane", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Insane" }, false));
-            checkVisibleItemCount(false, 3);
+            checkVisibleItemCount(false, local_set_count);
             checkVisibleItemCount(true, 1);
 
             AddUntilStep("Check all visible sets have one insane", () =>
             {
                 return carousel.Items.OfType<DrawableCarouselBeatmapSet>()
                                .Where(p => p.IsPresent)
-                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Insane", StringComparison.Ordinal)) == 3;
+                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Insane", StringComparison.Ordinal)) == local_set_count;
             });
         }
 

From c8f42f73e87029f3e235b92d3a97ba776d6327f9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 24 Aug 2023 11:17:41 +0900
Subject: [PATCH 1171/2100] Adjust mania hit windows with gameplay rate

---
 .../Mods/IManiaRateAdjustmentMod.cs           | 47 +++++++++++++++++++
 .../Mods/ManiaModDaycore.cs                   |  5 +-
 .../Mods/ManiaModDoubleTime.cs                |  5 +-
 .../Mods/ManiaModHalfTime.cs                  |  5 +-
 .../Mods/ManiaModNightcore.cs                 |  5 +-
 .../Scoring/ManiaHitWindows.cs                | 20 ++++++++
 6 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Mods/IManiaRateAdjustmentMod.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/IManiaRateAdjustmentMod.cs b/osu.Game.Rulesets.Mania/Mods/IManiaRateAdjustmentMod.cs
new file mode 100644
index 0000000000..ea01bd4436
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/IManiaRateAdjustmentMod.cs
@@ -0,0 +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.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    /// <summary>
+    /// May be attached to rate-adjustment mods to adjust hit windows adjust relative to gameplay rate.
+    /// </summary>
+    /// <remarks>
+    /// Historically, in osu!mania, hit windows are expected to adjust relative to the gameplay rate such that the real-world hit window remains the same.
+    /// </remarks>
+    public interface IManiaRateAdjustmentMod : IApplicableToDifficulty, IApplicableToHitObject
+    {
+        BindableNumber<double> SpeedChange { get; }
+
+        HitWindows HitWindows { get; set; }
+
+        void IApplicableToDifficulty.ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            HitWindows = new ManiaHitWindows(SpeedChange.Value);
+            HitWindows.SetDifficulty(difficulty.OverallDifficulty);
+        }
+
+        void IApplicableToHitObject.ApplyToHitObject(HitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case Note:
+                    hitObject.HitWindows = HitWindows;
+                    break;
+
+                case HoldNote hold:
+                    hold.Head.HitWindows = HitWindows;
+                    hold.Tail.HitWindows = HitWindows;
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModDaycore.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModDaycore.cs
index 309393b664..dbe2a9a9fc 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModDaycore.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModDaycore.cs
@@ -1,11 +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 osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModDaycore : ModDaycore
+    public class ManiaModDaycore : ModDaycore, IManiaRateAdjustmentMod
     {
+        public HitWindows HitWindows { get; set; } = new ManiaHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs
index f4b9cf3b88..a841a8ab37 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs
@@ -1,11 +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 osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModDoubleTime : ModDoubleTime
+    public class ManiaModDoubleTime : ModDoubleTime, IManiaRateAdjustmentMod
     {
+        public HitWindows HitWindows { get; set; } = new ManiaHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHalfTime.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHalfTime.cs
index 8d48e3acde..b0fbb11396 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHalfTime.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHalfTime.cs
@@ -1,11 +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 osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModHalfTime : ModHalfTime
+    public class ManiaModHalfTime : ModHalfTime, IManiaRateAdjustmentMod
     {
+        public HitWindows HitWindows { get; set; } = new ManiaHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs
index 748725af9f..f64f7ae31a 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModNightcore : ModNightcore<ManiaHitObject>
+    public class ManiaModNightcore : ModNightcore<ManiaHitObject>, IManiaRateAdjustmentMod
     {
+        public HitWindows HitWindows { get; set; } = new ManiaHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
index 289f8a00ef..627f48f391 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
@@ -1,12 +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.Linq;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Scoring
 {
     public class ManiaHitWindows : HitWindows
     {
+        private readonly double multiplier;
+
+        public ManiaHitWindows()
+            : this(1)
+        {
+        }
+
+        public ManiaHitWindows(double multiplier)
+        {
+            this.multiplier = multiplier;
+        }
+
         public override bool IsHitResultAllowed(HitResult result)
         {
             switch (result)
@@ -22,5 +35,12 @@ namespace osu.Game.Rulesets.Mania.Scoring
 
             return false;
         }
+
+        protected override DifficultyRange[] GetRanges() => base.GetRanges().Select(r =>
+            new DifficultyRange(
+                r.Result,
+                r.Min * multiplier,
+                r.Average * multiplier,
+                r.Max * multiplier)).ToArray();
     }
 }

From ba70d48d2cc0013fbc42338e0867cbe1e6ea8c82 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 13:31:33 +0900
Subject: [PATCH 1172/2100] Fix one more test probably going off-screen

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index d68fa6100c..8a38e2a84b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestScrollPositionMaintainedOnAdd()
         {
-            loadBeatmaps(count: 1, randomDifficulties: false);
+            loadBeatmaps(setCount: 1);
 
             for (int i = 0; i < 10; i++)
             {
@@ -125,7 +125,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestDeletion()
         {
-            loadBeatmaps(count: 5, randomDifficulties: true);
+            loadBeatmaps(setCount: 5, randomDifficulties: true);
 
             AddStep("remove first set", () => carousel.RemoveBeatmapSet(carousel.Items.Select(item => item.Item).OfType<CarouselBeatmapSet>().First().BeatmapSet));
             AddUntilStep("4 beatmap sets visible", () => this.ChildrenOfType<DrawableCarouselBeatmapSet>().Count(set => set.Alpha > 0) == 4);
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestScrollPositionMaintainedOnDelete()
         {
-            loadBeatmaps(count: 50, randomDifficulties: false);
+            loadBeatmaps(setCount: 50);
 
             for (int i = 0; i < 10; i++)
             {
@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestManyPanels()
         {
-            loadBeatmaps(count: 5000, randomDifficulties: true);
+            loadBeatmaps(setCount: 5000, randomDifficulties: true);
         }
 
         [Test]
@@ -505,31 +505,34 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestAddRemoveDifficultySort()
         {
-            loadBeatmaps();
+            const int local_set_count = 1;
+            const int local_diff_count = 1;
+
+            loadBeatmaps(setCount: local_set_count, diffCount: local_diff_count);
 
             AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
 
-            checkVisibleItemCount(false, set_count * diff_count);
+            checkVisibleItemCount(false, local_set_count * local_diff_count);
 
-            var firstAdded = TestResources.CreateTestBeatmapSetInfo(diff_count);
-            var secondAdded = TestResources.CreateTestBeatmapSetInfo(diff_count);
+            var firstAdded = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
+            var secondAdded = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
 
             AddStep("Add new set", () => carousel.UpdateBeatmapSet(firstAdded));
             AddStep("Add new set", () => carousel.UpdateBeatmapSet(secondAdded));
 
-            checkVisibleItemCount(false, (set_count + 2) * diff_count);
+            checkVisibleItemCount(false, (local_set_count + 2) * local_diff_count);
 
             AddStep("Remove set", () => carousel.RemoveBeatmapSet(firstAdded));
 
-            checkVisibleItemCount(false, (set_count + 1) * diff_count);
+            checkVisibleItemCount(false, (local_set_count + 1) * local_diff_count);
 
-            setSelected(set_count + 1, 1);
+            setSelected(local_set_count + 1, 1);
 
             AddStep("Remove set", () => carousel.RemoveBeatmapSet(secondAdded));
 
-            checkVisibleItemCount(false, (set_count) * diff_count);
+            checkVisibleItemCount(false, (local_set_count) * local_diff_count);
 
-            waitForSelection(set_count);
+            waitForSelection(local_set_count);
         }
 
         [Test]
@@ -1171,8 +1174,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             }
         }
 
-        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null, Action<BeatmapCarousel> carouselAdjust = null, int? count = null,
-                                  bool randomDifficulties = false)
+        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null, Action<BeatmapCarousel> carouselAdjust = null,
+                                  int? setCount = null, int? diffCount = null, bool randomDifficulties = false)
         {
             bool changed = false;
 
@@ -1180,11 +1183,11 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 beatmapSets = new List<BeatmapSetInfo>();
 
-                for (int i = 1; i <= (count ?? set_count); i++)
+                for (int i = 1; i <= (setCount ?? set_count); i++)
                 {
                     beatmapSets.Add(randomDifficulties
                         ? TestResources.CreateTestBeatmapSetInfo()
-                        : TestResources.CreateTestBeatmapSetInfo(diff_count));
+                        : TestResources.CreateTestBeatmapSetInfo(diffCount ?? diff_count));
                 }
             }
 

From 981e0c1ad7f46372e497828ea744b2f05f444206 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 14:26:26 +0900
Subject: [PATCH 1173/2100] Rename export test step to better fit purpose

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index eff96febaa..f52c23d7e2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -468,7 +468,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             if (exportLocation != null)
             {
-                AddStep("create beatmap", () =>
+                AddStep("export beatmap", () =>
                 {
                     var beatmapEncoder = new LegacyBeatmapEncoder(playableBeatmap, null);
 

From a045cb71fc3d94f7d0d4f2bc0ab4ff770a1e0878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 19:44:22 +0200
Subject: [PATCH 1174/2100] Add assertions checking action type taken by legacy
 hit policy

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 35 +++++++++++++++++++
 osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs   |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 8a38bf2b08..afda805d26 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -11,17 +11,20 @@ using NUnit.Framework;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Replays;
 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.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -83,6 +86,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // note lock prevented the object from being hit, so the judgement offset should be very late.
             addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
+            addClickActionAssert(0, ClickAction.Shake);
         }
 
         /// <summary>
@@ -119,6 +123,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // note lock prevented the object from being hit, so the judgement offset should be very late.
             addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
+            addClickActionAssert(0, ClickAction.Shake);
         }
 
         /// <summary>
@@ -155,6 +160,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // note lock prevented the object from being hit, so the judgement offset should be very late.
             addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
+            addClickActionAssert(0, ClickAction.Shake);
         }
 
         /// <summary>
@@ -192,6 +198,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Meh);
             addJudgementOffsetAssert(hitObjects[0], -190); // time_first_circle - 190
             addJudgementOffsetAssert(hitObjects[0], -90); // time_second_circle - first_circle_time - 90
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
         }
 
         /// <summary>
@@ -229,6 +237,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Ok);
             addJudgementOffsetAssert(hitObjects[0], -190); // time_first_circle - 190
             addJudgementOffsetAssert(hitObjects[1], -100); // time_second_circle - first_circle_time
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
         }
 
         /// <summary>
@@ -271,6 +281,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Great);
             addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
         }
 
         /// <summary>
@@ -314,6 +326,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Great);
             addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
         }
 
         /// <summary>
@@ -353,6 +367,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Meh);
+            addClickActionAssert(0, ClickAction.Hit);
         }
 
         [Test]
@@ -391,6 +406,9 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Great);
+            addClickActionAssert(0, ClickAction.Shake);
+            addClickActionAssert(1, ClickAction.Hit);
+            addClickActionAssert(2, ClickAction.Hit);
         }
 
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
@@ -411,8 +429,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, () => Is.EqualTo(offset).Within(100));
         }
 
+        private void addClickActionAssert(int inputIndex, ClickAction action)
+            => AddAssert($"input #{inputIndex} resulted in {action}", () => testPolicy.ClickActions[inputIndex], () => Is.EqualTo(action));
+
         private ScoreAccessibleReplayPlayer currentPlayer = null!;
         private List<JudgementResult> judgementResults = null!;
+        private TestLegacyHitPolicy testPolicy = null!;
 
         private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames, [CallerMemberName] string testCaseName = "")
         {
@@ -513,6 +535,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+            AddStep("Substitute hit policy", () => currentPlayer.ChildrenOfType<OsuPlayfield>().Single().HitPolicy = testPolicy = new TestLegacyHitPolicy());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
@@ -540,5 +563,17 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
             }
         }
+
+        private class TestLegacyHitPolicy : LegacyHitPolicy
+        {
+            public List<ClickAction> ClickActions { get; } = new List<ClickAction>();
+
+            public override ClickAction CheckHittable(DrawableHitObject hitObject, double time)
+            {
+                var action = base.CheckHittable(hitObject, time);
+                ClickActions.Add(action);
+                return action;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
index c35d4a1b56..6a740a6839 100644
--- a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.UI
         {
         }
 
-        public ClickAction CheckHittable(DrawableHitObject hitObject, double time)
+        public virtual ClickAction CheckHittable(DrawableHitObject hitObject, double time)
         {
             var aliveObjects = HitObjectContainer.AliveObjects.ToList();
             int index = aliveObjects.IndexOf(hitObject);

From 9ffc6cdd6110a94524c37b8d2c5bd3eaabb7e5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 19:58:31 +0200
Subject: [PATCH 1175/2100] Add test case covering overlapping slider fail case

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index afda805d26..fbbac91af5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -411,6 +411,53 @@ namespace osu.Game.Rulesets.Osu.Tests
             addClickActionAssert(2, ClickAction.Hit);
         }
 
+        [Test]
+        public void TestOverlappingSliders()
+        {
+            const double time_first_slider = 1000;
+            const double time_second_slider = 1200;
+            Vector2 positionFirstSlider = new Vector2(100, 50);
+            Vector2 positionSecondSlider = new Vector2(100, 80);
+            var midpoint = (positionFirstSlider + positionSecondSlider) / 2;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new Slider
+                {
+                    StartTime = time_first_slider,
+                    Position = positionFirstSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                },
+                new Slider
+                {
+                    StartTime = time_second_slider,
+                    Position = positionSecondSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_slider, Position = midpoint, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_first_slider + 25, Position = midpoint, Actions = { OsuAction.LeftButton, OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_first_slider + 50, Position = midpoint },
+                new OsuReplayFrame { Time = time_second_slider, Position = positionSecondSlider + new Vector2(0, 10), Actions = { OsuAction.LeftButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Ok);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",

From 48b3f7dced93f0600fdf22837c5b9c94308bf1f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 20:34:36 +0200
Subject: [PATCH 1176/2100] Add test case covering stacks not shaking

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index fbbac91af5..738d1a0739 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -458,6 +458,26 @@ namespace osu.Game.Rulesets.Osu.Tests
             addClickActionAssert(1, ClickAction.Hit);
         }
 
+        [Test]
+        public void TestStacksDoNotShake()
+        {
+            const double time_stack_start = 1000;
+            Vector2 position = new Vector2(80);
+
+            var hitObjects = Enumerable.Range(0, 20).Select(i => new HitCircle
+            {
+                StartTime = time_stack_start + i * 100,
+                Position = position
+            }).Cast<OsuHitObject>().ToList();
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_stack_start - 450, Position = new Vector2(55), Actions = { OsuAction.LeftButton } },
+            });
+
+            addClickActionAssert(0, ClickAction.Ignore);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",

From 64b36a73b10691c38889fb5ed530e7c08e53c0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 12:43:53 +0200
Subject: [PATCH 1177/2100] Rename test scene to match tested class

---
 ...eObjectOrderedHitPolicy.cs => TestSceneLegacyHitPolicy.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Rulesets.Osu.Tests/{TestSceneObjectOrderedHitPolicy.cs => TestSceneLegacyHitPolicy.cs} (99%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
rename to osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 738d1a0739..6366a185f2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -35,7 +35,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public partial class TestSceneObjectOrderedHitPolicy : RateAdjustedBeatmapTestScene
+    public partial class TestSceneLegacyHitPolicy : RateAdjustedBeatmapTestScene
     {
         private readonly OsuHitWindows referenceHitWindows;
 
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// </summary>
         private readonly string? exportLocation = null;
 
-        public TestSceneObjectOrderedHitPolicy()
+        public TestSceneLegacyHitPolicy()
         {
             referenceHitWindows = new OsuHitWindows();
             referenceHitWindows.SetDifficulty(0);

From ed2b1a07540fe4038b03424abe14582de495b661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 13:12:18 +0200
Subject: [PATCH 1178/2100] Contain entirety of legacy notelock badness inside
 the hit policy

---
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs        | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs  | 4 ++--
 .../Objects/Drawables/DrawableHitCircle.cs               | 9 +++------
 .../Objects/Drawables/DrawableOsuHitObject.cs            | 3 ++-
 .../Objects/Drawables/DrawableSliderHead.cs              | 2 +-
 osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs            | 3 ++-
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs                   | 4 +++-
 osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs              | 6 +++++-
 osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs    | 5 +++--
 9 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index c818a361df..af02087d1a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (auto && !userTriggered && timeOffset > hitOffset && CheckHittable?.Invoke(this, Time.Current) == ClickAction.Hit)
+                if (auto && !userTriggered && timeOffset > hitOffset && CheckHittable?.Invoke(this, Time.Current, HitResult.Great) == ClickAction.Hit)
                 {
                     // force success
                     ApplyResult(r => r.Type = HitResult.Great);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 6366a185f2..3accf4fad7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -635,9 +635,9 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             public List<ClickAction> ClickActions { get; } = new List<ClickAction>();
 
-            public override ClickAction CheckHittable(DrawableHitObject hitObject, double time)
+            public override ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result)
             {
-                var action = base.CheckHittable(hitObject, time);
+                var action = base.CheckHittable(hitObject, time, result);
                 ClickActions.Add(action);
                 return action;
             }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 09d818def8..932f6d3fff 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -155,15 +155,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             var result = ResultFor(timeOffset);
-            var clickAction = CheckHittable?.Invoke(this, Time.Current);
+            var clickAction = CheckHittable?.Invoke(this, Time.Current, result);
 
-            if (clickAction == ClickAction.Shake || (result == HitResult.None && clickAction != ClickAction.Ignore))
-            {
+            if (clickAction == ClickAction.Shake)
                 Shake();
-                return;
-            }
 
-            if (result == HitResult.None)
+            if (result == HitResult.None || clickAction != ClickAction.Hit)
                 return;
 
             ApplyResult(r =>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index a8ce2118c8..920dfcab03 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -37,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// and <see cref="ClickAction.Shake"/>, and this hit object will be shaken for return values of
         /// <see cref="ClickAction.Shake"/>.
         /// </summary>
-        public Func<DrawableHitObject, double, ClickAction> CheckHittable;
+        public Func<DrawableHitObject, double, HitResult, ClickAction> CheckHittable;
 
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index a4cf69ee31..41f6a40c0a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             pathVersion.BindTo(DrawableSlider.PathVersion);
 
-            CheckHittable = (d, t) => DrawableSlider.CheckHittable?.Invoke(d, t) ?? ClickAction.Hit;
+            CheckHittable = (d, t, r) => DrawableSlider.CheckHittable?.Invoke(d, t, r) ?? ClickAction.Hit;
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
index 7503c43e0b..69bd360b5e 100644
--- a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -15,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
-        public ClickAction CheckHittable(DrawableHitObject hitObject, double time) => ClickAction.Hit;
+        public ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result) => ClickAction.Hit;
 
         public void HandleHit(DrawableHitObject hitObject)
         {
diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
index 9820b8c188..44d3b37408 100644
--- a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
@@ -3,6 +3,7 @@
 
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -19,8 +20,9 @@ namespace osu.Game.Rulesets.Osu.UI
         /// </summary>
         /// <param name="hitObject">The <see cref="DrawableHitObject"/> to check.</param>
         /// <param name="time">The time to check.</param>
+        /// <param name="result">The result that the object would be judged with if hit.</param>
         /// <returns>Whether <paramref name="hitObject"/> can be hit at the given <paramref name="time"/>.</returns>
-        ClickAction CheckHittable(DrawableHitObject hitObject, double time);
+        ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result);
 
         /// <summary>
         /// Handles a <see cref="HitObject"/> being hit.
diff --git a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
index 6a740a6839..5260215345 100644
--- a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -26,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.UI
         {
         }
 
-        public virtual ClickAction CheckHittable(DrawableHitObject hitObject, double time)
+        public virtual ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result)
         {
             var aliveObjects = HitObjectContainer.AliveObjects.ToList();
             int index = aliveObjects.IndexOf(hitObject);
@@ -38,6 +39,9 @@ namespace osu.Game.Rulesets.Osu.UI
                     return ClickAction.Ignore;
             }
 
+            if (result == HitResult.None)
+                return ClickAction.Shake;
+
             foreach (DrawableHitObject testObject in aliveObjects)
             {
                 if (testObject.AllJudged)
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index f33ca58aef..6fd0b512be 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -24,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
-        public ClickAction CheckHittable(DrawableHitObject hitObject, double time)
+        public ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult _)
         {
             DrawableHitObject blockingObject = null;
 
@@ -51,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
 
-            if (CheckHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset) != ClickAction.Hit)
+            if (CheckHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset, hitObject.Result.Type) != ClickAction.Hit)
                 throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
 
             // Miss all hitobjects prior to the hit one.

From a3160364603211a7dd1d06e1996c8603d5c700df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 13:20:38 +0200
Subject: [PATCH 1179/2100] Add failing test case for special autopilot
 hittable range

---
 .../TestSceneLegacyHitPolicy.cs               | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 3accf4fad7..cc5c27a62c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -17,6 +17,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
@@ -478,6 +479,32 @@ namespace osu.Game.Rulesets.Osu.Tests
             addClickActionAssert(0, ClickAction.Ignore);
         }
 
+        [Test]
+        public void TestAutopilotReducesHittableRange()
+        {
+            const double time_circle = 1500;
+            Vector2 positionCircle = Vector2.Zero;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new HitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_circle - 250, Position = positionCircle, Actions = { OsuAction.LeftButton } }
+            }, new Mod[] { new OsuModAutopilot() });
+
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            // note lock prevented the object from being hit, so the judgement offset should be very late.
+            addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
+            addClickActionAssert(0, ClickAction.Shake);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
@@ -503,11 +530,20 @@ namespace osu.Game.Rulesets.Osu.Tests
         private List<JudgementResult> judgementResults = null!;
         private TestLegacyHitPolicy testPolicy = null!;
 
-        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames, [CallerMemberName] string testCaseName = "")
+        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames, IEnumerable<Mod>? extraMods = null, [CallerMemberName] string testCaseName = "")
         {
+            List<Mod> mods = null!;
             IBeatmap playableBeatmap = null!;
             Score score = null!;
 
+            AddStep("set up mods", () =>
+            {
+                mods = new List<Mod> { new OsuModClassic() };
+
+                if (extraMods != null)
+                    mods.AddRange(extraMods);
+            });
+
             AddStep("create beatmap", () =>
             {
                 var cpi = new ControlPointInfo();
@@ -550,7 +586,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                     ScoreInfo =
                     {
                         Ruleset = new OsuRuleset().RulesetInfo,
-                        BeatmapInfo = playableBeatmap.BeatmapInfo
+                        BeatmapInfo = playableBeatmap.BeatmapInfo,
+                        Mods = mods.ToArray()
                     }
                 };
             });
@@ -584,7 +621,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddStep("load player", () =>
             {
-                SelectedMods.Value = new[] { new OsuModClassic() };
+                SelectedMods.Value = mods.ToArray();
 
                 var p = new ScoreAccessibleReplayPlayer(score);
 

From 7f215f163ffc307ce9060e9d32f572162996e5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 13:37:39 +0200
Subject: [PATCH 1180/2100] Use reduced hittable range with autopilot active

---
 .../TestSceneLegacyHitPolicy.cs                  | 16 ++++++++++++++--
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs      |  6 +++++-
 osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs      | 14 +++++++++-----
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index cc5c27a62c..b4ab53a658 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -639,7 +639,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
-            AddStep("Substitute hit policy", () => currentPlayer.ChildrenOfType<OsuPlayfield>().Single().HitPolicy = testPolicy = new TestLegacyHitPolicy());
+            AddStep("Substitute hit policy", () =>
+            {
+                var playfield = currentPlayer.ChildrenOfType<OsuPlayfield>().Single();
+                var currentPolicy = playfield.HitPolicy;
+                playfield.HitPolicy = testPolicy = new TestLegacyHitPolicy(currentPolicy);
+            });
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
@@ -670,11 +675,18 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class TestLegacyHitPolicy : LegacyHitPolicy
         {
+            private readonly IHitPolicy currentPolicy;
+
+            public TestLegacyHitPolicy(IHitPolicy currentPolicy)
+            {
+                this.currentPolicy = currentPolicy;
+            }
+
             public List<ClickAction> ClickActions { get; } = new List<ClickAction>();
 
             public override ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result)
             {
-                var action = base.CheckHittable(hitObject, time, result);
+                var action = currentPolicy.CheckHittable(hitObject, time, result);
                 ClickActions.Add(action);
                 return action;
             }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 229f80c2bd..82deec41f5 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
@@ -57,7 +58,10 @@ namespace osu.Game.Rulesets.Osu.Mods
             var osuRuleset = (DrawableOsuRuleset)drawableRuleset;
 
             if (ClassicNoteLock.Value)
-                osuRuleset.Playfield.HitPolicy = new LegacyHitPolicy();
+            {
+                double hittableRange = OsuHitWindows.MISS_WINDOW - (drawableRuleset.Mods.OfType<OsuModAutopilot>().Any() ? 200 : 0);
+                osuRuleset.Playfield.HitPolicy = new LegacyHitPolicy(hittableRange);
+            }
 
             usingHiddenFading = drawableRuleset.Mods.OfType<OsuModHidden>().SingleOrDefault()?.OnlyFadeApproachCircles.Value == false;
         }
diff --git a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
index 5260215345..2b6359fb46 100644
--- a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
@@ -23,6 +24,13 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
+        private readonly double hittableRange;
+
+        public LegacyHitPolicy(double hittableRange = OsuHitWindows.MISS_WINDOW)
+        {
+            this.hittableRange = hittableRange;
+        }
+
         public void HandleHit(DrawableHitObject hitObject)
         {
         }
@@ -57,11 +65,7 @@ namespace osu.Game.Rulesets.Osu.UI
                     return ClickAction.Shake;
             }
 
-            // stable has `const HitObjectManager.HITTABLE_RANGE = 400;`, which is only used for notelock code.
-            // probably not a coincidence that this is equivalent to lazer's OsuHitWindows.MISS_WINDOW.
-
-            // TODO stable compares to 200 when autopilot is enabled, instead of 400.
-            return Math.Abs(hitObject.HitObject.StartTime - time) < 400 ? ClickAction.Hit : ClickAction.Shake;
+            return Math.Abs(hitObject.HitObject.StartTime - time) < hittableRange ? ClickAction.Hit : ClickAction.Shake;
         }
     }
 }

From 38e34593911801c0f31a8ca787b142c18f54b9fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Aug 2023 08:54:38 +0200
Subject: [PATCH 1181/2100] Fix broken assertion

---
 osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index b4ab53a658..2cfbe6611f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -198,7 +198,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[0], HitResult.Meh);
             addJudgementAssert(hitObjects[1], HitResult.Meh);
             addJudgementOffsetAssert(hitObjects[0], -190); // time_first_circle - 190
-            addJudgementOffsetAssert(hitObjects[0], -90); // time_second_circle - first_circle_time - 90
+            addJudgementOffsetAssert(hitObjects[1], -190); // time_second_circle - first_circle_time - 90
             addClickActionAssert(0, ClickAction.Hit);
             addClickActionAssert(1, ClickAction.Hit);
         }
@@ -520,7 +520,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void addJudgementOffsetAssert(OsuHitObject hitObject, double offset)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",
-                () => judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, () => Is.EqualTo(offset).Within(100));
+                () => judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, () => Is.EqualTo(offset).Within(50));
         }
 
         private void addClickActionAssert(int inputIndex, ClickAction action)

From 2e27a476bb3c4b90d08384cfda3da7e60774e278 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 24 Aug 2023 18:04:47 +0900
Subject: [PATCH 1182/2100] Re-enable sample playback for
 `PasswordEntryPopover` and remove `sampleJoin` playback instead

---
 osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs       | 11 +++--------
 .../Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs   |  5 -----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
index 2aa42d0d50..551468beb9 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
         // required due to LoadAsyncComplete() calling PopOut() during load - similar workaround to `OsuDropdownMenu`
         private bool wasOpened;
 
-        protected virtual bool PlayPopInOutSamples => true;
-
         public OsuPopover(bool withPadding = true)
         {
             Content.Padding = withPadding ? new MarginPadding(20) : new MarginPadding();
@@ -64,11 +62,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
             this.ScaleTo(1, scale_duration, Easing.OutElasticHalf);
             this.FadeIn(fade_duration, Easing.OutQuint);
 
-            if (PlayPopInOutSamples)
-            {
-                samplePopIn?.Play();
-                wasOpened = true;
-            }
+            samplePopIn?.Play();
+            wasOpened = true;
         }
 
         protected override void PopOut()
@@ -76,7 +71,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
             this.ScaleTo(0.7f, scale_duration, Easing.OutQuint);
             this.FadeOut(fade_duration, Easing.OutQuint);
 
-            if (wasOpened && PlayPopInOutSamples)
+            if (wasOpened)
                 samplePopOut?.Play();
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
index a45583a2ec..5cf2f91ff4 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
@@ -170,7 +170,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             if (Room.HasPassword.Value)
             {
-                sampleJoin?.Play();
                 this.ShowPopover();
                 return true;
             }
@@ -191,10 +190,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             protected override bool BlockNonPositionalInput => true;
 
-            // When a room is clicked, it already plays a click sound, which clashes pretty badly with the pop in sound.
-            // Dunno about this one. I'd probably remove the click sound from the panel in cases they are password protected and play these pop in / out sounds.
-            protected override bool PlayPopInOutSamples => false;
-
             public PasswordEntryPopover(Room room)
             {
                 this.room = room;

From 7ef5a71e91a56a3e8340393376a97973ceb3e266 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 24 Aug 2023 18:13:23 +0900
Subject: [PATCH 1183/2100] Move PopIn/PopOut sample playback from
 `WaveOverlayContainer` to `WaveContainer` (so Multiplayer/Lounge plays the
 samples)

---
 osu.Game/Graphics/Containers/WaveContainer.cs | 22 +++++++++++++++++++
 osu.Game/Overlays/WaveOverlayContainer.cs     |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/WaveContainer.cs b/osu.Game/Graphics/Containers/WaveContainer.cs
index 9fd3d103c9..0b1d44ccba 100644
--- a/osu.Game/Graphics/Containers/WaveContainer.cs
+++ b/osu.Game/Graphics/Containers/WaveContainer.cs
@@ -2,6 +2,9 @@
 // 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.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -32,6 +35,13 @@ namespace osu.Game.Graphics.Containers
 
         protected override bool StartHidden => true;
 
+        private Sample? samplePopIn;
+        private Sample? samplePopOut;
+        protected virtual string PopInSampleName => "UI/wave-pop-in";
+        protected virtual string PopOutSampleName => "UI/overlay-big-pop-out";
+
+        private bool wasShown = false;
+
         public Color4 FirstWaveColour
         {
             get => firstWave.Colour;
@@ -56,6 +66,13 @@ namespace osu.Game.Graphics.Containers
             set => fourthWave.Colour = value;
         }
 
+        [BackgroundDependencyLoader(true)]
+        private void load(AudioManager audio)
+        {
+            samplePopIn = audio.Samples.Get(PopInSampleName);
+            samplePopOut = audio.Samples.Get(PopOutSampleName);
+        }
+
         public WaveContainer()
         {
             Masking = true;
@@ -110,6 +127,8 @@ namespace osu.Game.Graphics.Containers
                 w.Show();
 
             contentContainer.MoveToY(0, APPEAR_DURATION, Easing.OutQuint);
+            samplePopIn?.Play();
+            wasShown = true;
         }
 
         protected override void PopOut()
@@ -118,6 +137,9 @@ namespace osu.Game.Graphics.Containers
                 w.Hide();
 
             contentContainer.MoveToY(2, DISAPPEAR_DURATION, Easing.In);
+
+            if (wasShown)
+                samplePopOut?.Play();
         }
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index 848d9e60b7..b0ddef5c2b 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -18,8 +18,9 @@ namespace osu.Game.Overlays
 
         protected override bool StartHidden => true;
 
-        protected override string PopInSampleName => "UI/wave-pop-in";
-        protected override string PopOutSampleName => "UI/overlay-big-pop-out";
+        // `WaveContainer` plays PopIn/PopOut samples, so we disable the overlay-level one as to not double-up sample playback.
+        protected override string PopInSampleName => "";
+        protected override string PopOutSampleName => "";
 
         public const float HORIZONTAL_PADDING = 50;
 

From f4415a5bab9aec67ea77af89c794921dae6a8c4e Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 24 Aug 2023 18:20:36 +0900
Subject: [PATCH 1184/2100] Add more detail to comment

---
 osu.Game/Graphics/Containers/WaveContainer.cs   | 3 ++-
 osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/WaveContainer.cs b/osu.Game/Graphics/Containers/WaveContainer.cs
index 0b1d44ccba..09d1f7e9a4 100644
--- a/osu.Game/Graphics/Containers/WaveContainer.cs
+++ b/osu.Game/Graphics/Containers/WaveContainer.cs
@@ -40,7 +40,8 @@ namespace osu.Game.Graphics.Containers
         protected virtual string PopInSampleName => "UI/wave-pop-in";
         protected virtual string PopOutSampleName => "UI/overlay-big-pop-out";
 
-        private bool wasShown = false;
+        // required due to LoadAsyncComplete() in `VisibilityContainer` calling PopOut() during load - similar workaround to `OsuDropdownMenu`
+        private bool wasShown;
 
         public Color4 FirstWaveColour
         {
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
index 551468beb9..9b4689958c 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         protected virtual string PopInSampleName => "UI/overlay-pop-in";
         protected virtual string PopOutSampleName => "UI/overlay-pop-out";
 
-        // required due to LoadAsyncComplete() calling PopOut() during load - similar workaround to `OsuDropdownMenu`
+        // required due to LoadAsyncComplete() in `VisibilityContainer` calling PopOut() during load - similar workaround to `OsuDropdownMenu`
         private bool wasOpened;
 
         public OsuPopover(bool withPadding = true)

From b471ab07a62dc225275154efdfd15c46646f0104 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 18:30:59 +0900
Subject: [PATCH 1185/2100] Fix typo in test step
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.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 8a38e2a84b..110466f6d5 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -1016,7 +1016,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             List<BeatmapSetInfo> manySets = new List<BeatmapSetInfo>();
 
-            AddStep("Populuate beatmap sets", () =>
+            AddStep("Populate beatmap sets", () =>
             {
                 manySets.Clear();
 

From 9e94f3809103b6079a158e19050f9bc15829235a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 18:33:15 +0900
Subject: [PATCH 1186/2100] Fix typo in local variable

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index c5e46a00b6..91d1ced9d9 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Select
                 selectedBeatmapSet = null;
 
             var selectedSetBefore = selectedBeatmapSet;
-            var selectedBetmapBefore = selectedBeatmap;
+            var selectedBeatmapBefore = selectedBeatmap;
 
             CarouselRoot newRoot = new CarouselRoot(this);
 
@@ -170,9 +170,9 @@ namespace osu.Game.Screens.Select
                 signalBeatmapsLoaded();
 
             // Restore selection
-            if (selectedBetmapBefore != null && selectedSetBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedSetBefore.BeatmapSet.ID, out var newSelectionCandidates))
+            if (selectedBeatmapBefore != null && selectedSetBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedSetBefore.BeatmapSet.ID, out var newSelectionCandidates))
             {
-                CarouselBeatmap? found = newSelectionCandidates.SelectMany(s => s.Beatmaps).SingleOrDefault(b => b.BeatmapInfo.ID == selectedBetmapBefore.BeatmapInfo.ID);
+                CarouselBeatmap? found = newSelectionCandidates.SelectMany(s => s.Beatmaps).SingleOrDefault(b => b.BeatmapInfo.ID == selectedBeatmapBefore.BeatmapInfo.ID);
 
                 if (found != null)
                     found.State.Value = CarouselItemState.Selected;

From 49598774e0886279bd17caacdcbe4a57af646481 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Thu, 24 Aug 2023 15:00:32 +0300
Subject: [PATCH 1187/2100] Added a "Adjust pitch" switch

Adjust pitch switch in DoubleTime and HalfTime mods
Also Nightcore and Daycore is now inherit from RateAdjust
---
 osu.Game/Rulesets/Mods/ModDaycore.cs    | 26 +++++++++++++++++++++-
 osu.Game/Rulesets/Mods/ModDoubleTime.cs | 26 ++++++++++++++++++++++
 osu.Game/Rulesets/Mods/ModHalfTime.cs   | 26 ++++++++++++++++++++++
 osu.Game/Rulesets/Mods/ModNightcore.cs  | 29 ++++++++++++++++++++++++-
 osu.Game/Rulesets/Mods/ModRateAdjust.cs |  5 +----
 5 files changed, 106 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index de1a5ab56c..c5810cc9e5 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -5,16 +5,26 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModDaycore : ModHalfTime
+    public abstract class ModDaycore : ModRateAdjust
     {
         public override string Name => "Daycore";
         public override string Acronym => "DC";
         public override IconUsage? Icon => null;
+        public override ModType Type => ModType.DifficultyReduction;
         public override LocalisableString Description => "Whoaaaaa...";
 
+        [SettingSource("Speed decrease", "The actual decrease to apply")]
+        public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(0.75)
+        {
+            MinValue = 0.5,
+            MaxValue = 0.99,
+            Precision = 0.01,
+        };
+
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
         private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
 
@@ -33,5 +43,19 @@ namespace osu.Game.Rulesets.Mods
             track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
+
+        public override double ScoreMultiplier
+        {
+            get
+            {
+                // Round to the nearest multiple of 0.1.
+                double value = (int)(SpeedChange.Value * 10) / 10.0;
+
+                // Offset back to 0.
+                value -= 1;
+
+                return 1 + value;
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 733610c040..ad196ec83c 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.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.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -25,6 +26,31 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
+        private IAdjustableAudioComponent? track;
+
+        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
+        public virtual BindableBool AdjustPitch { get; } = new BindableBool(false);
+
+        protected ModDoubleTime()
+        {
+            AdjustPitch.BindValueChanged(adjustPitchChanged);
+        }
+
+        private void adjustPitchChanged(ValueChangedEvent<bool> adjustPitchSetting)
+        {
+            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
+            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
+        }
+
+        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
+            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
+
+        public override void ApplyToTrack(IAdjustableAudioComponent track)
+        {
+            this.track = track;
+            AdjustPitch.TriggerChange();
+        }
+
         public override double ScoreMultiplier
         {
             get
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 06c7750035..047dd4bd04 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.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.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -25,6 +26,31 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
+        private IAdjustableAudioComponent? track;
+
+        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
+        public virtual BindableBool AdjustPitch { get; } = new BindableBool(false);
+
+        protected ModHalfTime()
+        {
+            AdjustPitch.BindValueChanged(adjustPitchChanged);
+        }
+
+        private void adjustPitchChanged(ValueChangedEvent<bool> adjustPitchSetting)
+        {
+            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
+            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
+        }
+
+        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
+            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
+
+        public override void ApplyToTrack(IAdjustableAudioComponent track)
+        {
+            this.track = track;
+            AdjustPitch.TriggerChange();
+        }
+
         public override double ScoreMultiplier
         {
             get
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 9b1f7d5cf7..80b9314aec 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -11,6 +11,7 @@ using osu.Framework.Localisation;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
@@ -19,12 +20,38 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModNightcore : ModDoubleTime
+    public abstract class ModNightcore : ModRateAdjust
     {
         public override string Name => "Nightcore";
         public override string Acronym => "NC";
         public override IconUsage? Icon => OsuIcon.ModNightcore;
+        public override ModType Type => ModType.DifficultyIncrease;
         public override LocalisableString Description => "Uguuuuuuuu...";
+
+        [SettingSource("Speed increase", "The actual increase to apply")]
+        public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(1.5)
+        {
+            MinValue = 1.01,
+            MaxValue = 2,
+            Precision = 0.01,
+        };
+
+        public override double ScoreMultiplier
+        {
+            get
+            {
+                // Round to the nearest multiple of 0.1.
+                double value = (int)(SpeedChange.Value * 10) / 10.0;
+
+                // Offset back to 0.
+                value -= 1;
+
+                // Each 0.1 multiple changes score multiplier by 0.02.
+                value /= 5;
+
+                return 1 + value;
+            }
+        }
     }
 
     public abstract partial class ModNightcore<TObject> : ModNightcore, IApplicableToDrawableRuleset<TObject>
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index 7b55ba4ad0..6bf4b65e3b 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -13,10 +13,7 @@ namespace osu.Game.Rulesets.Mods
 
         public abstract BindableNumber<double> SpeedChange { get; }
 
-        public virtual void ApplyToTrack(IAdjustableAudioComponent track)
-        {
-            track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
-        }
+        public abstract void ApplyToTrack(IAdjustableAudioComponent track);
 
         public virtual void ApplyToSample(IAdjustableAudioComponent sample)
         {

From 89eeff515b42a9724ffd2e552f9e7d462f848d5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2023 00:52:54 +0900
Subject: [PATCH 1188/2100] Reduce complexity of selection restore

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 91d1ced9d9..d52b5592f8 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -134,8 +134,7 @@ namespace osu.Game.Screens.Select
             if (selectedBeatmapSet != null && !originalBeatmapSetsDetached.Contains(selectedBeatmapSet.BeatmapSet))
                 selectedBeatmapSet = null;
 
-            var selectedSetBefore = selectedBeatmapSet;
-            var selectedBeatmapBefore = selectedBeatmap;
+            var selectedBeatmapBefore = selectedBeatmap?.BeatmapInfo;
 
             CarouselRoot newRoot = new CarouselRoot(this);
 
@@ -170,9 +169,9 @@ namespace osu.Game.Screens.Select
                 signalBeatmapsLoaded();
 
             // Restore selection
-            if (selectedBeatmapBefore != null && selectedSetBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedSetBefore.BeatmapSet.ID, out var newSelectionCandidates))
+            if (selectedBeatmapBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedBeatmapBefore.BeatmapSet!.ID, out var newSelectionCandidates))
             {
-                CarouselBeatmap? found = newSelectionCandidates.SelectMany(s => s.Beatmaps).SingleOrDefault(b => b.BeatmapInfo.ID == selectedBeatmapBefore.BeatmapInfo.ID);
+                CarouselBeatmap? found = newSelectionCandidates.SelectMany(s => s.Beatmaps).SingleOrDefault(b => b.BeatmapInfo.ID == selectedBeatmapBefore.ID);
 
                 if (found != null)
                     found.State.Value = CarouselItemState.Selected;

From 35cdd6d8661b2b4df2735e4128c3334fd014670f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2023 01:07:07 +0900
Subject: [PATCH 1189/2100] Use `string.Empty`

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

diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index b0ddef5c2b..0295ff467a 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Overlays
         protected override bool StartHidden => true;
 
         // `WaveContainer` plays PopIn/PopOut samples, so we disable the overlay-level one as to not double-up sample playback.
-        protected override string PopInSampleName => "";
-        protected override string PopOutSampleName => "";
+        protected override string PopInSampleName => string.Empty;
+        protected override string PopOutSampleName => string.Empty;
 
         public const float HORIZONTAL_PADDING = 50;
 

From bf0f4fddad3c2c5e6a54b41333fea68daef82b2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2023 01:08:22 +0900
Subject: [PATCH 1190/2100] Localise non-overridden samples

---
 osu.Game/Graphics/Containers/WaveContainer.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/WaveContainer.cs b/osu.Game/Graphics/Containers/WaveContainer.cs
index 09d1f7e9a4..e84cb276a4 100644
--- a/osu.Game/Graphics/Containers/WaveContainer.cs
+++ b/osu.Game/Graphics/Containers/WaveContainer.cs
@@ -37,8 +37,6 @@ namespace osu.Game.Graphics.Containers
 
         private Sample? samplePopIn;
         private Sample? samplePopOut;
-        protected virtual string PopInSampleName => "UI/wave-pop-in";
-        protected virtual string PopOutSampleName => "UI/overlay-big-pop-out";
 
         // required due to LoadAsyncComplete() in `VisibilityContainer` calling PopOut() during load - similar workaround to `OsuDropdownMenu`
         private bool wasShown;
@@ -70,8 +68,8 @@ namespace osu.Game.Graphics.Containers
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio)
         {
-            samplePopIn = audio.Samples.Get(PopInSampleName);
-            samplePopOut = audio.Samples.Get(PopOutSampleName);
+            samplePopIn = audio.Samples.Get("UI/wave-pop-in");
+            samplePopOut = audio.Samples.Get("UI/overlay-big-pop-out");
         }
 
         public WaveContainer()

From 4fd165c0a7dc6b9c49cb0e675de6084ed47fbdc0 Mon Sep 17 00:00:00 2001
From: Dreamurrrr <21233238+Dreamurrrr@users.noreply.github.com>
Date: Thu, 24 Aug 2023 13:28:17 -0500
Subject: [PATCH 1191/2100] Update README.md to include VS Code plugin
 prerequisites

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf7ce35791..792e2d646a 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Please make sure you have the following prerequisites:
 
 - A desktop platform with the [.NET 6.0 SDK](https://dotnet.microsoft.com/download) installed.
 
-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 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/) with the [EditorConfig](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig) and [C#](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) plugin installed.
 
 ### Downloading the source code
 

From 84f4fab9cfad4a122a271977ed7902f9e504904b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2023 18:09:51 +0900
Subject: [PATCH 1192/2100] Adjust test to actually test diff splitting

---
 .../SongSelect/TestSceneBeatmapCarousel.cs       | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 110466f6d5..040b341584 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -505,8 +505,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestAddRemoveDifficultySort()
         {
-            const int local_set_count = 1;
-            const int local_diff_count = 1;
+            const int local_set_count = 2;
+            const int local_diff_count = 2;
 
             loadBeatmaps(setCount: local_set_count, diffCount: local_diff_count);
 
@@ -515,23 +515,17 @@ namespace osu.Game.Tests.Visual.SongSelect
             checkVisibleItemCount(false, local_set_count * local_diff_count);
 
             var firstAdded = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
-            var secondAdded = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
 
             AddStep("Add new set", () => carousel.UpdateBeatmapSet(firstAdded));
-            AddStep("Add new set", () => carousel.UpdateBeatmapSet(secondAdded));
-
-            checkVisibleItemCount(false, (local_set_count + 2) * local_diff_count);
-
-            AddStep("Remove set", () => carousel.RemoveBeatmapSet(firstAdded));
 
             checkVisibleItemCount(false, (local_set_count + 1) * local_diff_count);
 
-            setSelected(local_set_count + 1, 1);
-
-            AddStep("Remove set", () => carousel.RemoveBeatmapSet(secondAdded));
+            AddStep("Remove set", () => carousel.RemoveBeatmapSet(firstAdded));
 
             checkVisibleItemCount(false, (local_set_count) * local_diff_count);
 
+            setSelected(local_set_count, 1);
+
             waitForSelection(local_set_count);
         }
 

From 10b14501380320939f43fe715b033970b8af4a2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2023 18:10:54 +0900
Subject: [PATCH 1193/2100] Rename remove method to better explain return type
 being `IEnumerable`

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index d52b5592f8..a8da5dc742 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -405,7 +405,7 @@ namespace osu.Game.Screens.Select
             if (selectedBeatmapSet?.BeatmapSet.ID == beatmapSet.ID)
                 previouslySelectedID = selectedBeatmap?.BeatmapInfo.ID;
 
-            var removedSets = root.RemoveChild(beatmapSet.ID);
+            var removedSets = root.RemoveItemsByID(beatmapSet.ID);
 
             foreach (var removedSet in removedSets)
             {
@@ -1147,7 +1147,7 @@ namespace osu.Game.Screens.Select
                 base.AddItem(i);
             }
 
-            public IEnumerable<CarouselBeatmapSet> RemoveChild(Guid beatmapSetID)
+            public IEnumerable<CarouselBeatmapSet> RemoveItemsByID(Guid beatmapSetID)
             {
                 if (BeatmapSetsByID.TryGetValue(beatmapSetID, out var carouselBeatmapSets))
                 {

From 8a1fc7c340070e1f04d5ffca1488cfde70a054be Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sat, 26 Aug 2023 01:20:41 +0300
Subject: [PATCH 1194/2100] Basic stuff (not working for now)

---
 osu.Game/Overlays/Mods/ModMapInfoDisplay.cs   | 203 ++++++++++++++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  18 ++
 osu.Game/Screens/Select/BeatmapDetails.cs     |   6 +
 .../Screens/Select/Details/AdvancedStats.cs   |  21 ++
 osu.Game/Screens/Select/SongSelect.cs         |   3 +
 5 files changed, 251 insertions(+)
 create mode 100644 osu.Game/Overlays/Mods/ModMapInfoDisplay.cs

diff --git a/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs b/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
new file mode 100644
index 0000000000..20666391d6
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
@@ -0,0 +1,203 @@
+// Copyright (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.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Select.Details;
+using osu.Game.Localisation;
+using osuTK;
+
+
+namespace osu.Game.Overlays.Mods
+{
+    public partial class ModMapInfoDisplay : Container, IHasCurrentValue<MapStats>
+    {
+        public const float HEIGHT = 42;
+        private const float transition_duration = 200;
+
+        private readonly Box contentBackground;
+        private readonly Box labelBackground;
+        private readonly FillFlowContainer content;
+
+        public Bindable<MapStats> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+        private readonly BindableWithCurrent<MapStats> current = new BindableWithCurrent<MapStats>();
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        /// <summary>
+        /// Text to display in the left area of the display.
+        /// </summary>
+        //protected abstract LocalisableString Label { get; }
+        protected LocalisableString Label => CommonStrings.Finish;
+        //protected string Label { get; }
+
+        protected virtual float ValueAreaWidth => 56;
+
+        protected virtual string CounterFormat => @"N0";
+
+        protected override Container<Drawable> Content => content;
+
+        protected readonly RollingCounter<double> Counter;
+
+        public ModMapInfoDisplay()
+        {
+            Height = HEIGHT;
+            AutoSizeAxes = Axes.X;
+
+            InternalChild = new InputBlockingContainer
+            {
+                RelativeSizeAxes = Axes.Y,
+                AutoSizeAxes = Axes.X,
+                Masking = true,
+                CornerRadius = ModSelectPanel.CORNER_RADIUS,
+                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                Children = new Drawable[]
+                {
+                    contentBackground = new Box
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = ValueAreaWidth + ModSelectPanel.CORNER_RADIUS
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        AutoSizeAxes = Axes.X,
+                        ColumnDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension(GridSizeMode.Absolute, ValueAreaWidth)
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Y,
+                                    AutoSizeAxes = Axes.X,
+                                    Masking = true,
+                                    CornerRadius = ModSelectPanel.CORNER_RADIUS,
+                                    Children = new Drawable[]
+                                    {
+                                        labelBackground = new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            Margin = new MarginPadding { Horizontal = 18 },
+                                            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                            Text = Label,
+                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+                                        }
+                                    }
+                                },
+                                content = new FillFlowContainer
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Direction = FillDirection.Horizontal,
+                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    Spacing = new Vector2(2, 0),
+                                    Child = Counter = new EffectCounter(CounterFormat)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Current = { BindTarget = Current.Value.StarRating }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            labelBackground.Colour = colourProvider.Background4;
+        }
+
+        protected override void LoadComplete()
+        {
+            Current.BindValueChanged(e =>
+            {
+                //var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
+                setColours(e.NewValue.StarRating.Value);
+            }, true);
+        }
+
+        /// <summary>
+        /// Fades colours of text and its background according to displayed value.
+        /// </summary>
+        /// <param name="stars">random number.</param>
+        private void setColours(double stars)
+        {
+            contentBackground.FadeColour(colours.ForStarDifficulty(stars), transition_duration, Easing.OutQuint);
+        }
+
+        /// <summary>
+        /// Converts signed integer into <see cref="ModEffect"/>. Negative values are counted as difficulty reduction, positive as increase.
+        /// </summary>
+        /// <param name="comparison">Value to convert. Will arrive from comparison between <see cref="Current"/> bindable once it changes and it's <see cref="Bindable{T}.Default"/>.</param>
+        /// <returns>Effect of the value.</returns>
+        protected virtual ModEffect CalculateEffectForComparison(int comparison)
+        {
+            if (comparison == 0)
+                return ModEffect.NotChanged;
+            if (comparison < 0)
+                return ModEffect.DifficultyReduction;
+
+            return ModEffect.DifficultyIncrease;
+        }
+
+        protected enum ModEffect
+        {
+            NotChanged,
+            DifficultyReduction,
+            DifficultyIncrease
+        }
+
+        private partial class EffectCounter : RollingCounter<double>
+        {
+            private readonly string? format;
+
+            public EffectCounter(string? format)
+            {
+                this.format = format;
+            }
+
+            protected override double RollingDuration => 500;
+
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(format);
+
+            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
+            {
+                Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 9e92e9d959..ef5f6cf323 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -25,6 +25,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Select.Details;
 using osu.Game.Utils;
 using osuTK;
 using osuTK.Input;
@@ -123,6 +124,7 @@ namespace osu.Game.Overlays.Mods
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
+        private ModMapInfoDisplay mapInfoDisplay = null!;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -219,6 +221,12 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
+            aboveColumnsContent.Add(mapInfoDisplay = new ModMapInfoDisplay
+            {
+                Anchor = Anchor.TopLeft,
+                Origin = Anchor.TopLeft
+            });
+
             FooterContent.Child = footerButtonFlow = new FillFlowContainer<ShearedButton>
             {
                 RelativeSizeAxes = Axes.X,
@@ -244,6 +252,10 @@ namespace osu.Game.Overlays.Mods
             globalAvailableMods.BindTo(game.AvailableMods);
         }
 
+        public void SetBindedMapStats(Bindable<MapStats> stats)
+        {
+            mapInfoDisplay.Current = stats;
+        }
         public override void Hide()
         {
             base.Hide();
@@ -399,6 +411,12 @@ namespace osu.Game.Overlays.Mods
             multiplierDisplay.Current.Value = multiplier;
         }
 
+        private void updateMapInfo()
+        {
+            if (mapInfoDisplay == null)
+                return;
+        }
+
         private void updateCustomisation()
         {
             if (CustomisationButton == null)
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 712b610515..c56411bef5 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -3,6 +3,7 @@
 
 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;
@@ -273,6 +274,11 @@ namespace osu.Game.Screens.Select
             loading.Hide();
         }
 
+        public Bindable<MapStats> GetBindedAdjustedMapStats()
+        {
+            return advanced.AdjustedMapStats.GetBoundCopy();
+        }
+
         private partial class DetailBox : Container
         {
             private readonly Container content;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index a383298faa..016e4ff2df 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -113,6 +113,8 @@ namespace osu.Game.Screens.Select.Details
             updateStatistics();
         }
 
+        public Bindable<MapStats> AdjustedMapStats = new Bindable<MapStats>();
+
         private void updateStatistics()
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
@@ -146,6 +148,14 @@ namespace osu.Game.Screens.Select.Details
             ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
 
             updateStarDifficulty();
+
+            var temp = AdjustedMapStats.Value;
+            temp.CS.Value = FirstValue.Value.adjustedValue ?? 0;
+            temp.HP.Value = HpDrain.Value.adjustedValue ?? 0;
+            temp.OD.Value = Accuracy.Value.adjustedValue ?? 0;
+            temp.AR.Value = ApproachRate.Value.adjustedValue ?? 5;
+            AdjustedMapStats.Value = temp;
+
         }
 
         private CancellationTokenSource starDifficultyCancellationSource;
@@ -178,6 +188,11 @@ namespace osu.Game.Screens.Select.Details
                     return;
 
                 starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
+
+                var temp = AdjustedMapStats.Value;
+                temp.StarRating.Value = moddedDifficulty.Value.Stars;
+                AdjustedMapStats.Value = temp;
+
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         });
 
@@ -296,4 +311,10 @@ namespace osu.Game.Screens.Select.Details
             }
         }
     }
+    public struct MapStats
+    {
+        public Bindable<double> StarRating;
+        public Bindable<double> MinBPM, MaxBPM, AvgBPM;
+        public Bindable<float> CS, HP, AR, OD;
+    }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 58755878d0..17b1b1f870 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -305,6 +305,9 @@ namespace osu.Game.Screens.Select
             // therein it will be registered at the `OsuGame` level to properly function as a blocking overlay.
             LoadComponent(ModSelect = CreateModSelectOverlay());
 
+            var bindedStats = BeatmapDetails.Details.GetBindedAdjustedMapStats();
+            ModSelect.SetBindedMapStats(bindedStats);
+
             if (Footer != null)
             {
                 foreach (var (button, overlay) in CreateFooterButtons())

From e77581f64134f7c75b36776d223d7812bb9e4b42 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 27 Aug 2023 01:25:50 +0300
Subject: [PATCH 1195/2100] `wholeSpins` -> `currentSpins`

---
 .../Objects/Drawables/DrawableSpinner.cs               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 0ceda1d4b0..2d2a4a05ac 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
-        private int wholeSpins;
+        private int currentSpins;
 
         private void updateBonusScore()
         {
@@ -295,14 +295,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             int spins = (int)(Result.RateAdjustedRotation / 360);
 
-            if (spins < wholeSpins)
+            if (spins < currentSpins)
             {
                 // rewinding, silently handle
-                wholeSpins = spins;
+                currentSpins = spins;
                 return;
             }
 
-            while (wholeSpins != spins)
+            while (currentSpins != spins)
             {
                 var tick = ticks.FirstOrDefault(t => !t.Result.HasResult);
 
@@ -315,7 +315,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                         gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequired);
                 }
 
-                wholeSpins++;
+                currentSpins++;
             }
         }
     }

From d614e745b8ff9e45bd46093741d810b18d255203 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 27 Aug 2023 01:27:19 +0300
Subject: [PATCH 1196/2100] Calculate spinner ticks as "whole spins" without
 arbitrary factors

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index b800b03c92..f32c6ae979 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -42,15 +42,10 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            // spinning doesn't match 1:1 with stable, so let's fudge them easier for the time being.
-            const double stable_matching_fudge = 0.6;
-
-            // close to 477rpm
-            const double maximum_rotations_per_second = 8;
+            const double maximum_rotations_per_second = 477f / 60f;
 
             double secondsDuration = Duration / 1000;
-
-            double minimumRotationsPerSecond = stable_matching_fudge * IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, 3, 5, 7.5);
+            double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, 1.5, 2.5, 3.75);
 
             SpinsRequired = (int)(secondsDuration * minimumRotationsPerSecond);
             MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration);

From 3bcddf3cc8cb76f9ad154e4baeb39d30fc306e64 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 27 Aug 2023 01:27:48 +0300
Subject: [PATCH 1197/2100] Add gap of two whole spins before achieving bonus
 score

---
 .../Objects/Drawables/DrawableSpinner.cs         |  2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs         | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2d2a4a05ac..20bbb9a1d1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -312,7 +312,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     tick.TriggerResult(true);
 
                     if (tick is DrawableSpinnerBonusTick)
-                        gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequired);
+                        gainedBonus.Value = score_per_tick * (spins - HitObject.FirstBonusSpin);
                 }
 
                 currentSpins++;
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index f32c6ae979..a26cb7b090 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -31,11 +31,21 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public int SpinsRequired { get; protected set; } = 1;
 
+        /// <summary>
+        /// The gap between spinner completion and the first bonus-awarding spin.
+        /// </summary>
+        private const int bonus_spins_gap = 2;
+
         /// <summary>
         /// Number of spins available to give bonus, beyond <see cref="SpinsRequired"/>.
         /// </summary>
         public int MaximumBonusSpins { get; protected set; } = 1;
 
+        /// <summary>
+        /// The first spin awarding bonus score.
+        /// </summary>
+        public int FirstBonusSpin => SpinsRequired + bonus_spins_gap;
+
         public override Vector2 StackOffset => Vector2.Zero;
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
@@ -48,14 +58,14 @@ namespace osu.Game.Rulesets.Osu.Objects
             double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, 1.5, 2.5, 3.75);
 
             SpinsRequired = (int)(secondsDuration * minimumRotationsPerSecond);
-            MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration);
+            MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration) - bonus_spins_gap;
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             base.CreateNestedHitObjects(cancellationToken);
 
-            int totalSpins = MaximumBonusSpins + SpinsRequired;
+            int totalSpins = MaximumBonusSpins + SpinsRequired + bonus_spins_gap;
 
             for (int i = 0; i < totalSpins; i++)
             {
@@ -63,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
                 double startTime = StartTime + (float)(i + 1) / totalSpins * Duration;
 
-                AddNested(i < SpinsRequired
+                AddNested(i < FirstBonusSpin
                     ? new SpinnerTick { StartTime = startTime, SpinnerDuration = Duration }
                     : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration, Samples = new[] { CreateHitSampleInfo("spinnerbonus") } });
             }

From 3a6920c3067f90c53578d021f3ecf7e89d368c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 09:51:37 +0200
Subject: [PATCH 1198/2100] Add failing test coverage of beatmap update flow w/
 split diffs

---
 .../TestSceneUpdateBeatmapSetButton.cs        | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
index 11d55bc0bd..585d93d3af 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
@@ -15,6 +15,7 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Carousel;
+using osu.Game.Screens.Select.Filter;
 using osu.Game.Tests.Online;
 using osu.Game.Tests.Resources;
 using osuTK.Input;
@@ -192,6 +193,57 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
         }
 
+        [Test]
+        public void TestSplitDisplay()
+        {
+            ArchiveDownloadRequest<IBeatmapSetInfo>? downloadRequest = null;
+
+            AddStep("set difficulty sort mode", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }));
+            AddStep("update online hash", () =>
+            {
+                testBeatmapSetInfo.Beatmaps.First().OnlineMD5Hash = "different hash";
+                testBeatmapSetInfo.Beatmaps.First().LastOnlineUpdate = DateTimeOffset.Now;
+
+                carousel.UpdateBeatmapSet(testBeatmapSetInfo);
+            });
+
+            AddUntilStep("multiple \"sets\" visible", () => carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().Count(), () => Is.GreaterThan(1));
+            AddUntilStep("update button visible", getUpdateButton, () => Is.Not.Null);
+
+            AddStep("click button", () => getUpdateButton()?.TriggerClick());
+
+            AddUntilStep("wait for download started", () =>
+            {
+                downloadRequest = beatmapDownloader.GetExistingDownload(testBeatmapSetInfo);
+                return downloadRequest != null;
+            });
+
+            AddUntilStep("wait for button disabled", () => getUpdateButton()?.Enabled.Value == false);
+
+            AddUntilStep("progress download to completion", () =>
+            {
+                if (downloadRequest is TestSceneOnlinePlayBeatmapAvailabilityTracker.TestDownloadRequest testRequest)
+                {
+                    testRequest.SetProgress(testRequest.Progress + 0.1f);
+
+                    if (testRequest.Progress >= 1)
+                    {
+                        testRequest.TriggerSuccess();
+
+                        // usually this would be done by the import process.
+                        testBeatmapSetInfo.Beatmaps.First().MD5Hash = "different hash";
+                        testBeatmapSetInfo.Beatmaps.First().LastOnlineUpdate = DateTimeOffset.Now;
+
+                        // usually this would be done by a realm subscription.
+                        carousel.UpdateBeatmapSet(testBeatmapSetInfo);
+                        return true;
+                    }
+                }
+
+                return false;
+            });
+        }
+
         private BeatmapCarousel createCarousel()
         {
             return carousel = new BeatmapCarousel

From 6251803868588f188ca7b78f74ad4c9e18d4b10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 10:02:05 +0200
Subject: [PATCH 1199/2100] Add failing test coverage of selection not being
 retained on song select

---
 .../TestSceneBeatmapEditorNavigation.cs       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 54ee1659e1..d0fa5fc737 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -9,6 +9,7 @@ using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
@@ -16,6 +17,7 @@ using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.GameplayTest;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
 using osu.Game.Tests.Resources;
 using osuTK.Input;
 
@@ -203,6 +205,33 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("wait for music stopped", () => !Game.MusicController.IsPlaying);
         }
 
+        [TestCase(SortMode.Title)]
+        [TestCase(SortMode.Difficulty)]
+        public void TestSelectionRetainedOnExit(SortMode sortMode)
+        {
+            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($"set sort mode to {sortMode}", () => Game.LocalConfig.SetValue(OsuSetting.SongSelectSortingMode, sortMode));
+            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("exit editor", () => InputManager.Key(Key.Escape));
+            AddUntilStep("wait for editor exit", () => Game.ScreenStack.CurrentScreen is not Editor);
+
+            AddUntilStep("selection retained on song select",
+                () => Game.Beatmap.Value.BeatmapInfo.ID,
+                () => Is.EqualTo(beatmapSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0).ID));
+        }
+
         private EditorBeatmap getEditorBeatmap() => getEditor().ChildrenOfType<EditorBeatmap>().Single();
 
         private Editor getEditor() => (Editor)Game.ScreenStack.CurrentScreen;

From 0af6cc1394f7fe521bdf94773b423b5ff61c2bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 10:02:30 +0200
Subject: [PATCH 1200/2100] Fix online ID not being propagated in split
 difficulty mode

Would result in failures to re-download the beatmap in update flows, for
instance.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index a8da5dc742..0354e72803 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -145,6 +145,7 @@ namespace osu.Game.Screens.Select
                     return createCarouselSet(new BeatmapSetInfo(new[] { b })
                     {
                         ID = b.BeatmapSet!.ID,
+                        OnlineID = b.BeatmapSet!.OnlineID
                     });
                 }).OfType<CarouselBeatmapSet>();
 
@@ -422,7 +423,8 @@ namespace osu.Game.Screens.Select
                 {
                     var newSet = createCarouselSet(new BeatmapSetInfo(new[] { beatmap })
                     {
-                        ID = beatmapSet.ID
+                        ID = beatmapSet.ID,
+                        OnlineID = beatmapSet.OnlineID
                     });
 
                     if (newSet != null)

From 80ec18d117fc7ae252731bcde4e65a71be838ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 10:06:26 +0200
Subject: [PATCH 1201/2100] Fix incorrect selection restore code in split case

The fallback to "any of the added sets" needs to be applied after
they've all been added, rather than with every added one. Otherwise, in
flows that expect a particular difficulty to be selected in the end
(such as exiting from editor) would end up switching away from the
edited beatmap.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 0354e72803..861385f453 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -419,6 +419,8 @@ namespace osu.Game.Screens.Select
 
             if (beatmapsSplitOut)
             {
+                var newSets = new List<CarouselBeatmapSet>();
+
                 foreach (var beatmap in beatmapSet.Beatmaps)
                 {
                     var newSet = createCarouselSet(new BeatmapSetInfo(new[] { beatmap })
@@ -429,13 +431,18 @@ namespace osu.Game.Screens.Select
 
                     if (newSet != null)
                     {
+                        newSets.Add(newSet);
                         root.AddItem(newSet);
-
-                        // check if we can/need to maintain our current selection.
-                        if (previouslySelectedID != null)
-                            select((CarouselItem?)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
                     }
                 }
+
+                // check if we can/need to maintain our current selection.
+                if (previouslySelectedID != null)
+                {
+                    var toSelect = newSets.FirstOrDefault(s => s.Beatmaps.Any(b => b.BeatmapInfo.ID == previouslySelectedID))
+                                   ?? newSets.FirstOrDefault();
+                    select(toSelect);
+                }
             }
             else
             {

From b9795eb3d4e09d66c9e2950da6e8742637dd8dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 11:02:22 +0200
Subject: [PATCH 1202/2100] Fix changes to beatmap sets being undone on
 switching sort mode

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 861385f453..9ea94b2a52 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Select
 
         private CarouselBeatmapSet? selectedBeatmapSet;
 
-        private IEnumerable<BeatmapSetInfo> originalBeatmapSetsDetached = Enumerable.Empty<BeatmapSetInfo>();
+        private List<BeatmapSetInfo> originalBeatmapSetsDetached = new List<BeatmapSetInfo>();
 
         /// <summary>
         /// Raised when the <see cref="SelectedBeatmapInfo"/> is changed.
@@ -381,6 +381,8 @@ namespace osu.Game.Screens.Select
             if (!root.BeatmapSetsByID.TryGetValue(beatmapSetID, out var existingSets))
                 return;
 
+            originalBeatmapSetsDetached.RemoveAll(set => set.ID == beatmapSetID);
+
             foreach (var set in existingSets)
             {
                 foreach (var beatmap in set.Beatmaps)
@@ -402,6 +404,9 @@ namespace osu.Game.Screens.Select
         {
             Guid? previouslySelectedID = null;
 
+            originalBeatmapSetsDetached.RemoveAll(set => set.ID == beatmapSet.ID);
+            originalBeatmapSetsDetached.Add(beatmapSet.Detach());
+
             // If the selected beatmap is about to be removed, store its ID so it can be re-selected if required
             if (selectedBeatmapSet?.BeatmapSet.ID == beatmapSet.ID)
                 previouslySelectedID = selectedBeatmap?.BeatmapInfo.ID;

From ba1f6439bf0dc3d5d283c5cf32ce35d8b93acebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 12:44:57 +0200
Subject: [PATCH 1203/2100] Disable redundant verbatim string prefix
 inspections

For some reason this started flaring up recently all over for me and
showing inspections all over, which are _technically_ valid, but
interfere with our convention of using verbatim string prefixes to
denote non-localisable strings. This, as a result, led to circular
inspections (addressing the r# inspection results in getting the
osu-localisation-analyser one, addresssing that one results in
getting the r# inspection back, etc. ad nauseam).
---
 osu.sln.DotSettings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index ef39c12768..c2778ca5b1 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -170,7 +170,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantStringInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimPrefix/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimStringPrefix/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimStringPrefix/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002EFalse/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002ETrue/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E1/@EntryIndexedValue">WARNING</s:String>

From 99d5ff9efbd7b7197497acd53f757345dc1666b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 13:50:52 +0200
Subject: [PATCH 1204/2100] Switch download requests to new API endpoint

This API endpoint is intended for usage with the entire `solo_scores`
machinery and ID schema, rather than the legacy `*_scores_high` ID
schema. It also supports automagically falling back to downloading
legacy replays if a stable-imported score is requested for download
(internally this happens via `legacy_score_id` in the `data` json).

This change will allow replays to be downloaded, but it will still not
yield 100% correct behaviour, as there is further work to be done in
that respect. The download tracker is expecting score hashes to arrive
from web to verify the integrity of the incoming download, but the API
does not expose such a facility right now; we will have to decide as to
whether we want to add one web-side, or whether we want to disable the
checking client-side.
---
 osu.Game/Online/API/Requests/DownloadReplayRequest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/DownloadReplayRequest.cs b/osu.Game/Online/API/Requests/DownloadReplayRequest.cs
index 77174f0bb5..3ea57cf637 100644
--- a/osu.Game/Online/API/Requests/DownloadReplayRequest.cs
+++ b/osu.Game/Online/API/Requests/DownloadReplayRequest.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Online.API.Requests
 
         protected override string FileExtension => ".osr";
 
-        protected override string Target => $@"scores/{Model.Ruleset.ShortName}/{Model.OnlineID}/download";
+        protected override string Target => $@"scores/{Model.OnlineID}/download";
     }
 }

From 118c86df342340da729c3931a4c58a1ed72e0f12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 14:57:00 +0200
Subject: [PATCH 1205/2100] Fix `TestSceneUpdateBeatmapSetButton` using random
 difficulty count

---
 .../Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
index 585d93d3af..6d97be730b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
@@ -251,7 +251,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 RelativeSizeAxes = Axes.Both,
                 BeatmapSets = new List<BeatmapSetInfo>
                 {
-                    (testBeatmapSetInfo = TestResources.CreateTestBeatmapSetInfo()),
+                    (testBeatmapSetInfo = TestResources.CreateTestBeatmapSetInfo(5)),
                 }
             };
         }

From 07e126241da902fcf7471e28576c5204fc8b826d Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Mon, 28 Aug 2023 16:41:55 +0200
Subject: [PATCH 1206/2100] working negative scaling

---
 .../SkinEditor/SkinSelectionHandler.cs        | 41 ++++++-------------
 .../Edit/Compose/Components/SelectionBox.cs   |  2 +
 .../SelectionBoxDragHandleContainer.cs        | 12 ++++++
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index c90a1d8edf..ae0a3d0635 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Overlays.SkinEditor
             UpdatePosition = updateDrawablePosition
         };
 
-        private float accumulatedNegativeScaling;
-
         public override bool HandleScale(Vector2 scale, Anchor anchor)
         {
             // convert scale to screen space
@@ -73,32 +71,25 @@ namespace osu.Game.Overlays.SkinEditor
                     scale.Y = scale.X / selectionRect.Width * selectionRect.Height;
             }
 
-            // If scaling reverses the selection, don't scale and accumulate the amount of scaling.
-            if (adjustedRect.Width + scale.X < 0 || adjustedRect.Height + scale.Y < 0)
-            {
-                accumulatedNegativeScaling += scale.Length; // - new Vector2(selectionRect.Width, selectionRect.Height).Length;
-
-                return true;
-            }
-
-            // Compensate for accumulated negative scaling.
-            if (Precision.AlmostBigger(accumulatedNegativeScaling, 0) && !Precision.AlmostEquals(accumulatedNegativeScaling, 0))
-            {
-                float length = scale.Length;
-                accumulatedNegativeScaling -= length;
-
-                // If the accumulated negative scaling is still positive, don't scale.
-                if (Precision.AlmostBigger(accumulatedNegativeScaling, 0)) return true;
-                scale *= Math.Abs(accumulatedNegativeScaling) / length;
-                accumulatedNegativeScaling = 0;
-            }
-
             if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
             if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
 
             adjustedRect.Width += scale.X;
             adjustedRect.Height += scale.Y;
 
+            if (adjustedRect.Width < 0)
+            {
+                SelectionBox.ScaleHandlesFlip(Direction.Horizontal);
+                HandleFlip(Direction.Horizontal, false);
+            }
+            if (adjustedRect.Height < 0)
+            {
+                SelectionBox.ScaleHandlesFlip(Direction.Vertical);
+                HandleFlip(Direction.Vertical, false);
+            }
+            if (adjustedRect.Width < 0 || adjustedRect.Height < 0)
+                return true;
+
             // scale adjust applied to each individual item should match that of the quad itself.
             var scaledDelta = new Vector2(
                 adjustedRect.Width / selectionRect.Width,
@@ -169,12 +160,6 @@ namespace osu.Game.Overlays.SkinEditor
 
         public static void ApplyClosestAnchor(Drawable drawable) => applyAnchor(drawable, getClosestAnchor(drawable));
 
-        protected override void OnOperationEnded()
-        {
-            base.OnOperationEnded();
-            accumulatedNegativeScaling = 0;
-        }
-
         protected override void OnSelectionChanged()
         {
             base.OnSelectionChanged();
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 876e8ccbe9..a261b635b3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -307,6 +307,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return button;
         }
 
+        public void ScaleHandlesFlip(Direction direction) => dragHandles.ScaleHandlesFlip(direction);
+
         private void addScaleHandle(Anchor anchor)
         {
             var handle = new SelectionBoxScaleHandle
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 5c87271493..4fd2e9aba9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
@@ -69,6 +70,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
             allDragHandles.Add(handle);
         }
 
+        public void ScaleHandlesFlip(Direction direction)
+        {
+            foreach (var handle in scaleHandles)
+            {
+                if (direction == Direction.Horizontal && !handle.Anchor.HasFlagFast(Anchor.x1))
+                    handle.Anchor ^= Anchor.x0 | Anchor.x2;
+                if (direction == Direction.Vertical && !handle.Anchor.HasFlagFast(Anchor.y1))
+                    handle.Anchor ^= Anchor.y0 | Anchor.y2;
+            }
+        }
+
         private SelectionBoxRotationHandle displayedRotationHandle;
         private SelectionBoxDragHandle activeHandle;
 

From 390b6f649dd9b9c6408d96b8a9347ba71b12c4a1 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 29 Aug 2023 03:46:11 +0900
Subject: [PATCH 1207/2100] Add test

---
 .../Mods/TestSceneManiaModDoubleTime.cs       | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
new file mode 100644
index 0000000000..08e83b04b5
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -0,0 +1,65 @@
+// Copyright (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 NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests.Mods
+{
+    public partial class TestSceneManiaModDoubleTime : ModTestScene
+    {
+        private const double offset = 18;
+
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
+        [Test]
+        public void TestHitWindowWithoutDoubleTime() => CreateModTest(new ModTestData
+        {
+            Mod = new ModNoMod(),
+            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value != 1,
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+                Difficulty = { OverallDifficulty = 10 },
+                HitObjects = new List<HitObject>
+                {
+                    new Note { StartTime = 1000 }
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(1000 + offset, ManiaAction.Key1)
+            }
+        });
+
+        [Test]
+        public void TestHitWindowWithDoubleTime() => CreateModTest(new ModTestData
+        {
+            Mod = new ManiaModDoubleTime(),
+            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1,
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+                Difficulty = { OverallDifficulty = 10 },
+                HitObjects = new List<HitObject>
+                {
+                    new Note { StartTime = 1000 }
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(1000 + offset, ManiaAction.Key1)
+            }
+        });
+    }
+}

From 50235cc2459c43802099b7b803396fbacf208af6 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Mon, 28 Aug 2023 23:16:33 +0300
Subject: [PATCH 1208/2100] somewhat working prototype

---
 osu.Game/Overlays/Mods/ModMapInfoContainer.cs | 58 ++++++++++++++++
 osu.Game/Overlays/Mods/ModMapInfoDisplay.cs   | 66 +++++++------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 17 +++--
 osu.Game/Screens/Select/BeatmapDetailArea.cs  |  4 ++
 osu.Game/Screens/Select/BeatmapDetails.cs     |  5 --
 .../Screens/Select/Details/AdvancedStats.cs   | 40 +++++------
 osu.Game/Screens/Select/SongSelect.cs         |  8 ++-
 7 files changed, 121 insertions(+), 77 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/ModMapInfoContainer.cs

diff --git a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
new file mode 100644
index 0000000000..eb5291b0a8
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
@@ -0,0 +1,58 @@
+// Copyright (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.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+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.Online;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.BeatmapSet;
+using osu.Game.Resources.Localisation.Web;
+using osu.Game.Screens.Select.Details;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Mods
+{
+    public partial class ModMapInfoContainer : Container
+    {
+        private ModMapInfoDisplay starRatingDisplay = null!;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private Bindable<BeatmapInfo> adjustedInfo { get; set; } = null!;
+        private Bindable<double> starRatingValue = new Bindable<double>();
+
+        //public ModMapInfoContainer()
+        //{
+        //    
+        //}
+
+        protected override void LoadComplete()
+        {
+            starRatingDisplay = new ModMapInfoDisplay("Star Rating", colours.ForStarDifficulty);
+            starRatingDisplay.Current.BindTo(starRatingValue);
+
+            Content.Add(starRatingDisplay);
+
+            adjustedInfo.BindValueChanged(e => { updateValues(); }, true);
+        }
+
+        private void updateValues()
+        {
+            starRatingValue.Value = adjustedInfo.Value.StarRating;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs b/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
index 20666391d6..ca815984ce 100644
--- a/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModMapInfoDisplay.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.Extensions.LocalisationExtensions;
@@ -12,14 +13,13 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Select.Details;
 using osu.Game.Localisation;
 using osuTK;
 
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModMapInfoDisplay : Container, IHasCurrentValue<MapStats>
+    public partial class ModMapInfoDisplay : Container, IHasCurrentValue<double>
     {
         public const float HEIGHT = 42;
         private const float transition_duration = 200;
@@ -28,36 +28,40 @@ namespace osu.Game.Overlays.Mods
         private readonly Box labelBackground;
         private readonly FillFlowContainer content;
 
-        public Bindable<MapStats> Current
-        {
-            get => current.Current;
-            set => current.Current = value;
-        }
-        private readonly BindableWithCurrent<MapStats> current = new BindableWithCurrent<MapStats>();
+        //public Bindable<double> Current
+        //{
+        //    get => current.Current;
+        //    set => current.Current = value;
+        //}
+        //private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
 
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
+        public Bindable<double> Current { get; set; } = new BindableWithCurrent<double>();
+
+        //[Resolved]
+        //private OsuColour colours { get; set; } = null!;
 
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        protected Func<double, osuTK.Graphics.Color4> GetColor;
+
         /// <summary>
         /// Text to display in the left area of the display.
         /// </summary>
-        //protected abstract LocalisableString Label { get; }
-        protected LocalisableString Label => CommonStrings.Finish;
-        //protected string Label { get; }
+        protected LocalisableString Label;
 
         protected virtual float ValueAreaWidth => 56;
 
-        protected virtual string CounterFormat => @"N0";
+        protected virtual string CounterFormat => @"0.00";
 
         protected override Container<Drawable> Content => content;
 
         protected readonly RollingCounter<double> Counter;
 
-        public ModMapInfoDisplay()
+        public ModMapInfoDisplay(LocalisableString label, Func<double, osuTK.Graphics.Color4> colorFunc)
         {
+            Label = label;
+            GetColor = colorFunc;
             Height = HEIGHT;
             AutoSizeAxes = Axes.X;
 
@@ -125,7 +129,7 @@ namespace osu.Game.Overlays.Mods
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
-                                        Current = { BindTarget = Current.Value.StarRating }
+                                        Current = { BindTarget = Current }
                                     }
                                 }
                             }
@@ -146,39 +150,17 @@ namespace osu.Game.Overlays.Mods
             Current.BindValueChanged(e =>
             {
                 //var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
-                setColours(e.NewValue.StarRating.Value);
+                setColours(e.NewValue);
             }, true);
         }
 
         /// <summary>
         /// Fades colours of text and its background according to displayed value.
         /// </summary>
-        /// <param name="stars">random number.</param>
-        private void setColours(double stars)
+        /// <param name="value">value</param>
+        private void setColours(double value)
         {
-            contentBackground.FadeColour(colours.ForStarDifficulty(stars), transition_duration, Easing.OutQuint);
-        }
-
-        /// <summary>
-        /// Converts signed integer into <see cref="ModEffect"/>. Negative values are counted as difficulty reduction, positive as increase.
-        /// </summary>
-        /// <param name="comparison">Value to convert. Will arrive from comparison between <see cref="Current"/> bindable once it changes and it's <see cref="Bindable{T}.Default"/>.</param>
-        /// <returns>Effect of the value.</returns>
-        protected virtual ModEffect CalculateEffectForComparison(int comparison)
-        {
-            if (comparison == 0)
-                return ModEffect.NotChanged;
-            if (comparison < 0)
-                return ModEffect.DifficultyReduction;
-
-            return ModEffect.DifficultyIncrease;
-        }
-
-        protected enum ModEffect
-        {
-            NotChanged,
-            DifficultyReduction,
-            DifficultyIncrease
+            contentBackground.FadeColour(GetColor(value), transition_duration, Easing.OutQuint);
         }
 
         private partial class EffectCounter : RollingCounter<double>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ef5f6cf323..a178f2e9dc 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -25,9 +25,9 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Select.Details;
 using osu.Game.Utils;
 using osuTK;
+using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Overlays.Mods
@@ -124,7 +124,8 @@ namespace osu.Game.Overlays.Mods
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
-        private ModMapInfoDisplay mapInfoDisplay = null!;
+
+        private ModMapInfoContainer mapInfoContainer = null!;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -221,7 +222,7 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
-            aboveColumnsContent.Add(mapInfoDisplay = new ModMapInfoDisplay
+            aboveColumnsContent.Add(mapInfoContainer = new ModMapInfoContainer
             {
                 Anchor = Anchor.TopLeft,
                 Origin = Anchor.TopLeft
@@ -251,11 +252,6 @@ namespace osu.Game.Overlays.Mods
 
             globalAvailableMods.BindTo(game.AvailableMods);
         }
-
-        public void SetBindedMapStats(Bindable<MapStats> stats)
-        {
-            mapInfoDisplay.Current = stats;
-        }
         public override void Hide()
         {
             base.Hide();
@@ -282,6 +278,7 @@ namespace osu.Game.Overlays.Mods
 
             SelectedMods.BindValueChanged(_ =>
             {
+                updateMapInfo();
                 updateMultiplier();
                 updateFromExternalSelection();
                 updateCustomisation();
@@ -413,8 +410,10 @@ namespace osu.Game.Overlays.Mods
 
         private void updateMapInfo()
         {
-            if (mapInfoDisplay == null)
+            if (mapInfoContainer == null)
                 return;
+
+            //mapInfoDisplay.Current.Value = 5;
         }
 
         private void updateCustomisation()
diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs
index 595b86924b..d43831e576 100644
--- a/osu.Game/Screens/Select/BeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -30,6 +31,9 @@ namespace osu.Game.Screens.Select
 
         public readonly BeatmapDetails Details;
 
+        //[Cached]
+        //public Bindable<BeatmapInfo> AdjustedInfo { get; private set; } = new Bindable<BeatmapInfo>();
+
         protected Bindable<BeatmapDetailAreaTabItem> CurrentTab => tabControl.Current;
 
         protected Bindable<bool> CurrentModsFilter => tabControl.CurrentModsFilter;
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index c56411bef5..6ebdca1b8d 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -274,11 +274,6 @@ namespace osu.Game.Screens.Select
             loading.Hide();
         }
 
-        public Bindable<MapStats> GetBindedAdjustedMapStats()
-        {
-            return advanced.AdjustedMapStats.GetBoundCopy();
-        }
-
         private partial class DetailBox : Container
         {
             private readonly Container content;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 016e4ff2df..8f609888df 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -46,6 +46,11 @@ namespace osu.Game.Screens.Select.Details
 
         private IBeatmapInfo beatmapInfo;
 
+#nullable enable
+        [Resolved]
+        private Bindable<BeatmapInfo>? adjustedInfo { get; set; } = null;
+#nullable disable
+
         public IBeatmapInfo BeatmapInfo
         {
             get => beatmapInfo;
@@ -99,6 +104,21 @@ namespace osu.Game.Screens.Select.Details
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedStatisticsUpdate;
 
+        private void updateBindedInfo()
+        {
+            if (adjustedInfo == null) return;
+
+            BeatmapInfo adjusted = (BeatmapInfo)beatmapInfo;
+            adjusted.Difficulty.CircleSize = FirstValue.Value.adjustedValue ?? 0;
+            adjusted.Difficulty.DrainRate = HpDrain.Value.adjustedValue ?? 0;
+            adjusted.Difficulty.ApproachRate = ApproachRate.Value.adjustedValue ?? 5;
+            adjusted.Difficulty.OverallDifficulty = Accuracy.Value.adjustedValue ?? 0;
+            adjusted.StarRating = starDifficulty.Value.adjustedValue ?? 0;
+
+            adjustedInfo.Value = adjusted;
+            adjustedInfo.TriggerChange();
+        }
+
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             modSettingChangeTracker?.Dispose();
@@ -113,8 +133,6 @@ namespace osu.Game.Screens.Select.Details
             updateStatistics();
         }
 
-        public Bindable<MapStats> AdjustedMapStats = new Bindable<MapStats>();
-
         private void updateStatistics()
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
@@ -149,13 +167,6 @@ namespace osu.Game.Screens.Select.Details
 
             updateStarDifficulty();
 
-            var temp = AdjustedMapStats.Value;
-            temp.CS.Value = FirstValue.Value.adjustedValue ?? 0;
-            temp.HP.Value = HpDrain.Value.adjustedValue ?? 0;
-            temp.OD.Value = Accuracy.Value.adjustedValue ?? 0;
-            temp.AR.Value = ApproachRate.Value.adjustedValue ?? 5;
-            AdjustedMapStats.Value = temp;
-
         }
 
         private CancellationTokenSource starDifficultyCancellationSource;
@@ -188,10 +199,7 @@ namespace osu.Game.Screens.Select.Details
                     return;
 
                 starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
-
-                var temp = AdjustedMapStats.Value;
-                temp.StarRating.Value = moddedDifficulty.Value.Stars;
-                AdjustedMapStats.Value = temp;
+                updateBindedInfo();
 
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         });
@@ -311,10 +319,4 @@ namespace osu.Game.Screens.Select.Details
             }
         }
     }
-    public struct MapStats
-    {
-        public Bindable<double> StarRating;
-        public Bindable<double> MinBPM, MaxBPM, AvgBPM;
-        public Bindable<float> CS, HP, AR, OD;
-    }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 17b1b1f870..4567869e8e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -99,6 +99,9 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
 
+        [Cached]
+        private Bindable<BeatmapInfo> adjustedInfo { get; set; } = new Bindable<BeatmapInfo>();
+
         protected BeatmapCarousel Carousel { get; private set; } = null!;
 
         private ParallaxContainer wedgeBackground = null!;
@@ -305,8 +308,8 @@ namespace osu.Game.Screens.Select
             // therein it will be registered at the `OsuGame` level to properly function as a blocking overlay.
             LoadComponent(ModSelect = CreateModSelectOverlay());
 
-            var bindedStats = BeatmapDetails.Details.GetBindedAdjustedMapStats();
-            ModSelect.SetBindedMapStats(bindedStats);
+            //var bindedStats = BeatmapDetails.Details.GetBindedAdjustedMapStats();
+            //ModSelect.SetBindedMapStats(bindedStats);
 
             if (Footer != null)
             {
@@ -583,6 +586,7 @@ namespace osu.Game.Screens.Select
             FilterControl.Activate();
 
             ModSelect.SelectedMods.BindTo(selectedMods);
+            //BeatmapDetails.AdjustedInfo.BindTo(adjustedInfo);
 
             beginLooping();
         }

From d07530b24102faaf6929ce12221bc5903d126095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Aug 2023 11:48:47 +0200
Subject: [PATCH 1209/2100] Mark "Score V2" mod as not user-playable

The mod generally will only be present on scores imported from stable.
As such, it's probably ok to mark it as such.

The primary reason for this change is to address #24436 (Score V2 being
visible on beatmap overlay leaderboard mod selector).

There is one possibly-unintended consequence of this change, namely that
the results screen uses `UserPlayable` to determine as to whether
animations should be played back, with the intention of turning off the
animation playback for autoplay scores specifically. Therefore, turning
off this flag will mean that the results screen animations will not play
out for Score V2 scores - but I tend to consider this as either largely
unimportant, or something that should be fixed in some other way
(possibly by checking against the autoplay mod directly).

Other usages of `UserPlayable` are either innocuous, or straight-up good
safeties going forward in the context of Score V2 (guards against
selection in mod select overlays, against score submission with
the mod).
---
 osu.Game/Rulesets/Mods/ModScoreV2.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Mods/ModScoreV2.cs b/osu.Game/Rulesets/Mods/ModScoreV2.cs
index 6d56b2d86f..df83d96769 100644
--- a/osu.Game/Rulesets/Mods/ModScoreV2.cs
+++ b/osu.Game/Rulesets/Mods/ModScoreV2.cs
@@ -16,5 +16,6 @@ namespace osu.Game.Rulesets.Mods
         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;
+        public override bool UserPlayable => false;
     }
 }

From 3c575516ab2f642431e0e4db16f6303d5b3c7e42 Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Tue, 29 Aug 2023 17:06:23 +0200
Subject: [PATCH 1210/2100] add correct scaling for 90 degrees rotation

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index ae0a3d0635..ff6b52ca4d 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -48,10 +48,6 @@ namespace osu.Game.Overlays.SkinEditor
             // copy to mutate, as we will need to compare to the original later on.
             var adjustedRect = selectionRect;
 
-            // first, remove any scale axis we are not interested in.
-            if (anchor.HasFlagFast(Anchor.x1)) scale.X = 0;
-            if (anchor.HasFlagFast(Anchor.y1)) scale.Y = 0;
-
             // for now aspect lock scale adjustments that occur at corners..
             if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
             {
@@ -61,7 +57,7 @@ namespace osu.Game.Overlays.SkinEditor
             }
             // ..or if any of the selection have been rotated.
             // this is to avoid requiring skew logic (which would likely not be the user's expected transform anyway).
-            else if (SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation, 0)))
+            else if (SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation % 90, 0)))
             {
                 if (anchor.HasFlagFast(Anchor.x1))
                     // if dragging from the horizontal centre, only a vertical component is available.
@@ -115,6 +111,11 @@ namespace osu.Game.Overlays.SkinEditor
                 );
 
                 updateDrawablePosition(drawableItem, newPositionInAdjusted);
+
+                if (Precision.AlmostEquals(MathF.Abs(drawableItem.Rotation) % 180, 90))
+                {
+                    scaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
+                }
                 drawableItem.Scale *= scaledDelta;
             }
 

From d56ab0fe9af86a96ebf2fe3047d0b059b29aedbb Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Tue, 29 Aug 2023 17:25:52 +0200
Subject: [PATCH 1211/2100] change names

---
 .../SkinEditor/SkinSelectionHandler.cs        | 25 ++++++++++---------
 .../Edit/Compose/Components/SelectionBox.cs   |  2 +-
 .../SelectionBoxDragHandleContainer.cs        |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index ff6b52ca4d..afa592dfba 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -73,18 +73,20 @@ namespace osu.Game.Overlays.SkinEditor
             adjustedRect.Width += scale.X;
             adjustedRect.Height += scale.Y;
 
-            if (adjustedRect.Width < 0)
-            {
-                SelectionBox.ScaleHandlesFlip(Direction.Horizontal);
-                HandleFlip(Direction.Horizontal, false);
-            }
-            if (adjustedRect.Height < 0)
-            {
-                SelectionBox.ScaleHandlesFlip(Direction.Vertical);
-                HandleFlip(Direction.Vertical, false);
-            }
             if (adjustedRect.Width < 0 || adjustedRect.Height < 0)
+            {
+                if (adjustedRect.Width < 0)
+                {
+                    SelectionBox.FlipScaleHandles(Direction.Horizontal);
+                    HandleFlip(Direction.Horizontal, false);
+                }
+                if (adjustedRect.Height < 0)
+                {
+                    SelectionBox.FlipScaleHandles(Direction.Vertical);
+                    HandleFlip(Direction.Vertical, false);
+                }
                 return true;
+            }
 
             // scale adjust applied to each individual item should match that of the quad itself.
             var scaledDelta = new Vector2(
@@ -113,9 +115,8 @@ namespace osu.Game.Overlays.SkinEditor
                 updateDrawablePosition(drawableItem, newPositionInAdjusted);
 
                 if (Precision.AlmostEquals(MathF.Abs(drawableItem.Rotation) % 180, 90))
-                {
                     scaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
-                }
+
                 drawableItem.Scale *= scaledDelta;
             }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index a261b635b3..bbf9ea8c3c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -307,7 +307,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return button;
         }
 
-        public void ScaleHandlesFlip(Direction direction) => dragHandles.ScaleHandlesFlip(direction);
+        public void FlipScaleHandles(Direction direction) => dragHandles.FlipScaleHandles(direction);
 
         private void addScaleHandle(Anchor anchor)
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 4fd2e9aba9..e7f69b7b37 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             allDragHandles.Add(handle);
         }
 
-        public void ScaleHandlesFlip(Direction direction)
+        public void FlipScaleHandles(Direction direction)
         {
             foreach (var handle in scaleHandles)
             {

From 586ce6e8d3e6d9ebdbb629d3dff76a6539739cd4 Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Tue, 29 Aug 2023 17:47:42 +0200
Subject: [PATCH 1212/2100] fix multiple selected

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index afa592dfba..971ea3d266 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -73,14 +73,14 @@ namespace osu.Game.Overlays.SkinEditor
             adjustedRect.Width += scale.X;
             adjustedRect.Height += scale.Y;
 
-            if (adjustedRect.Width < 0 || adjustedRect.Height < 0)
+            if (adjustedRect.Width <= 0 || adjustedRect.Height <= 0)
             {
-                if (adjustedRect.Width < 0)
+                if (adjustedRect.Width <= 0)
                 {
                     SelectionBox.FlipScaleHandles(Direction.Horizontal);
                     HandleFlip(Direction.Horizontal, false);
                 }
-                if (adjustedRect.Height < 0)
+                if (adjustedRect.Height <= 0)
                 {
                     SelectionBox.FlipScaleHandles(Direction.Vertical);
                     HandleFlip(Direction.Vertical, false);
@@ -114,10 +114,11 @@ namespace osu.Game.Overlays.SkinEditor
 
                 updateDrawablePosition(drawableItem, newPositionInAdjusted);
 
+                var currentScaledDelta = scaledDelta;
                 if (Precision.AlmostEquals(MathF.Abs(drawableItem.Rotation) % 180, 90))
-                    scaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
+                    currentScaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
 
-                drawableItem.Scale *= scaledDelta;
+                drawableItem.Scale *= currentScaledDelta;
             }
 
             return true;

From ce1bc7156727ec30c059ab44dab689c4c6d990cc Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Tue, 29 Aug 2023 18:41:56 +0200
Subject: [PATCH 1213/2100] formatting

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 971ea3d266..2acddff0e4 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -80,11 +80,13 @@ namespace osu.Game.Overlays.SkinEditor
                     SelectionBox.FlipScaleHandles(Direction.Horizontal);
                     HandleFlip(Direction.Horizontal, false);
                 }
+
                 if (adjustedRect.Height <= 0)
                 {
                     SelectionBox.FlipScaleHandles(Direction.Vertical);
                     HandleFlip(Direction.Vertical, false);
                 }
+
                 return true;
             }
 

From b658b0e3462170adcb3a57901de17ee514a8d9c1 Mon Sep 17 00:00:00 2001
From: Nabile Rahmani <nabile13.pc@gmail.com>
Date: Tue, 29 Aug 2023 23:28:50 +0200
Subject: [PATCH 1214/2100] Fix and use score user's IsBot property in results
 screen animation

While a mod-created replay did flag itself as performed by a bot, the extension method converting it into a Score did not copy all the generated properties.

As noted, it might be preferable for ModCreatedUser to inherit APIUser and forward it as-is to the Score instance.

Related to PR #24675
---
 osu.Game/Rulesets/Mods/ModExtensions.cs   | 4 +++-
 osu.Game/Screens/Ranking/ResultsScreen.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModExtensions.cs b/osu.Game/Rulesets/Mods/ModExtensions.cs
index b22030414b..49a3c9178a 100644
--- a/osu.Game/Rulesets/Mods/ModExtensions.cs
+++ b/osu.Game/Rulesets/Mods/ModExtensions.cs
@@ -21,8 +21,10 @@ namespace osu.Game.Rulesets.Mods
                 {
                     User = new APIUser
                     {
-                        Id = APIUser.SYSTEM_USER_ID,
+                        // TODO: Some fields weren't copied from replayData.User (namely IsBot and Id). Should ModCreatedUser inherit from APIUser so we could pass it verbatim to avoid future mistakes ?
+                        Id = replayData.User.OnlineID,
                         Username = replayData.User.Username,
+                        IsBot = replayData.User.IsBot,
                     }
                 }
             };
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 1d0499c909..03231f9329 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Screens.Ranking
             if (Score != null)
             {
                 // only show flair / animation when arriving after watching a play that isn't autoplay.
-                bool shouldFlair = player != null && Score.Mods.All(m => m.UserPlayable);
+                bool shouldFlair = player != null && !Score.User.IsBot;
 
                 ScorePanelList.AddScore(Score, shouldFlair);
             }

From 270e2a66009b7b551837ad39ed45be9d3cdbf3b9 Mon Sep 17 00:00:00 2001
From: Nabile Rahmani <nabile13.pc@gmail.com>
Date: Tue, 29 Aug 2023 23:59:08 +0200
Subject: [PATCH 1215/2100] Update osu.Game/Rulesets/Mods/ModExtensions.cs
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/Mods/ModExtensions.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModExtensions.cs b/osu.Game/Rulesets/Mods/ModExtensions.cs
index 49a3c9178a..aa106f1203 100644
--- a/osu.Game/Rulesets/Mods/ModExtensions.cs
+++ b/osu.Game/Rulesets/Mods/ModExtensions.cs
@@ -21,7 +21,6 @@ namespace osu.Game.Rulesets.Mods
                 {
                     User = new APIUser
                     {
-                        // TODO: Some fields weren't copied from replayData.User (namely IsBot and Id). Should ModCreatedUser inherit from APIUser so we could pass it verbatim to avoid future mistakes ?
                         Id = replayData.User.OnlineID,
                         Username = replayData.User.Username,
                         IsBot = replayData.User.IsBot,

From a85f0d57911fd880bb7a406cd5bd82d3934f0b50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Aug 2023 13:29:08 +0900
Subject: [PATCH 1216/2100] Allow saving changes in tournament system using
 `Ctrl`+`S`

---
 osu.Game.Tournament/SaveChangesOverlay.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/SaveChangesOverlay.cs b/osu.Game.Tournament/SaveChangesOverlay.cs
index 7838d4ba48..0b5194a51f 100644
--- a/osu.Game.Tournament/SaveChangesOverlay.cs
+++ b/osu.Game.Tournament/SaveChangesOverlay.cs
@@ -7,13 +7,16 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
 using osuTK;
 
 namespace osu.Game.Tournament
 {
-    internal partial class SaveChangesOverlay : CompositeDrawable
+    internal partial class SaveChangesOverlay : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         [Resolved]
         private TournamentGame tournamentGame { get; set; } = null!;
@@ -78,6 +81,21 @@ namespace osu.Game.Tournament
             scheduleNextCheck();
         }
 
+        public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
+        {
+            if (e.Action == PlatformAction.Save && !e.Repeat)
+            {
+                saveChangesButton.TriggerClick();
+                return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<PlatformAction> e)
+        {
+        }
+
         private void scheduleNextCheck() => Scheduler.AddDelayed(() => checkForChanges().FireAndForget(), 1000);
 
         private void saveChanges()

From 24d6cbefe12b5ac570db353ebaeb2c7e3e192dad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Aug 2023 13:44:59 +0900
Subject: [PATCH 1217/2100] Remove tournament client minimum window size

This seemed like a good idea but people were using it with smaller
resolutions, do let's just not do it.

Addresses https://github.com/ppy/osu/discussions/24670.
---
 osu.Game.Tournament/TournamentGame.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index ba3b17b513..9baa448ab8 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -48,8 +48,6 @@ namespace osu.Game.Tournament
         {
             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)

From 0f123fd8e0be4127405236fec5cb4a114a5893fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 30 Aug 2023 08:20:57 +0200
Subject: [PATCH 1218/2100] Remove unused using directive

---
 osu.Game.Tournament/TournamentGame.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 9baa448ab8..25dc8ae1e5 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.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.Drawing;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;

From f277909470749c7ecadae849f4b25e30b1bf0260 Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Wed, 30 Aug 2023 09:16:16 +0200
Subject: [PATCH 1219/2100] maintain rotated selection's centre position

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 2acddff0e4..ff53095e22 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Overlays.SkinEditor
 
             // copy to mutate, as we will need to compare to the original later on.
             var adjustedRect = selectionRect;
+            bool isRotated = false;
 
             // for now aspect lock scale adjustments that occur at corners..
             if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
@@ -59,6 +60,7 @@ namespace osu.Game.Overlays.SkinEditor
             // this is to avoid requiring skew logic (which would likely not be the user's expected transform anyway).
             else if (SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation % 90, 0)))
             {
+                isRotated = true;
                 if (anchor.HasFlagFast(Anchor.x1))
                     // if dragging from the horizontal centre, only a vertical component is available.
                     scale.X = scale.Y / selectionRect.Height * selectionRect.Width;
@@ -70,6 +72,10 @@ namespace osu.Game.Overlays.SkinEditor
             if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
             if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
 
+            // Maintain the selection's centre position if dragging from the centre anchors and selection is rotated.
+            if (isRotated && anchor.HasFlagFast(Anchor.x1)) adjustedRect.X -= scale.X / 2;
+            if (isRotated && anchor.HasFlagFast(Anchor.y1)) adjustedRect.Y -= scale.Y / 2;
+
             adjustedRect.Width += scale.X;
             adjustedRect.Height += scale.Y;
 

From c91031604c20043e5e9315ef2eff5de6c708344d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 30 Aug 2023 21:41:57 +0300
Subject: [PATCH 1220/2100] Add test cases for hitting hit circles with "early
 fade" behaviour

---
 .../TestSceneHitCircleLateFade.cs             | 74 ++++++++++++++++---
 1 file changed, 64 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index 3c32b4fa65..149fd61311 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -3,8 +3,10 @@
 
 using System;
 using System.Linq;
+using FFmpeg.AutoGen;
 using NUnit.Framework;
 using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;
@@ -13,6 +15,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Tests.Visual;
 using osuTK;
 
@@ -23,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private float? alphaAtMiss;
 
         [Test]
-        public void TestHitCircleClassicMod()
+        public void TestHitCircleClassicModMiss()
         {
             AddStep("Create hit circle", () =>
             {
@@ -61,8 +64,21 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Transparent when missed", () => alphaAtMiss == 0);
         }
 
+        /// <summary>
+        /// No early fade is expected to be applied if the hit circle has been hit.
+        /// </summary>
         [Test]
-        public void TestHitCircleNoMod()
+        public void TestHitCircleClassicModHit()
+        {
+            AddStep("Create hit circle", () =>
+            {
+                SelectedMods.Value = new Mod[] { new OsuModClassic() };
+                createCircle(true);
+            });
+        }
+
+        [Test]
+        public void TestHitCircleNoModMiss()
         {
             AddStep("Create hit circle", () =>
             {
@@ -74,6 +90,16 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Opaque when missed", () => alphaAtMiss == 1);
         }
 
+        [Test]
+        public void TestHitCircleNoModHit()
+        {
+            AddStep("Create hit circle", () =>
+            {
+                SelectedMods.Value = Array.Empty<Mod>();
+                createCircle(true);
+            });
+        }
+
         [Test]
         public void TestSliderClassicMod()
         {
@@ -100,24 +126,27 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Head circle opaque when missed", () => alphaAtMiss == 1);
         }
 
-        private void createCircle()
+        private void createCircle(bool auto = false)
         {
             alphaAtMiss = null;
 
-            DrawableHitCircle drawableHitCircle = new DrawableHitCircle(new HitCircle
+            TestDrawableHitCircle drawableHitCircle = new TestDrawableHitCircle(new HitCircle
             {
                 StartTime = Time.Current + 500,
-                Position = new Vector2(250)
-            });
+                Position = new Vector2(250),
+            }, auto);
+
+            drawableHitCircle.Scale = new Vector2(2f);
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObject>())
                 mod.ApplyToDrawableHitObject(drawableHitCircle);
 
             drawableHitCircle.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            drawableHitCircle.OnNewResult += (_, _) =>
+            drawableHitCircle.OnNewResult += (_, result) =>
             {
-                alphaAtMiss = drawableHitCircle.Alpha;
+                if (!result.IsHit)
+                    alphaAtMiss = drawableHitCircle.Alpha;
             };
 
             Child = drawableHitCircle;
@@ -138,6 +167,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 })
             });
 
+            drawableSlider.Scale = new Vector2(2f);
+
             drawableSlider.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             drawableSlider.OnLoadComplete += _ =>
@@ -145,12 +176,35 @@ namespace osu.Game.Rulesets.Osu.Tests
                 foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObject>())
                     mod.ApplyToDrawableHitObject(drawableSlider.HeadCircle);
 
-                drawableSlider.HeadCircle.OnNewResult += (_, _) =>
+                drawableSlider.HeadCircle.OnNewResult += (_, result) =>
                 {
-                    alphaAtMiss = drawableSlider.HeadCircle.Alpha;
+                    if (!result.IsHit)
+                        alphaAtMiss = drawableSlider.HeadCircle.Alpha;
                 };
             };
             Child = drawableSlider;
         }
+
+        protected partial class TestDrawableHitCircle : DrawableHitCircle
+        {
+            private readonly bool auto;
+
+            public TestDrawableHitCircle(HitCircle h, bool auto)
+                : base(h)
+            {
+                this.auto = auto;
+            }
+
+            protected override void CheckForResult(bool userTriggered, double timeOffset)
+            {
+                if (auto && !userTriggered && timeOffset >= 0 && CheckHittable?.Invoke(this, Time.Current) != false)
+                {
+                    // force success
+                    ApplyResult(r => r.Type = HitResult.Great);
+                }
+                else
+                    base.CheckForResult(userTriggered, timeOffset);
+            }
+        }
     }
 }

From 993cebe785a07d8c9054a4e7bf6c36567b65ef61 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 30 Aug 2023 21:42:47 +0300
Subject: [PATCH 1221/2100] Fix mod "Classic" interfering with
 `DrawableHitCircle` animation while in hit state

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 250d97c537..e740e6d201 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -85,13 +85,16 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private void applyEarlyFading(DrawableHitCircle circle)
         {
-            circle.ApplyCustomUpdateState += (o, _) =>
+            circle.ApplyCustomUpdateState += (dho, state) =>
             {
-                using (o.BeginAbsoluteSequence(o.StateUpdateTime))
+                using (dho.BeginAbsoluteSequence(dho.StateUpdateTime))
                 {
-                    double okWindow = o.HitObject.HitWindows.WindowFor(HitResult.Ok);
-                    double lateMissFadeTime = o.HitObject.HitWindows.WindowFor(HitResult.Meh) - okWindow;
-                    o.Delay(okWindow).FadeOut(lateMissFadeTime);
+                    if (state != ArmedState.Hit)
+                    {
+                        double okWindow = dho.HitObject.HitWindows.WindowFor(HitResult.Ok);
+                        double lateMissFadeTime = dho.HitObject.HitWindows.WindowFor(HitResult.Meh) - okWindow;
+                        dho.Delay(okWindow).FadeOut(lateMissFadeTime);
+                    }
                 }
             };
         }

From b8df714f56c162376396efa2ee71a8c14894e276 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 30 Aug 2023 21:50:52 +0300
Subject: [PATCH 1222/2100] Remove unused using directives

---
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index 149fd61311..1557afbf84 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -3,10 +3,8 @@
 
 using System;
 using System.Linq;
-using FFmpeg.AutoGen;
 using NUnit.Framework;
 using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;

From 2d88135198c245a1185fe904b0d61abbd483319f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 16:18:18 +0900
Subject: [PATCH 1223/2100] Add automated test coverage for new test

---
 .../TestSceneHitCircleLateFade.cs             | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index 1557afbf84..3b051912fd 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -68,11 +68,17 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestHitCircleClassicModHit()
         {
+            TestDrawableHitCircle circle = null!;
+
             AddStep("Create hit circle", () =>
             {
                 SelectedMods.Value = new Mod[] { new OsuModClassic() };
-                createCircle(true);
+                circle = createCircle(true);
             });
+
+            AddUntilStep("Wait until circle is hit", () => circle.Result?.Type == HitResult.Great);
+            AddUntilStep("Wait for miss window", () => Clock.CurrentTime, () => Is.GreaterThanOrEqualTo(circle.HitObject.StartTime + circle.HitObject.HitWindows.WindowFor(HitResult.Miss)));
+            AddAssert("Check circle is still visible", () => circle.Alpha, () => Is.GreaterThan(0));
         }
 
         [Test]
@@ -124,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Head circle opaque when missed", () => alphaAtMiss == 1);
         }
 
-        private void createCircle(bool auto = false)
+        private TestDrawableHitCircle createCircle(bool shouldHit = false)
         {
             alphaAtMiss = null;
 
@@ -132,7 +138,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + 500,
                 Position = new Vector2(250),
-            }, auto);
+            }, shouldHit);
 
             drawableHitCircle.Scale = new Vector2(2f);
 
@@ -148,6 +154,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             };
 
             Child = drawableHitCircle;
+
+            return drawableHitCircle;
         }
 
         private void createSlider()
@@ -180,22 +188,23 @@ namespace osu.Game.Rulesets.Osu.Tests
                         alphaAtMiss = drawableSlider.HeadCircle.Alpha;
                 };
             };
+
             Child = drawableSlider;
         }
 
         protected partial class TestDrawableHitCircle : DrawableHitCircle
         {
-            private readonly bool auto;
+            private readonly bool shouldHit;
 
-            public TestDrawableHitCircle(HitCircle h, bool auto)
+            public TestDrawableHitCircle(HitCircle h, bool shouldHit)
                 : base(h)
             {
-                this.auto = auto;
+                this.shouldHit = shouldHit;
             }
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (auto && !userTriggered && timeOffset >= 0 && CheckHittable?.Invoke(this, Time.Current) != false)
+                if (shouldHit && !userTriggered && timeOffset >= 0 && CheckHittable?.Invoke(this, Time.Current) != false)
                 {
                     // force success
                     ApplyResult(r => r.Type = HitResult.Great);

From 5241634c491e058aae4026a0a81a34d80e1dffde Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 31 Aug 2023 16:31:54 +0900
Subject: [PATCH 1224/2100] Add one more test

---
 .../TestSceneHoldNoteInput.cs                 | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 77db1b0bd8..ebf25d7a9b 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -192,6 +192,25 @@ namespace osu.Game.Rulesets.Mania.Tests
             assertTailJudgement(HitResult.Miss);
         }
 
+        /// <summary>
+        ///     -----[           ]-----
+        ///          xox         o
+        /// </summary>
+        [Test]
+        public void TestPressAtStartThenReleaseAndImmediatelyRepress()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(time_head, ManiaAction.Key1),
+                new ManiaReplayFrame(time_head + 1),
+                new ManiaReplayFrame(time_head + 2, ManiaAction.Key1),
+                new ManiaReplayFrame(time_tail),
+            });
+
+            assertHeadJudgement(HitResult.Perfect);
+            assertTailJudgement(HitResult.Meh);
+        }
+
         /// <summary>
         ///     -----[           ]-----
         ///          xo  x               o

From c60f13dd92133d8d7359450cf1e3284bbfda2bc3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 31 Aug 2023 17:30:27 +0900
Subject: [PATCH 1225/2100] Remove mania hold note ticks

---
 .../TestSceneHoldNoteInput.cs                 |  57 ---------
 .../Objects/Drawables/DrawableHoldNote.cs     |  17 ---
 .../Objects/Drawables/DrawableHoldNoteTick.cs | 110 ------------------
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   |  34 ------
 .../Objects/HoldNoteTick.cs                   |  19 ---
 osu.Game.Rulesets.Mania/UI/Column.cs          |   1 -
 osu.Game.Rulesets.Mania/UI/Stage.cs           |   4 -
 7 files changed, 242 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
 delete mode 100644 osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index ebf25d7a9b..1bf768012e 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -54,7 +54,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
             assertNoteJudgement(HitResult.IgnoreMiss);
         }
@@ -73,7 +72,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Perfect);
             assertNoteJudgement(HitResult.IgnoreHit);
         }
@@ -92,7 +90,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
             assertNoteJudgement(HitResult.IgnoreMiss);
         }
@@ -111,7 +108,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -129,7 +125,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -149,7 +144,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -169,7 +163,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Perfect);
         }
 
@@ -188,7 +181,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -227,7 +219,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -247,7 +238,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Meh);
         }
 
@@ -265,7 +255,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -283,7 +272,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Meh);
         }
 
@@ -377,7 +365,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             }, beatmap);
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
 
             assertHitObjectJudgement(note, HitResult.Good);
@@ -424,7 +411,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             }, beatmap);
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
 
             assertHitObjectJudgement(note, HitResult.Great);
@@ -444,7 +430,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Meh);
         }
 
@@ -495,42 +480,6 @@ namespace osu.Game.Rulesets.Mania.Tests
                                                                        .All(j => j.Type.IsHit()));
         }
 
-        [Test]
-        public void TestHitTailBeforeLastTick()
-        {
-            const int tick_rate = 8;
-            const double tick_spacing = TimingControlPoint.DEFAULT_BEAT_LENGTH / tick_rate;
-            const double time_last_tick = time_head + tick_spacing * (int)((time_tail - time_head) / tick_spacing - 1);
-
-            var beatmap = new Beatmap<ManiaHitObject>
-            {
-                HitObjects =
-                {
-                    new HoldNote
-                    {
-                        StartTime = time_head,
-                        Duration = time_tail - time_head,
-                        Column = 0,
-                    }
-                },
-                BeatmapInfo =
-                {
-                    Difficulty = new BeatmapDifficulty { SliderTickRate = tick_rate },
-                    Ruleset = new ManiaRuleset().RulesetInfo
-                },
-            };
-
-            performTest(new List<ReplayFrame>
-            {
-                new ManiaReplayFrame(time_head, ManiaAction.Key1),
-                new ManiaReplayFrame(time_last_tick - 5)
-            }, beatmap);
-
-            assertHeadJudgement(HitResult.Perfect);
-            assertLastTickJudgement(HitResult.LargeTickMiss);
-            assertTailJudgement(HitResult.Ok);
-        }
-
         [Test]
         public void TestZeroLength()
         {
@@ -570,12 +519,6 @@ namespace osu.Game.Rulesets.Mania.Tests
         private void assertNoteJudgement(HitResult result)
             => AddAssert($"hold note judged as {result}", () => judgementResults.Single(j => j.HitObject is HoldNote).Type, () => Is.EqualTo(result));
 
-        private void assertTickJudgement(HitResult result)
-            => AddAssert($"any tick judged as {result}", () => judgementResults.Where(j => j.HitObject is HoldNoteTick).Select(j => j.Type), () => Does.Contain(result));
-
-        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 = null!;
 
         private void performTest(List<ReplayFrame> frames, Beatmap<ManiaHitObject>? beatmap = null)
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index c3fec92b92..3032a3ee39 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -38,7 +38,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private Container<DrawableHoldNoteHead> headContainer;
         private Container<DrawableHoldNoteTail> tailContainer;
-        private Container<DrawableHoldNoteTick> tickContainer;
 
         private PausableSkinnableSound slidingSample;
 
@@ -110,7 +109,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 {
                     RelativeSizeAxes = Axes.X
                 },
-                tickContainer = new Container<DrawableHoldNoteTick> { RelativeSizeAxes = Axes.Both },
                 tailContainer = new Container<DrawableHoldNoteTail> { RelativeSizeAxes = Axes.Both },
                 slidingSample = new PausableSkinnableSound { Looping = true }
             });
@@ -118,7 +116,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             maskedContents.AddRange(new[]
             {
                 bodyPiece.CreateProxy(),
-                tickContainer.CreateProxy(),
                 tailContainer.CreateProxy(),
             });
         }
@@ -153,10 +150,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 case DrawableHoldNoteTail tail:
                     tailContainer.Child = tail;
                     break;
-
-                case DrawableHoldNoteTick tick:
-                    tickContainer.Add(tick);
-                    break;
             }
         }
 
@@ -165,7 +158,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             base.ClearNestedHitObjects();
             headContainer.Clear(false);
             tailContainer.Clear(false);
-            tickContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
@@ -177,9 +169,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
                 case HeadNote head:
                     return new DrawableHoldNoteHead(head);
-
-                case HoldNoteTick tick:
-                    return new DrawableHoldNoteTick(tick);
             }
 
             return base.CreateNestedHitObject(hitObject);
@@ -266,12 +255,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             if (Tail.AllJudged)
             {
-                foreach (var tick in tickContainer)
-                {
-                    if (!tick.Judged)
-                        tick.MissForcefully();
-                }
-
                 if (Tail.IsHit)
                     ApplyResult(r => r.Type = r.Judgement.MaxResult);
                 else
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
deleted file mode 100644
index ce6a83f79f..0000000000
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
+++ /dev/null
@@ -1,110 +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;
-using System.Diagnostics;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
-
-namespace osu.Game.Rulesets.Mania.Objects.Drawables
-{
-    /// <summary>
-    /// Visualises a <see cref="HoldNoteTick"/> hit object.
-    /// </summary>
-    public partial class DrawableHoldNoteTick : DrawableManiaHitObject<HoldNoteTick>
-    {
-        /// <summary>
-        /// References the time at which the user started holding the hold note.
-        /// </summary>
-        private Func<double?> holdStartTime;
-
-        private Container glowContainer;
-
-        public DrawableHoldNoteTick()
-            : this(null)
-        {
-        }
-
-        public DrawableHoldNoteTick(HoldNoteTick hitObject)
-            : base(hitObject)
-        {
-            Anchor = Anchor.TopCentre;
-            Origin = Anchor.TopCentre;
-
-            RelativeSizeAxes = Axes.X;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AddInternal(glowContainer = new CircularContainer
-            {
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                Children = new[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                        AlwaysPresent = true
-                    }
-                }
-            });
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            AccentColour.BindValueChanged(colour =>
-            {
-                glowContainer.EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Glow,
-                    Radius = 2f,
-                    Roundness = 15f,
-                    Colour = colour.NewValue.Opacity(0.3f)
-                };
-            }, true);
-        }
-
-        protected override void OnApply()
-        {
-            base.OnApply();
-
-            Debug.Assert(ParentHitObject != null);
-
-            var holdNote = (DrawableHoldNote)ParentHitObject;
-            holdStartTime = () => holdNote.HoldStartTime;
-        }
-
-        protected override void OnFree()
-        {
-            base.OnFree();
-
-            holdStartTime = null;
-        }
-
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
-        {
-            if (Time.Current < HitObject.StartTime)
-                return;
-
-            double? startTime = holdStartTime?.Invoke();
-
-            if (startTime == null || startTime > HitObject.StartTime)
-                ApplyResult(r => r.Type = r.Judgement.MinResult);
-            else
-                ApplyResult(r => r.Type = r.Judgement.MaxResult);
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index c367886efe..333912dd0c 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -6,8 +6,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using osu.Game.Audio;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
@@ -83,25 +81,10 @@ namespace osu.Game.Rulesets.Mania.Objects
 
         public override double MaximumJudgementOffset => Tail.MaximumJudgementOffset;
 
-        /// <summary>
-        /// The time between ticks of this hold.
-        /// </summary>
-        private double tickSpacing = 50;
-
-        protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
-        {
-            base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
-
-            TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
-            tickSpacing = timingPoint.BeatLength / difficulty.SliderTickRate;
-        }
-
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             base.CreateNestedHitObjects(cancellationToken);
 
-            createTicks(cancellationToken);
-
             AddNested(Head = new HeadNote
             {
                 StartTime = StartTime,
@@ -117,23 +100,6 @@ namespace osu.Game.Rulesets.Mania.Objects
             });
         }
 
-        private void createTicks(CancellationToken cancellationToken)
-        {
-            if (tickSpacing == 0)
-                return;
-
-            for (double t = StartTime + tickSpacing; t <= EndTime - tickSpacing; t += tickSpacing)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                AddNested(new HoldNoteTick
-                {
-                    StartTime = t,
-                    Column = Column
-                });
-            }
-        }
-
         public override Judgement CreateJudgement() => new IgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs
deleted file mode 100644
index e5c5260a49..0000000000
--- a/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs
+++ /dev/null
@@ -1,19 +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.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Judgements;
-using osu.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Mania.Objects
-{
-    /// <summary>
-    /// A scoring tick of a hold note.
-    /// </summary>
-    public class HoldNoteTick : ManiaHitObject
-    {
-        public override Judgement CreateJudgement() => new HoldNoteTickJudgement();
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index f38571a6d3..1c4f0462ec 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -112,7 +112,6 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);
-            RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 250);
         }
 
         private void onSourceChanged()
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 4382f8e84a..fa9af6d157 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -195,10 +195,6 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            // Tick judgements should not display text.
-            if (judgedObject is DrawableHoldNoteTick)
-                return;
-
             judgements.Clear(false);
             judgements.Add(judgementPool.Get(j =>
             {

From 5fa31b7b359ca15a5a0cde035df2279a22f695d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 18:05:34 +0900
Subject: [PATCH 1226/2100] Fix schedule screen not responding to new matches
 being added

---
 .../Screens/Schedule/ScheduleScreen.cs        | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 063c231add..ee4b762be3 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -19,6 +20,7 @@ namespace osu.Game.Tournament.Screens.Schedule
 {
     public partial class ScheduleScreen : TournamentScreen
     {
+        private readonly BindableList<TournamentMatch> allMatches = new BindableList<TournamentMatch>();
         private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
         private Container mainContainer = null!;
         private LadderInfo ladder = null!;
@@ -101,16 +103,23 @@ namespace osu.Game.Tournament.Screens.Schedule
         {
             base.LoadComplete();
 
+            allMatches.BindTo(ladder.Matches);
+            allMatches.BindCollectionChanged((_, _) => refresh());
+
             currentMatch.BindTo(ladder.CurrentMatch);
-            currentMatch.BindValueChanged(matchChanged, true);
+            currentMatch.BindValueChanged(_ => refresh(), true);
         }
 
-        private void matchChanged(ValueChangedEvent<TournamentMatch?> match)
+        private void refresh()
         {
-            var upcoming = ladder.Matches.Where(p => !p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4);
-            var conditionals = ladder
-                               .Matches.Where(p => !p.Completed.Value && (p.Team1.Value == null || p.Team2.Value == null) && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
-                               .SelectMany(m => m.ConditionalMatches.Where(cp => m.Acronyms.TrueForAll(a => cp.Acronyms.Contains(a))));
+            IEnumerable<TournamentMatch> upcoming =
+                allMatches
+                    .Where(p => !p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4);
+
+            IEnumerable<ConditionalTournamentMatch> conditionals =
+                allMatches
+                    .Where(p => !p.Completed.Value && (p.Team1.Value == null || p.Team2.Value == null) && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
+                    .SelectMany(m => m.ConditionalMatches.Where(cp => m.Acronyms.TrueForAll(a => cp.Acronyms.Contains(a))));
 
             upcoming = upcoming.Concat(conditionals);
             upcoming = upcoming.OrderBy(p => p.Date.Value).Take(8);
@@ -137,12 +146,12 @@ namespace osu.Game.Tournament.Screens.Schedule
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Width = 0.4f,
-                                    ChildrenEnumerable = ladder.Matches
-                                                               .Where(p => p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null
-                                                                           && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
-                                                               .OrderByDescending(p => p.Date.Value)
-                                                               .Take(8)
-                                                               .Select(p => new ScheduleMatch(p))
+                                    ChildrenEnumerable = allMatches
+                                                         .Where(p => p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null
+                                                                     && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
+                                                         .OrderByDescending(p => p.Date.Value)
+                                                         .Take(8)
+                                                         .Select(p => new ScheduleMatch(p))
                                 },
                                 new ScheduleContainer("upcoming matches")
                                 {
@@ -161,7 +170,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                 }
             };
 
-            if (match.NewValue != null)
+            if (currentMatch.Value != null)
             {
                 comingUpNext.Child = new FillFlowContainer
                 {
@@ -170,12 +179,12 @@ namespace osu.Game.Tournament.Screens.Schedule
                     Spacing = new Vector2(30),
                     Children = new Drawable[]
                     {
-                        new ScheduleMatch(match.NewValue, false)
+                        new ScheduleMatch(currentMatch.Value, false)
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                         },
-                        new TournamentSpriteTextWithBackground(match.NewValue.Round.Value?.Name.Value ?? string.Empty)
+                        new TournamentSpriteTextWithBackground(currentMatch.Value.Round.Value?.Name.Value ?? string.Empty)
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
@@ -185,7 +194,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Text = match.NewValue.Team1.Value?.FullName + " vs " + match.NewValue.Team2.Value?.FullName,
+                            Text = currentMatch.Value.Team1.Value?.FullName + " vs " + currentMatch.Value.Team2.Value?.FullName,
                             Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold)
                         },
                         new FillFlowContainer
@@ -196,7 +205,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                             Origin = Anchor.CentreLeft,
                             Children = new Drawable[]
                             {
-                                new ScheduleMatchDate(match.NewValue.Date.Value)
+                                new ScheduleMatchDate(currentMatch.Value.Date.Value)
                                 {
                                     Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
                                 }

From 7aa1505062cd3d15082d3e10dbf9cc232048b6c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 18:13:36 +0900
Subject: [PATCH 1227/2100] Improve legibility of LINQ queries for
 recent/upcoming matches

---
 .../Screens/Schedule/ScheduleScreen.cs        | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index ee4b762be3..62c54daa75 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -112,17 +112,25 @@ namespace osu.Game.Tournament.Screens.Schedule
 
         private void refresh()
         {
-            IEnumerable<TournamentMatch> upcoming =
-                allMatches
-                    .Where(p => !p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4);
+            const int days_for_displays = 4;
 
             IEnumerable<ConditionalTournamentMatch> conditionals =
                 allMatches
-                    .Where(p => !p.Completed.Value && (p.Team1.Value == null || p.Team2.Value == null) && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
+                    .Where(m => !m.Completed.Value && (m.Team1.Value == null || m.Team2.Value == null) && Math.Abs(m.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < days_for_displays)
                     .SelectMany(m => m.ConditionalMatches.Where(cp => m.Acronyms.TrueForAll(a => cp.Acronyms.Contains(a))));
 
-            upcoming = upcoming.Concat(conditionals);
-            upcoming = upcoming.OrderBy(p => p.Date.Value).Take(8);
+            IEnumerable<TournamentMatch> upcoming =
+                allMatches
+                    .Where(m => !m.Completed.Value && m.Team1.Value != null && m.Team2.Value != null && Math.Abs(m.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < days_for_displays)
+                    .Concat(conditionals)
+                    .OrderBy(m => m.Date.Value)
+                    .Take(8);
+
+            var recent =
+                allMatches
+                    .Where(m => m.Completed.Value && m.Team1.Value != null && m.Team2.Value != null && Math.Abs(m.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < days_for_displays)
+                    .OrderByDescending(m => m.Date.Value)
+                    .Take(8);
 
             ScheduleContainer comingUpNext;
 
@@ -146,12 +154,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Width = 0.4f,
-                                    ChildrenEnumerable = allMatches
-                                                         .Where(p => p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null
-                                                                     && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
-                                                         .OrderByDescending(p => p.Date.Value)
-                                                         .Take(8)
-                                                         .Select(p => new ScheduleMatch(p))
+                                    ChildrenEnumerable = recent.Select(p => new ScheduleMatch(p))
                                 },
                                 new ScheduleContainer("upcoming matches")
                                 {

From 4b68493084a4f9b87bbead6fdb02367d5d062832 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 18:05:18 +0900
Subject: [PATCH 1228/2100] Add ability to test recent / upcoming matches on
 schedule screen

---
 .../Screens/TestSceneScheduleScreen.cs        | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index f3c3fdec97..a58f09d13a 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
@@ -12,6 +12,13 @@ namespace osu.Game.Tournament.Tests.Screens
 {
     public partial class TestSceneScheduleScreen : TournamentScreenTestScene
     {
+        public override void SetUpSteps()
+        {
+            AddStep("clear matches", () => Ladder.Matches.Clear());
+
+            base.SetUpSteps();
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -34,6 +41,36 @@ namespace osu.Game.Tournament.Tests.Screens
             AddStep("Set null current match", () => Ladder.CurrentMatch.Value = null);
         }
 
+        [Test]
+        public void TestUpcomingMatches()
+        {
+            AddStep("Add upcoming match", () =>
+            {
+                var tournamentMatch = CreateSampleMatch();
+
+                tournamentMatch.Date.Value = DateTimeOffset.UtcNow.AddMinutes(5);
+                tournamentMatch.Completed.Value = false;
+
+                Ladder.Matches.Add(tournamentMatch);
+            });
+        }
+
+        [Test]
+        public void TestRecentMatches()
+        {
+            AddStep("Add recent match", () =>
+            {
+                var tournamentMatch = CreateSampleMatch();
+
+                tournamentMatch.Date.Value = DateTimeOffset.UtcNow;
+                tournamentMatch.Completed.Value = true;
+                tournamentMatch.Team1Score.Value = tournamentMatch.PointsToWin;
+                tournamentMatch.Team2Score.Value = tournamentMatch.PointsToWin / 2;
+
+                Ladder.Matches.Add(tournamentMatch);
+            });
+        }
+
         private void setMatchDate(TimeSpan relativeTime)
             // Humanizer cannot handle negative timespans.
             => AddStep($"start time is {relativeTime}", () =>

From 540c58c359ed47ee758519da0b089621be41b7cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 18:46:47 +0900
Subject: [PATCH 1229/2100] Fix tournament screen tests not matching
 `OsuGameBase` resolution

This would cause things to look completely out of whack.

The numbers here match `DrawSizePreservingFillContainer` defaults as
used by `OsuGameBase.CreateScalingContainer()`.
---
 osu.Game.Tournament.Tests/TournamentScreenTestScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs b/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
index 8adffe1468..e8cca00c92 100644
--- a/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tournament.Tests
         {
             public TournamentScalingContainer()
             {
-                TargetDrawSize = new Vector2(1920, 1080);
+                TargetDrawSize = new Vector2(1024, 768);
                 RelativeSizeAxes = Axes.Both;
             }
 

From 4bdaca3816ad8cf6ddd3125fce83c5c11e975a20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 18:05:04 +0900
Subject: [PATCH 1230/2100] Fix regression in spacing on schedule screen

---
 osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 62c54daa75..d02559d6b7 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -294,6 +294,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                             {
                                 Direction = FillDirection.Vertical,
                                 RelativeSizeAxes = Axes.Both,
+                                Spacing = new Vector2(0, -6),
                                 Margin = new MarginPadding(10)
                             },
                         }

From 34b279845bf4d4569b8cc9897cba0b58e4219c20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 19:03:56 +0900
Subject: [PATCH 1231/2100] Add more testability for song bar

---
 osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
index e0444b6126..95d6b6d107 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
@@ -58,9 +58,14 @@ namespace osu.Game.Tournament.Tests.Components
 
                 songBar.Beatmap = new TournamentBeatmap(beatmap);
             });
+
             AddStep("set mods to HR", () => songBar.Mods = LegacyMods.HardRock);
             AddStep("set mods to DT", () => songBar.Mods = LegacyMods.DoubleTime);
             AddStep("unset mods", () => songBar.Mods = LegacyMods.None);
+
+            AddToggleStep("toggle expanded", expanded => songBar.Expanded = expanded);
+
+            AddStep("set null beatmap", () => songBar.Beatmap = null);
         }
     }
 }

From cf9c8120c5292774b8aec7d2b0282003cdca32d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 19:04:06 +0900
Subject: [PATCH 1232/2100] Fix potential race condition in song bar beatmap
 lookup flow

Cancelling a web request may not necessarily cancel the callbacks.

This might help with https://github.com/ppy/osu/issues/24598.
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index bf835122cc..5407c21079 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -92,8 +92,16 @@ namespace osu.Game.Tournament.IPC
                                     else
                                     {
                                         beatmapLookupRequest = new GetBeatmapRequest(new APIBeatmap { OnlineID = beatmapId });
-                                        beatmapLookupRequest.Success += b => Beatmap.Value = new TournamentBeatmap(b);
-                                        beatmapLookupRequest.Failure += _ => Beatmap.Value = null;
+                                        beatmapLookupRequest.Success += b =>
+                                        {
+                                            if (lastBeatmapId == beatmapId)
+                                                Beatmap.Value = new TournamentBeatmap(b);
+                                        };
+                                        beatmapLookupRequest.Failure += _ =>
+                                        {
+                                            if (lastBeatmapId == beatmapId)
+                                                Beatmap.Value = null;
+                                        };
                                         API.Queue(beatmapLookupRequest);
                                     }
                                 }

From 47160f7744823a4f53716fbc001b707003430a15 Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Thu, 31 Aug 2023 20:24:26 +0200
Subject: [PATCH 1233/2100] make getClosestAnchor work with rotated drawable

---
 .../SkinEditor/SkinSelectionHandler.cs        | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 72216f040e..fe2816db6f 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -291,7 +291,7 @@ namespace osu.Game.Overlays.SkinEditor
             if (parent == null)
                 return drawable.Anchor;
 
-            var screenPosition = getScreenPosition();
+            var screenPosition = drawable.ToScreenSpace(drawable.OriginPosition);
 
             var absolutePosition = parent.ToLocalSpace(screenPosition);
             var factor = parent.RelativeToAbsoluteFactor;
@@ -313,26 +313,6 @@ namespace osu.Game.Overlays.SkinEditor
             result |= getAnchorFromPosition(absolutePosition.Y / factor.Y, Anchor.y0, Anchor.y1, Anchor.y2);
 
             return result;
-
-            Vector2 getScreenPosition()
-            {
-                var quad = drawable.ScreenSpaceDrawQuad;
-                var origin = drawable.Origin;
-
-                var pos = quad.TopLeft;
-
-                if (origin.HasFlagFast(Anchor.x2))
-                    pos.X += quad.Width;
-                else if (origin.HasFlagFast(Anchor.x1))
-                    pos.X += quad.Width / 2f;
-
-                if (origin.HasFlagFast(Anchor.y2))
-                    pos.Y += quad.Height;
-                else if (origin.HasFlagFast(Anchor.y1))
-                    pos.Y += quad.Height / 2f;
-
-                return pos;
-            }
         }
 
         private static void applyAnchor(Drawable drawable, Anchor anchor)

From c75b14c72994c51a54b4f01fc16a4f52c22d9c4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 Sep 2023 16:54:35 +0900
Subject: [PATCH 1234/2100] Apply NRT to new `LegacyHitPolicy` class (and other
 implementations)

---
 osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs      |  4 +---
 osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs        |  7 ++++---
 .../UI/StartTimeOrderedHitPolicy.cs                | 14 +++++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
index 69bd360b5e..2c6895d7ec 100644
--- a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
@@ -14,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class AnyOrderHitPolicy : IHitPolicy
     {
-        public IHitObjectContainer HitObjectContainer { get; set; }
+        public IHitObjectContainer HitObjectContainer { get; set; } = null!;
 
         public ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result) => ClickAction.Hit;
 
diff --git a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
index 2b6359fb46..daf498581e 100644
--- a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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.Objects;
@@ -22,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class LegacyHitPolicy : IHitPolicy
     {
-        public IHitObjectContainer HitObjectContainer { get; set; }
+        public IHitObjectContainer? HitObjectContainer { get; set; }
 
         private readonly double hittableRange;
 
@@ -37,6 +35,9 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public virtual ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result)
         {
+            if (HitObjectContainer == null)
+                throw new InvalidOperationException($"{nameof(HitObjectContainer)} should be set before {nameof(CheckHittable)} is called.");
+
             var aliveObjects = HitObjectContainer.AliveObjects.ToList();
             int index = aliveObjects.IndexOf(hitObject);
 
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 6fd0b512be..2b24fb9398 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -23,11 +21,14 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class StartTimeOrderedHitPolicy : IHitPolicy
     {
-        public IHitObjectContainer HitObjectContainer { get; set; }
+        public IHitObjectContainer? HitObjectContainer { get; set; }
 
         public ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult _)
         {
-            DrawableHitObject blockingObject = null;
+            if (HitObjectContainer == null)
+                throw new InvalidOperationException($"{nameof(HitObjectContainer)} should be set before {nameof(CheckHittable)} is called.");
+
+            DrawableHitObject? blockingObject = null;
 
             foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))
             {
@@ -48,6 +49,9 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public void HandleHit(DrawableHitObject hitObject)
         {
+            if (HitObjectContainer == null)
+                throw new InvalidOperationException($"{nameof(HitObjectContainer)} should be set before {nameof(HandleHit)} is called.");
+
             // Hitobjects which themselves don't block future hitobjects don't cause misses (e.g. slider ticks, spinners).
             if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
@@ -75,7 +79,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
         {
-            foreach (var obj in HitObjectContainer.AliveObjects)
+            foreach (var obj in HitObjectContainer!.AliveObjects)
             {
                 if (obj.HitObject.StartTime >= targetTime)
                     yield break;

From ede9fae38166e69e85ee7fbd643109b218eea4d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 Sep 2023 17:19:39 +0900
Subject: [PATCH 1235/2100] Remove broken check from
 `TestSceneHitCircleLateFade`

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index 3b051912fd..d74a31ada4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -204,7 +204,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (shouldHit && !userTriggered && timeOffset >= 0 && CheckHittable?.Invoke(this, Time.Current) != false)
+                if (shouldHit && !userTriggered && timeOffset >= 0)
                 {
                     // force success
                     ApplyResult(r => r.Type = HitResult.Great);

From 6ce251fbb5023705bc01325741e61b548b33502d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 Sep 2023 19:17:53 +0900
Subject: [PATCH 1236/2100] Expose base `VisualisationMethod` so we don't need
 to `new` it locally per ruleset

---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs         | 7 -------
 osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index eb99434e04..9169599798 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Configuration;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -51,12 +50,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
-        public new ScrollVisualisationMethod VisualisationMethod
-        {
-            get => base.VisualisationMethod;
-            set => base.VisualisationMethod = value;
-        }
-
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
         private readonly BindableInt configScrollSpeed = new BindableInt();
         private double smoothTimeRange;
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index d082d26792..6abfc6ee49 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         private ScrollVisualisationMethod visualisationMethod = ScrollVisualisationMethod.Sequential;
 
-        protected ScrollVisualisationMethod VisualisationMethod
+        public ScrollVisualisationMethod VisualisationMethod
         {
             get => visualisationMethod;
             set

From 37c2b330a235a99fe999be7975c256325fa8c50a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 Sep 2023 19:49:57 +0900
Subject: [PATCH 1237/2100] Move toggle implementation to work on all scrolling
 rulesets automatically

---
 .../Edit/CatchHitObjectComposer.cs            |  1 +
 .../Mods/TestSceneManiaModConstantSpeed.cs    |  2 +-
 .../Edit/DrawableManiaEditorRuleset.cs        | 19 +-----
 .../Edit/ManiaHitObjectComposer.cs            | 30 +--------
 .../Edit/TaikoHitObjectComposer.cs            |  2 +-
 .../Edit/DistancedHitObjectComposer.cs        |  2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  5 +-
 .../Edit/ScrollingHitObjectComposer.cs        | 62 +++++++++++++++++++
 8 files changed, 73 insertions(+), 50 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index f2877572e8..136a78b343 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -26,6 +26,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Catch.Edit
 {
     public partial class CatchHitObjectComposer : DistancedHitObjectComposer<CatchHitObject>
+        // we're also a ScrollingHitObjectComposer candidate, but can't be everything can we?
     {
         private const float distance_snap_radius = 50;
 
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs
index dc4f660a45..474430414c 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             PassCondition = () =>
             {
                 var hitObject = Player.ChildrenOfType<DrawableManiaHitObject>().FirstOrDefault();
-                return hitObject?.Dependencies.Get<IScrollingInfo>().Algorithm is ConstantScrollAlgorithm;
+                return hitObject?.Dependencies.Get<IScrollingInfo>().Algorithm.Value is ConstantScrollAlgorithm;
             }
         });
     }
diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index 013dd3dcbd..1741dad5d6 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -2,23 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osuTK;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
     public partial class DrawableManiaEditorRuleset : DrawableManiaRuleset
     {
-        public readonly IBindable<TernaryState> ShowSpeedChanges = new Bindable<TernaryState>();
-
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
         public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods)
@@ -26,18 +21,6 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            ShowSpeedChanges.BindValueChanged(state =>
-            {
-                VisualisationMethod = state.NewValue == TernaryState.True
-                    ? ScrollVisualisationMethod.Sequential
-                    : ScrollVisualisationMethod.Constant;
-            }, true);
-        }
-
         protected override Playfield CreatePlayfield() => new ManiaEditorPlayfield(Beatmap.Stages)
         {
             Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 44e238efac..9bde9485b2 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -6,13 +6,8 @@
 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.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Objects;
@@ -21,16 +16,13 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public partial class ManiaHitObjectComposer : HitObjectComposer<ManiaHitObject>
+    public partial class ManiaHitObjectComposer : ScrollingHitObjectComposer<ManiaHitObject>
     {
-        private readonly Bindable<TernaryState> showSpeedChanges = new Bindable<TernaryState>();
-
         private DrawableManiaEditorRuleset drawableRuleset;
         private ManiaBeatSnapGrid beatSnapGrid;
         private InputManager inputManager;
@@ -44,21 +36,6 @@ namespace osu.Game.Rulesets.Mania.Edit
         private void load()
         {
             AddInternal(beatSnapGrid = new ManiaBeatSnapGrid());
-
-            LeftToolbox.Add(new EditorToolboxGroup("playfield")
-            {
-                Child = new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(0, 5),
-                    Children = new[]
-                    {
-                        new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
-                    }
-                },
-            });
         }
 
         protected override void LoadComplete()
@@ -82,10 +59,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
-            drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods)
-            {
-                ShowSpeedChanges = { BindTarget = showSpeedChanges }
-            };
+            drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods);
 
             // This is the earliest we can cache the scrolling info to ourselves, before masks are added to the hierarchy and inject it
             dependencies.CacheAs(drawableRuleset.ScrollingInfo);
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index 3e63d624e7..fbad8c7fad 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -9,7 +9,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Taiko.Edit
 {
-    public partial class TaikoHitObjectComposer : HitObjectComposer<TaikoHitObject>
+    public partial class TaikoHitObjectComposer : ScrollingHitObjectComposer<TaikoHitObject>
     {
         protected override bool ApplyHorizontalCentering => false;
 
diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index 817e8bd5fe..d1db8cb1f1 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Edit
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load()
         {
             RightToolbox.Add(new EditorToolboxGroup("snapping")
             {
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index c967187b5c..295a016c7b 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -87,6 +87,8 @@ namespace osu.Game.Rulesets.Edit
         private IBindable<bool> hasTiming;
         private Bindable<bool> autoSeekOnPlacement;
 
+        protected DrawableRuleset<TObject> DrawableRuleset { get; private set; }
+
         protected HitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
@@ -104,7 +106,8 @@ namespace osu.Game.Rulesets.Edit
 
             try
             {
-                drawableRulesetWrapper = new DrawableEditorRulesetWrapper<TObject>(CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap, new[] { Ruleset.GetAutoplayMod() }))
+                DrawableRuleset = CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap, new[] { Ruleset.GetAutoplayMod() });
+                drawableRulesetWrapper = new DrawableEditorRulesetWrapper<TObject>(DrawableRuleset)
                 {
                     Clock = EditorClock,
                     ProcessCustomClock = false
diff --git a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
new file mode 100644
index 0000000000..0340354016
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
@@ -0,0 +1,62 @@
+// Copyright (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;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
+using osuTK;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public abstract partial class ScrollingHitObjectComposer<TObject> : HitObjectComposer<TObject>
+        where TObject : HitObject
+    {
+        private readonly Bindable<TernaryState> showSpeedChanges = new Bindable<TernaryState>();
+
+        protected ScrollingHitObjectComposer(Ruleset ruleset)
+            : base(ruleset)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (DrawableRuleset is DrawableScrollingRuleset<TObject> drawableScrollingRuleset)
+            {
+                var originalVisualisationMethod = drawableScrollingRuleset.VisualisationMethod;
+
+                if (originalVisualisationMethod != ScrollVisualisationMethod.Constant)
+                {
+                    LeftToolbox.Add(new EditorToolboxGroup("playfield")
+                    {
+                        Child = new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(0, 5),
+                            Children = new[]
+                            {
+                                new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
+                            }
+                        },
+                    });
+
+                    showSpeedChanges.BindValueChanged(state =>
+                    {
+                        drawableScrollingRuleset.VisualisationMethod = state.NewValue == TernaryState.True
+                            ? originalVisualisationMethod
+                            : ScrollVisualisationMethod.Constant;
+                    }, true);
+                }
+            }
+        }
+    }
+}

From fc4069f794e91e6ea1eb4a4b28c334b12e301a85 Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Fri, 1 Sep 2023 13:01:51 +0200
Subject: [PATCH 1238/2100] let SelectionBox perform flip with scale handles

---
 .../SkinEditor/SkinSelectionHandler.cs        | 14 ++++---------
 .../Edit/Compose/Components/SelectionBox.cs   | 20 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index ff53095e22..b30351f61b 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -81,18 +81,12 @@ namespace osu.Game.Overlays.SkinEditor
 
             if (adjustedRect.Width <= 0 || adjustedRect.Height <= 0)
             {
-                if (adjustedRect.Width <= 0)
-                {
-                    SelectionBox.FlipScaleHandles(Direction.Horizontal);
-                    HandleFlip(Direction.Horizontal, false);
-                }
+                Axes toFlip = Axes.None;
 
-                if (adjustedRect.Height <= 0)
-                {
-                    SelectionBox.FlipScaleHandles(Direction.Vertical);
-                    HandleFlip(Direction.Vertical, false);
-                }
+                if (adjustedRect.Width <= 0) toFlip |= Axes.X;
+                if (adjustedRect.Height <= 0) toFlip |= Axes.Y;
 
+                SelectionBox.PerformFlipFromScaleHandles(toFlip);
                 return true;
             }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index bbf9ea8c3c..0c19f6c62e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -307,7 +308,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return button;
         }
 
-        public void FlipScaleHandles(Direction direction) => dragHandles.FlipScaleHandles(direction);
+        /// <remarks>
+        /// This method should be called when a selection needs to be flipped
+        /// because of an ongoing scale handle drag that would otherwise cause width or height to go negative.
+        /// </remarks>
+        public void PerformFlipFromScaleHandles(Axes axes)
+        {
+            if (axes.HasFlagFast(Axes.X))
+            {
+                dragHandles.FlipScaleHandles(Direction.Horizontal);
+                OnFlip?.Invoke(Direction.Horizontal, false);
+            }
+
+            if (axes.HasFlagFast(Axes.Y))
+            {
+                dragHandles.FlipScaleHandles(Direction.Vertical);
+                OnFlip?.Invoke(Direction.Vertical, false);
+            }
+        }
 
         private void addScaleHandle(Anchor anchor)
         {

From 0fd445f913d44c2e89c2a291147167ac14c2735f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 1 Sep 2023 20:42:27 +0900
Subject: [PATCH 1239/2100] Adjust test to fail

---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 1bf768012e..5bc477535d 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -200,7 +200,9 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
+            assertCombo(1);
             assertTailJudgement(HitResult.Meh);
+            assertCombo(1);
         }
 
         /// <summary>
@@ -519,6 +521,9 @@ namespace osu.Game.Rulesets.Mania.Tests
         private void assertNoteJudgement(HitResult result)
             => AddAssert($"hold note judged as {result}", () => judgementResults.Single(j => j.HitObject is HoldNote).Type, () => Is.EqualTo(result));
 
+        private void assertCombo(int combo)
+            => AddAssert($"combo is {combo}", () => currentPlayer.ScoreProcessor.Combo.Value, () => Is.EqualTo(combo));
+
         private ScoreAccessibleReplayPlayer currentPlayer = null!;
 
         private void performTest(List<ReplayFrame> frames, Beatmap<ManiaHitObject>? beatmap = null)

From f74dfa9c6cc23c2807225b3e69be4f6ba446adac Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Sep 2023 22:55:32 +0300
Subject: [PATCH 1240/2100] Apply flashlight slider dim immediately to match
 osu!(stable)

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index efeac9a180..765af80959 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             public void OnSliderTrackingChange(ValueChangedEvent<bool> e)
             {
                 // If a slider is in a tracking state, a further dim should be applied to the (remaining) visible portion of the playfield over a brief duration.
-                this.TransformTo(nameof(FlashlightDim), e.NewValue ? 0.8f : 0.0f, 50);
+                FlashlightDim = e.NewValue ? 0.8f : 0.0f;
             }
 
             protected override bool OnMouseMove(MouseMoveEvent e)

From 920c6fa48facbd43c5edbae6ea1e66468fadc9b3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Sep 2023 23:29:51 +0300
Subject: [PATCH 1241/2100] Update comment

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index 765af80959..252d7e2762 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             public void OnSliderTrackingChange(ValueChangedEvent<bool> e)
             {
-                // If a slider is in a tracking state, a further dim should be applied to the (remaining) visible portion of the playfield over a brief duration.
+                // If a slider is in a tracking state, a further dim should be applied to the (remaining) visible portion of the playfield.
                 FlashlightDim = e.NewValue ? 0.8f : 0.0f;
             }
 

From b0398b62595bbf099ce957cafe9af3ea9769f16a Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 3 Sep 2023 02:09:01 +0300
Subject: [PATCH 1242/2100] functionality is done

---
 osu.Game/Beatmaps/BeatmapShortInfo.cs         |  29 +++
 osu.Game/Overlays/Mods/ModMapInfoContainer.cs | 171 +++++++++++++---
 osu.Game/Overlays/Mods/ModMapInfoDisplay.cs   | 185 ------------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  17 +-
 .../Overlays/Mods/VerticalAttributeDisplay.cs |  76 +++++++
 osu.Game/Screens/Select/BeatmapDetailArea.cs  |   4 -
 .../Screens/Select/Details/AdvancedStats.cs   |  33 ++--
 osu.Game/Screens/Select/SongSelect.cs         |   2 +-
 8 files changed, 287 insertions(+), 230 deletions(-)
 create mode 100644 osu.Game/Beatmaps/BeatmapShortInfo.cs
 delete mode 100644 osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
 create mode 100644 osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs

diff --git a/osu.Game/Beatmaps/BeatmapShortInfo.cs b/osu.Game/Beatmaps/BeatmapShortInfo.cs
new file mode 100644
index 0000000000..633e12d1b2
--- /dev/null
+++ b/osu.Game/Beatmaps/BeatmapShortInfo.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 System;
+
+namespace osu.Game.Beatmaps
+{
+    public class BeatmapShortInfo : IEquatable<BeatmapShortInfo>
+    {
+        public StarDifficulty StarDifficulty;
+        public float CircleSize;
+        public float DrainRate;
+        public float ApproachRate;
+        public float OverallDifficulty;
+        public double BPM;
+        public bool Equals(BeatmapShortInfo? other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return StarDifficulty.Stars == other.StarDifficulty.Stars &&
+                   CircleSize.Equals(other.CircleSize) &&
+                   DrainRate.Equals(other.DrainRate) &&
+                   ApproachRate.Equals(other.ApproachRate) &&
+                   OverallDifficulty.Equals(other.OverallDifficulty) &&
+                   BPM.Equals(other.BPM);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
index eb5291b0a8..378e6f6057 100644
--- a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
+++ b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
@@ -1,24 +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.Linq;
+#nullable disable
+
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Overlays.BeatmapSet;
-using osu.Game.Resources.Localisation.Web;
-using osu.Game.Screens.Select.Details;
 using osuTK;
 using osuTK.Graphics;
 
@@ -26,33 +23,161 @@ namespace osu.Game.Overlays.Mods
 {
     public partial class ModMapInfoContainer : Container
     {
-        private ModMapInfoDisplay starRatingDisplay = null!;
+        private Container content;
+        private Container innerContent;
+
+        private Box background;
+        private Box innerBackground;
+
+        private StarRatingDisplay starRatingDisplay;
+        private BPMDisplay bpmDisplay;
+
+        private VerticalAttributeDisplay circleSizeDisplay;
+        private VerticalAttributeDisplay drainRateDisplay;
+        private VerticalAttributeDisplay approachRateDisplay;
+        private VerticalAttributeDisplay overallDifficultyDisplay;
 
         [Resolved]
-        private OsuColour colours { get; set; } = null!;
+        private OverlayColourProvider colourProvider { get; set; }
 
         [Resolved]
-        private Bindable<BeatmapInfo> adjustedInfo { get; set; } = null!;
-        private Bindable<double> starRatingValue = new Bindable<double>();
+        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; }
 
-        //public ModMapInfoContainer()
-        //{
-        //    
-        //}
+        public ModMapInfoContainer()
+        {
+            // values as ModSelectOverlay footer buttons
+            const float shear = ShearedOverlayContainer.SHEAR;
+            const float corner_radius = 7;
+            const float border_thickness = 2;
 
+            InternalChild = content = new InputBlockingContainer
+            {
+                Origin = Anchor.BottomRight,
+                Anchor = Anchor.BottomRight,
+                AutoSizeAxes = Axes.X,
+                Height = 50, // as ModSelectOverlay footer buttons
+                Shear = new Vector2(shear, 0),
+                CornerRadius = corner_radius,
+                BorderThickness = border_thickness,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new FillFlowContainer // divide inner and outer content
+                    {
+                        Origin = Anchor.BottomLeft,
+                        Anchor = Anchor.BottomLeft,
+                        AutoSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Y,
+                        Direction = FillDirection.Horizontal,
+                        Children = new Drawable[]
+                        {
+                            innerContent = new Container
+                            {
+                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Y,
+                                BorderThickness = border_thickness,
+                                CornerRadius = corner_radius,
+                                Masking = true,
+                                Children = new Drawable[]
+                                {
+                                    innerBackground = new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both
+                                    },
+                                    new FillFlowContainer // actual inner content
+                                    {
+                                        Origin = Anchor.CentreLeft,
+                                        Anchor = Anchor.CentreLeft,
+                                        AutoSizeAxes = Axes.X,
+                                        Direction = FillDirection.Horizontal,
+                                        Margin = new MarginPadding { Horizontal = 15 },
+                                        Children = new Drawable[]
+                                        {
+                                            new Container // wrap to reserve space for StarRatingDisplay
+                                            {
+                                                Width = 70, // can be up to 70px on extra high SR
+                                                Child = starRatingDisplay = new StarRatingDisplay(default, animated: true)
+                                                {
+                                                    Origin = Anchor.CentreLeft,
+                                                    Anchor = Anchor.CentreLeft,
+                                                    Shear = new Vector2(-shear, 0),
+                                                }
+                                            },
+                                            new Container // wrap to reserve space for BPM
+                                            {
+                                                Origin = Anchor.CentreLeft,
+                                                Anchor = Anchor.CentreLeft,
+                                                Width = 70,
+                                                Child = bpmDisplay = new BPMDisplay
+                                                {
+                                                    Origin = Anchor.CentreLeft,
+                                                    Anchor = Anchor.CentreLeft,
+                                                    Shear = new Vector2(-shear, 0),
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            new FillFlowContainer<VerticalAttributeDisplay> // outer content
+                            {
+                                Origin = Anchor.CentreLeft,
+                                Anchor = Anchor.CentreLeft,
+                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Y,
+                                Direction = FillDirection.Horizontal,
+                                Children = new[]
+                                {
+                                    circleSizeDisplay = new VerticalAttributeDisplay("CS"),
+                                    drainRateDisplay = new VerticalAttributeDisplay("HP"),
+                                    approachRateDisplay = new VerticalAttributeDisplay("AR"),
+                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD"),
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
         protected override void LoadComplete()
         {
-            starRatingDisplay = new ModMapInfoDisplay("Star Rating", colours.ForStarDifficulty);
-            starRatingDisplay.Current.BindTo(starRatingValue);
+            adjustedInfo.BindValueChanged(e => { UpdateValues(); }, true);
 
-            Content.Add(starRatingDisplay);
+            background.Colour = colourProvider.Background4;
+            innerBackground.Colour = colourProvider.Background3;
+            Color4 glow_colour = colourProvider.Background1;
 
-            adjustedInfo.BindValueChanged(e => { updateValues(); }, true);
+            content.BorderColour = ColourInfo.GradientVertical(background.Colour, glow_colour);
+            innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glow_colour);
         }
 
-        private void updateValues()
+        public void UpdateValues()
         {
-            starRatingValue.Value = adjustedInfo.Value.StarRating;
+            if (adjustedInfo.Value == null) return;
+
+            starRatingDisplay.Current.Value = adjustedInfo.Value.StarDifficulty;
+            bpmDisplay.Current.Value = adjustedInfo.Value.BPM;
+
+            circleSizeDisplay.Current.Value = adjustedInfo.Value.CircleSize;
+            drainRateDisplay.Current.Value = adjustedInfo.Value.DrainRate;
+            approachRateDisplay.Current.Value = adjustedInfo.Value.ApproachRate;
+            overallDifficultyDisplay.Current.Value = adjustedInfo.Value.OverallDifficulty;
+        }
+
+        private partial class BPMDisplay : RollingCounter<double>
+        {
+            protected override double RollingDuration => 500;
+
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0 BPM");
+
+            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
+            {
+                Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold)
+            };
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs b/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
deleted file mode 100644
index ca815984ce..0000000000
--- a/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
+++ /dev/null
@@ -1,185 +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.Bindables;
-using osu.Framework.Extensions.LocalisationExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Localisation;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Localisation;
-using osuTK;
-
-
-namespace osu.Game.Overlays.Mods
-{
-    public partial class ModMapInfoDisplay : Container, IHasCurrentValue<double>
-    {
-        public const float HEIGHT = 42;
-        private const float transition_duration = 200;
-
-        private readonly Box contentBackground;
-        private readonly Box labelBackground;
-        private readonly FillFlowContainer content;
-
-        //public Bindable<double> Current
-        //{
-        //    get => current.Current;
-        //    set => current.Current = value;
-        //}
-        //private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
-
-        public Bindable<double> Current { get; set; } = new BindableWithCurrent<double>();
-
-        //[Resolved]
-        //private OsuColour colours { get; set; } = null!;
-
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
-
-        protected Func<double, osuTK.Graphics.Color4> GetColor;
-
-        /// <summary>
-        /// Text to display in the left area of the display.
-        /// </summary>
-        protected LocalisableString Label;
-
-        protected virtual float ValueAreaWidth => 56;
-
-        protected virtual string CounterFormat => @"0.00";
-
-        protected override Container<Drawable> Content => content;
-
-        protected readonly RollingCounter<double> Counter;
-
-        public ModMapInfoDisplay(LocalisableString label, Func<double, osuTK.Graphics.Color4> colorFunc)
-        {
-            Label = label;
-            GetColor = colorFunc;
-            Height = HEIGHT;
-            AutoSizeAxes = Axes.X;
-
-            InternalChild = new InputBlockingContainer
-            {
-                RelativeSizeAxes = Axes.Y,
-                AutoSizeAxes = Axes.X,
-                Masking = true,
-                CornerRadius = ModSelectPanel.CORNER_RADIUS,
-                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
-                Children = new Drawable[]
-                {
-                    contentBackground = new Box
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        RelativeSizeAxes = Axes.Y,
-                        Width = ValueAreaWidth + ModSelectPanel.CORNER_RADIUS
-                    },
-                    new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Y,
-                        AutoSizeAxes = Axes.X,
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, ValueAreaWidth)
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
-                            {
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.Y,
-                                    AutoSizeAxes = Axes.X,
-                                    Masking = true,
-                                    CornerRadius = ModSelectPanel.CORNER_RADIUS,
-                                    Children = new Drawable[]
-                                    {
-                                        labelBackground = new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both
-                                        },
-                                        new OsuSpriteText
-                                        {
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                            Margin = new MarginPadding { Horizontal = 18 },
-                                            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                            Text = Label,
-                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
-                                        }
-                                    }
-                                },
-                                content = new FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Direction = FillDirection.Horizontal,
-                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    Spacing = new Vector2(2, 0),
-                                    Child = Counter = new EffectCounter(CounterFormat)
-                                    {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        Current = { BindTarget = Current }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            labelBackground.Colour = colourProvider.Background4;
-        }
-
-        protected override void LoadComplete()
-        {
-            Current.BindValueChanged(e =>
-            {
-                //var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
-                setColours(e.NewValue);
-            }, true);
-        }
-
-        /// <summary>
-        /// Fades colours of text and its background according to displayed value.
-        /// </summary>
-        /// <param name="value">value</param>
-        private void setColours(double value)
-        {
-            contentBackground.FadeColour(GetColor(value), transition_duration, Easing.OutQuint);
-        }
-
-        private partial class EffectCounter : RollingCounter<double>
-        {
-            private readonly string? format;
-
-            public EffectCounter(string? format)
-            {
-                this.format = format;
-            }
-
-            protected override double RollingDuration => 500;
-
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(format);
-
-            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
-            {
-                Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
-            };
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a178f2e9dc..426c424541 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -222,13 +222,18 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
-            aboveColumnsContent.Add(mapInfoContainer = new ModMapInfoContainer
+            FooterContent.Add(mapInfoContainer = new ModMapInfoContainer
             {
-                Anchor = Anchor.TopLeft,
-                Origin = Anchor.TopLeft
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
+                Padding = new MarginPadding
+                {
+                    Vertical = PADDING,
+                    Horizontal = 70
+                },
             });
 
-            FooterContent.Child = footerButtonFlow = new FillFlowContainer<ShearedButton>
+            FooterContent.Add(footerButtonFlow = new FillFlowContainer<ShearedButton>
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
@@ -248,7 +253,7 @@ namespace osu.Game.Overlays.Mods
                     DarkerColour = colours.Pink2,
                     LighterColour = colours.Pink1
                 })
-            };
+            });
 
             globalAvailableMods.BindTo(game.AvailableMods);
         }
@@ -413,7 +418,7 @@ namespace osu.Game.Overlays.Mods
             if (mapInfoContainer == null)
                 return;
 
-            //mapInfoDisplay.Current.Value = 5;
+            mapInfoContainer.UpdateValues();
         }
 
         private void updateCustomisation()
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
new file mode 100644
index 0000000000..2ad420657c
--- /dev/null
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.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.Bindables;
+using osu.Framework.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+
+namespace osu.Game.Overlays.Mods
+{
+    public partial class VerticalAttributeDisplay : Container, IHasCurrentValue<double>
+    {
+        public Bindable<double> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+        private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
+
+        /// <summary>
+        /// Text to display in the top area of the display.
+        /// </summary>
+        public LocalisableString Label { get; protected set; }
+
+        public VerticalAttributeDisplay(LocalisableString label)
+        {
+            Label = label;
+            AutoSizeAxes = Axes.X;
+            Origin = Anchor = Anchor.CentreLeft;
+            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0);
+            InternalChild = new FillFlowContainer
+            {
+                Origin = Anchor.CentreLeft,
+                Anchor = Anchor.CentreLeft,
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Text = Label,
+                        Margin = new MarginPadding { Horizontal = 15 }, // to reserve space for 0.XX value
+                        Font = OsuFont.Default.With(size: 20, weight: FontWeight.Bold)
+                    },
+                    new EffectCounter()
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Current = { BindTarget = Current }
+                    }
+                }
+            };
+        }
+
+        private partial class EffectCounter : RollingCounter<double>
+        {
+            protected override double RollingDuration => 500;
+
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.##");
+
+            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
+            {
+                Font = OsuFont.Default.With(size: 18, weight: FontWeight.SemiBold)
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs
index d43831e576..595b86924b 100644
--- a/osu.Game/Screens/Select/BeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using System;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -31,9 +30,6 @@ namespace osu.Game.Screens.Select
 
         public readonly BeatmapDetails Details;
 
-        //[Cached]
-        //public Bindable<BeatmapInfo> AdjustedInfo { get; private set; } = new Bindable<BeatmapInfo>();
-
         protected Bindable<BeatmapDetailAreaTabItem> CurrentTab => tabControl.Current;
 
         protected Bindable<bool> CurrentModsFilter => tabControl.CurrentModsFilter;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 8f609888df..31fac8b4a0 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -46,10 +46,8 @@ namespace osu.Game.Screens.Select.Details
 
         private IBeatmapInfo beatmapInfo;
 
-#nullable enable
-        [Resolved]
-        private Bindable<BeatmapInfo>? adjustedInfo { get; set; } = null;
-#nullable disable
+        [Resolved(canBeNull: true)]
+        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; } = null;
 
         public IBeatmapInfo BeatmapInfo
         {
@@ -104,19 +102,30 @@ namespace osu.Game.Screens.Select.Details
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedStatisticsUpdate;
 
+        private StarDifficulty latestStarDifficulty = new StarDifficulty();
         private void updateBindedInfo()
         {
             if (adjustedInfo == null) return;
 
-            BeatmapInfo adjusted = (BeatmapInfo)beatmapInfo;
-            adjusted.Difficulty.CircleSize = FirstValue.Value.adjustedValue ?? 0;
-            adjusted.Difficulty.DrainRate = HpDrain.Value.adjustedValue ?? 0;
-            adjusted.Difficulty.ApproachRate = ApproachRate.Value.adjustedValue ?? 5;
-            adjusted.Difficulty.OverallDifficulty = Accuracy.Value.adjustedValue ?? 0;
-            adjusted.StarRating = starDifficulty.Value.adjustedValue ?? 0;
+            // sadly need to calculate this to prevent additional data transportation
+            double rate = 1;
+            foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                rate = mod.ApplyToRate(0, rate);
+
+            double bpm = 0;
+            if (beatmapInfo != null) bpm = beatmapInfo.BPM * rate;
+
+            BeatmapShortInfo adjusted = new BeatmapShortInfo()
+            {
+                CircleSize = FirstValue.Value.adjustedValue ?? FirstValue.Value.baseValue,
+                DrainRate = HpDrain.Value.adjustedValue ?? HpDrain.Value.baseValue,
+                ApproachRate = ApproachRate.Value.adjustedValue ?? ApproachRate.Value.baseValue,
+                OverallDifficulty = Accuracy.Value.adjustedValue ?? Accuracy.Value.baseValue,
+                BPM = bpm,
+                StarDifficulty = latestStarDifficulty
+            };
 
             adjustedInfo.Value = adjusted;
-            adjustedInfo.TriggerChange();
         }
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
@@ -165,6 +174,7 @@ namespace osu.Game.Screens.Select.Details
             Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty);
             ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
 
+            updateBindedInfo(); // to faster UI response (without SR calculation)
             updateStarDifficulty();
 
         }
@@ -199,6 +209,7 @@ namespace osu.Game.Screens.Select.Details
                     return;
 
                 starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
+                latestStarDifficulty = moddedDifficulty ?? default;
                 updateBindedInfo();
 
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4567869e8e..ad98d1721b 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Select
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
 
         [Cached]
-        private Bindable<BeatmapInfo> adjustedInfo { get; set; } = new Bindable<BeatmapInfo>();
+        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; } = new Bindable<BeatmapShortInfo>();
 
         protected BeatmapCarousel Carousel { get; private set; } = null!;
 

From 0779cd8f4f998c2d9b29fd71787681875bec9979 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 3 Sep 2023 02:17:04 +0300
Subject: [PATCH 1243/2100] minor design fixes

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 59 ++++++++++++----------
 osu.Game/Screens/Select/SongSelect.cs      |  4 --
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 426c424541..8de4447b31 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -222,41 +222,44 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
-            FooterContent.Add(mapInfoContainer = new ModMapInfoContainer
+            FooterContent.Children = new Drawable[]
             {
-                Anchor = Anchor.BottomRight,
-                Origin = Anchor.BottomRight,
-                Padding = new MarginPadding
+                mapInfoContainer = new ModMapInfoContainer
                 {
-                    Vertical = PADDING,
-                    Horizontal = 70
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    Padding = new MarginPadding
+                    {
+                        Vertical = PADDING,
+                        Horizontal = 70
+                    }
                 },
-            });
-
-            FooterContent.Add(footerButtonFlow = new FillFlowContainer<ShearedButton>
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Horizontal,
-                Anchor = Anchor.BottomLeft,
-                Origin = Anchor.BottomLeft,
-                Padding = new MarginPadding
+                footerButtonFlow = new FillFlowContainer<ShearedButton>
                 {
-                    Vertical = PADDING,
-                    Horizontal = 70
-                },
-                Spacing = new Vector2(10),
-                ChildrenEnumerable = CreateFooterButtons().Prepend(BackButton = new ShearedButton(BUTTON_WIDTH)
-                {
-                    Text = CommonStrings.Back,
-                    Action = Hide,
-                    DarkerColour = colours.Pink2,
-                    LighterColour = colours.Pink1
-                })
-            });
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Horizontal,
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Padding = new MarginPadding
+                    {
+                        Vertical = PADDING,
+                        Horizontal = 70
+                    },
+                    Spacing = new Vector2(10),
+                    ChildrenEnumerable = CreateFooterButtons().Prepend(BackButton = new ShearedButton(BUTTON_WIDTH)
+                    {
+                        Text = CommonStrings.Back,
+                        Action = Hide,
+                        DarkerColour = colours.Pink2,
+                        LighterColour = colours.Pink1
+                    })
+                }
+            };
 
             globalAvailableMods.BindTo(game.AvailableMods);
         }
+
         public override void Hide()
         {
             base.Hide();
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ad98d1721b..7749e3937a 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -308,9 +308,6 @@ namespace osu.Game.Screens.Select
             // therein it will be registered at the `OsuGame` level to properly function as a blocking overlay.
             LoadComponent(ModSelect = CreateModSelectOverlay());
 
-            //var bindedStats = BeatmapDetails.Details.GetBindedAdjustedMapStats();
-            //ModSelect.SetBindedMapStats(bindedStats);
-
             if (Footer != null)
             {
                 foreach (var (button, overlay) in CreateFooterButtons())
@@ -586,7 +583,6 @@ namespace osu.Game.Screens.Select
             FilterControl.Activate();
 
             ModSelect.SelectedMods.BindTo(selectedMods);
-            //BeatmapDetails.AdjustedInfo.BindTo(adjustedInfo);
 
             beginLooping();
         }

From 5e5fe84a88d15af428ee6bff7ecd3e46b26bbf65 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 3 Sep 2023 02:19:02 +0300
Subject: [PATCH 1244/2100] Update AdvancedStats.cs

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 31fac8b4a0..a12323ab70 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -176,7 +176,6 @@ namespace osu.Game.Screens.Select.Details
 
             updateBindedInfo(); // to faster UI response (without SR calculation)
             updateStarDifficulty();
-
         }
 
         private CancellationTokenSource starDifficultyCancellationSource;

From 2c81fe5613e79e2e9370f19d40a1839e28a20c45 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 2 Sep 2023 01:29:57 +0300
Subject: [PATCH 1245/2100] Make gameplay skin elements in `special-skin`
 awfully large

---
 .../special-skin/fruit-apple-overlay.png      | Bin 4677 -> 26684 bytes
 .../Resources/special-skin/fruit-apple.png    | Bin 4677 -> 26685 bytes
 .../special-skin/fruit-bananas-overlay.png    | Bin 4949 -> 23898 bytes
 .../Resources/special-skin/fruit-bananas.png  | Bin 4949 -> 23899 bytes
 .../special-skin/fruit-drop-overlay.png       | Bin 4677 -> 26684 bytes
 .../Resources/special-skin/fruit-drop.png     | Bin 4677 -> 26684 bytes
 .../special-skin/fruit-grapes-overlay.png     | Bin 4677 -> 26684 bytes
 .../Resources/special-skin/fruit-grapes.png   | Bin 4633 -> 26684 bytes
 .../special-skin/fruit-orange-overlay.png     | Bin 4633 -> 26685 bytes
 .../Resources/special-skin/fruit-orange.png   | Bin 4633 -> 26685 bytes
 .../special-skin/fruit-pear-overlay.png       | Bin 4633 -> 26685 bytes
 .../Resources/special-skin/fruit-pear.png     | Bin 4633 -> 26686 bytes
 .../Resources/special-skin/hitcircle@2x.png   | Bin 245645 -> 295339 bytes
 .../special-skin/hitcircleoverlay-0@2x.png    | Bin 26595 -> 87032 bytes
 .../special-skin/hitcircleoverlay-1@2x.png    | Bin 40858 -> 119975 bytes
 .../Resources/old-skin/taiko-roll-end.png     | Bin 0 -> 2095 bytes
 .../Resources/old-skin/taiko-roll-middle.png  | Bin 0 -> 140 bytes
 .../special-skin/taiko-drum-inner.png         | Bin 0 -> 1926 bytes
 .../special-skin/taiko-drum-outer.png         | Bin 0 -> 3749 bytes
 .../Resources/special-skin/taiko-roll-end.png | Bin 0 -> 14570 bytes
 .../special-skin/taiko-roll-middle.png        | Bin 0 -> 4791 bytes
 ...ikobigcircle@2x.png => taikobigcircle.png} | Bin
 .../special-skin/taikobigcircleoverlay.png    | Bin 0 -> 66280 bytes
 .../Resources/special-skin/taikohitcircle.png | Bin 0 -> 12374 bytes
 .../special-skin/taikohitcircleoverlay.png    | Bin 0 -> 66281 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png
 rename osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/{taikobigcircle@2x.png => taikobigcircle.png} (100%)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png
index fe567d158d0b47f06c39eca9d055b9c8361b040a..c6e27996b92328a0c6fbcf3fb9f4f6b6598bbdfb 100755
GIT binary patch
literal 26684
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

literal 4677
zcmV-L61we)P)<h;3K|Lk000e1NJLTq004jh004jp1ONa4X*a1r00009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C
z2XaY7K~#7F<-uD_ly@G-;qRahf|3Z<YGUNH(wo*Ru*ss;1k)8I#nwVEZRB#@8xL8x
zEqEB$xK&#BZZ%Q2ZP02PtxI}~b^|KgXi=<(TP<Q~mSHT4O9J!RkmlF_3<U(_F!R38
zqp3qK>-ZzJoZ%v^JRr=^4EUKa4`}5gr`gXYUS*!VgGIc>VH$}r79D)UVcueqk`=Qk
z;UKL%uT~CH!Ym~ZW>Cr}gqcWTKB1HuN_6B9qK(PYMu;3GDvCKvKO<?Uf#cLr#RgVV
z$V=pt&r1}tk_}W*!*LpTz)1QzOR*9SYq`X5I{BLSSi=h%C0<|+@9{OA4CfMSl_*$6
zBSVSOObyFP(KwO9a%yNM%1|0vrRhdK=NQU$c95e9LJm8)&QQ+rJ53jY?4gIj9&?l;
zO#+HI%3}uWVGlt~J&O6B!G7d@vNVa9$4-7^uv-*sDiP#w^b_wVwvnbOKpNZliFo~d
zNUEj=1zaUw4<Y7i3Ne=uJ;b|8fhHes&_%p6WNR9b%^Bi#@rEW70YXHHb)Pa#Bg*)J
zSW!X*G&xA+bK;#KL(_~5P7v=jvo-O^q>)%*DwH6opo>_IWNKpZBG-x4LcS6R`Lq!0
zIxlMCu$Vi<sv}(qhICF6>kf-GF<8JIVuc7O0TCcXtUD~w^J5-2aQdiH0;7sPoEv27
z`4HsaIK8~11jjq{;xrP}_z|EEr<Zai0m|vcsUx8AVlPe~l}Zv+(uWh$`0xf%oXtui
zyh{`lrCejjQX)79lw>%76Je>wh9K8)P7zR&A;2k|YXmhGe2CLRx{?s-wBQ`n=uu1`
zCQQDP6#0ZPeH3eSNaYqzg_0PRIJZdEXs{dSgpwTp#M!N9Baf$;`(!A|k->e;Q}XmI
zoW&`V2T+D{RwH8-&gb$7PT{Q5NNB=zvsfNMHcv238XjwLcF9B7jZ>=Oa2eCV9C-+H
z=)hdo(D*&hHhBzNaaL$3oX512CXXSFcFcMG7CH1|s^vjcWBSR}V1zK;%$Em|MK>m-
zc+BJn%u#t1M=)*7R4iV{DUwG~gj1?m9K*E8!)U>LDu-EgVs^;G*pBHUC_@P*N{&2?
zY@(PoGSp)JBafpQQ!B$wOpQE_8qD|l1q*SC<Z&#=S)>7M#B`D(k0XUn%-b5kN0@r~
z0QH!UHGoFUPWb?T!8B?B5lo4EfD%lEfXKy}FCSn&PM%nYX_HUThA9(UFb(nv8ZcYL
zA<QxP1jjIk#21)q`2-(ez7!WQRq_d{Fc(BC=1utoZ(>@-L(B^K1S>G@B7#{apI{j#
zBDygz%O`jR(=D8A`2^YgN;ui_39|W>=*GM(pWqctw}@bt$tPHbiHL`oV)+CsFzw<d
zW`lf!4Vata0;WnnK^5kL_ySWcpWp+`m*NoSn0$g`m_uR<ra?YI17?d@hiQ{f(1s}!
zxj0$!0p{c6Ng{$Nkq=OUc|<@GjhLPC0d`^<HGq#W_3{DgF&}FH8!`VSMIJ{AotU>Z
zfQ2}P@;Hic7U>t<!qmv)sKMNl;qRDcc^u7{S{eR;iIOc3Bbz8@jSNA;nC<c~wqv>o
z%HbHMMIOd?m`@dp*KvyEQ54~nDi$+o!yJ)E@efQJGZl{zrkgBz5Sesi_GvJ3>Bm&d
zgQ&*zldIq2Jf@vAc?@Z^W6o<RtiahSk6|m$N)3(6m=5O1LzqJc=8A?xDb6l=2)l6B
zX?QeYx>+obU<pq!moySq<D8O5a0+L&M#edu_3{AL<9wxOA&;k+dt@ldk->e;Q}Xm|
z?7=y%B*zJykVb=4ZsAlYiBW-bn^cVs#q?o1$ybshpD?D66&gJb;IxpgBt$wbI0rNq
z1o;-{BmpHE0-VJ8mY~Llr9^P{E6MOzoCpOPJIaY-qP(jl!X~1aDCHU-LO6X?DoIdD
zA5KW)MSwb-UdojOD5n>vj)2CGAeV4@sZ@fal3tuE1oeE#q!p)+DkU&B(}&Yark)=Q
zxQi2IF99VW0_-J<bC(607%b*4vFb=uf+3wcV%=r2CJqa^POKL4lt9R%g;+OOsEI`u
zO~eXQp#(t%VPZ9rrHRLEP807q8JcEfaDsSen61e{fPF-Xb&oPlBg(i(tSI{kXfjbw
zgm|aP)-)iS)5Lp3xh5Y4TqRx)yO^sf#9VgKL%gdLXlgKv1N0NGgRP`#3XsNDI*8ZL
z0cL3`QOs=yd&v7_X%aDyKl6~mZd0tON02@IkHH>ughEXM3OPbIgY~k9pr#8;Imb}G
zV>?SUL0H0et}&EzEY);lHBAg9$`xu@PKw5f6qZxN6`~BKiPcIJl+w&_I;m$TCCt|-
zF`p84QcowtX{J<(hS&HP{fwlI298rr6&qMdAqC`<PXUFjWCNS2<~R+sF_M11;x#2I
zatYDKWO+b{TqQbYP|9a?F_F6Xj8bMOc@U(8TJG???odk!K_x2|v5~_x@`$nM;2RFJ
zkwx+j@>tKGsO1b7xk)==o-p7EVcNOLMNYGyO}xrHO_~1#Zj~Jav*Fl400000NkvXX
Hu0mjfgVw2;

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png
index 17f3be9c262953cac52da794d601bb853d8dc276..6a862572faca191c265bd1bdd76283c08fdab790 100755
GIT binary patch
literal 26685
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
B13Lf!

literal 4677
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
Hu0mjf9r&r4

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png
index 2c94ea78bfdba901614472a3215401d7b0a2dd71..9d1d6d1177b9e36bcef557251ba3914fa5acbae2 100755
GIT binary patch
literal 23898
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

literal 4949
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
TP9|;Z00000NkvXXu0mjfQL*|-

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png
index 2c94ea78bfdba901614472a3215401d7b0a2dd71..88bc33b592a04625c97fafdea8040090e64d5cfc 100755
GIT binary patch
literal 23899
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

literal 4949
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
TP9|;Z00000NkvXXu0mjfQL*|-

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png
index 56bf4a92fb295a63fb88ac81e8ffe76e83710444..8fec652ed51a5cf6085cac0b208d3efba4112b2b 100755
GIT binary patch
literal 26684
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
A!2kdN

literal 4677
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
Hu0mjfi%6-N

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png
index f259684055ad3ce25b2c3cdb5c3a53062b60a8e9..b3d7e39dcdec42cc39c96f004690d7f6a7337be3 100755
GIT binary patch
literal 26684
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

literal 4677
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
Hu0mjfQGBVH

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png
index 17f3be9c262953cac52da794d601bb853d8dc276..2529b5cd1928637c69a512b292d5533fee42a48c 100755
GIT binary patch
literal 26684
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
AUjP6A

literal 4677
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
Hu0mjf9r&r4

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png
index 3dc60464cf31e3ba07d5585542d75d616f63da03..f2bbf26ad759fb2ca151a839d4e61a983ac45f2a 100755
GIT binary patch
literal 26684
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%0DY>5Wp99*Ft
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

literal 4633
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
P00000NkvXXu0mjfY&D(f

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png
index 3dc60464cf31e3ba07d5585542d75d616f63da03..254a6f32bca09ab3009cb6d25ca4d57c048ba97a 100755
GIT binary patch
literal 26685
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
B;9~#)

literal 4633
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
P00000NkvXXu0mjfY&D(f

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png
index 3dc60464cf31e3ba07d5585542d75d616f63da03..998f5fb3cb6f04dd8541efdc151bde4014aa69db 100755
GIT binary patch
literal 26685
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
CK^Lk3

literal 4633
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
P00000NkvXXu0mjfY&D(f

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png
index 3dc60464cf31e3ba07d5585542d75d616f63da03..0d8d037a5f0357f90e13ff9cb05544cbd6d7d931 100755
GIT binary patch
literal 26685
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

literal 4633
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
P00000NkvXXu0mjfY&D(f

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png
index 3dc60464cf31e3ba07d5585542d75d616f63da03..c8acaaa58349b47893c0c3ab3bbd4a2d472c8721 100755
GIT binary patch
literal 26686
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
B?Uw)m

literal 4633
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
P00000NkvXXu0mjfY&D(f

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircle@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircle@2x.png
index 919d8f405ca7f40c921e71b91e7a81655db1f94b..207ce15dfabab74df8b5c13932506d94ef19dcfe 100755
GIT binary patch
delta 95844
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
K?H<|qr~Dr=#f2~c

delta 42344
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

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-0@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-0@2x.png
index 8e50cd033596fb3daacd173247d6779168cc8f99..ccd1494cdf1a9d19a9c860b88d240392ef1919ea 100755
GIT binary patch
literal 87032
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
CAgN>k

literal 26595
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

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-1@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-1@2x.png
index 3b5e886933d2f7a8803a44304c5439058ef86fa2..e611add3ba9861baf68614ec51d63d3f94c8592a 100755
GIT binary patch
literal 119975
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
E0Oy=DQvd(}

literal 40858
zcmXt9cQo7I|9)o?1fh0|&_Pjq)r?iNHEXt3)oM$ry^|QF)s|LKTdS?s-qcEbRMBA+
zRg}cudj*mF((gIHlarI=oj>mDj@NUa`@Ej}*xb~Rm05rp0035FBYjH%0MWmK05}8v
z!@>Wf2mQyzyLx)&I&QwM?kGz`U6i=o<;$uU0YLo49TyjQzrct7?wl?z-9IHSGW&;E
zCMG_$bkXi3d?ow<7#{a@!k&XbTBu;BXeS8>13CB^jzi!1H!L&$VluDad0wtGU`ZS8
z{p#h-oF4>&7vScZk--IY@-G0RqQ;{x`wYlt@pIk$-CAI`o%ecwY|*Rd;Kxjfj?i6b
z$_eb9mf#PMX&@VN`#bi}`A^)a2>zTM7KtSJL4~Vah)b6)ai6)doodM)Bbju~G9Zat
zW9Q{g67zNv=QYb4*n1-D5Qt8qu6g2JK<TE}%SGQ9fQudZdjai7mVc6~lPH4rziYw&
zs;ArS`s-xbJI|qzSehjRL%KFxF4c+Q5ljt%pxoeaz4r)#03RU`$MXO{_-b}Cv@Lp-
zK6VVQ*9`Rm+P_ypYf&ow36r0ZeE<NkefjqWrAe}#raxp1G&V6{oI{*p6FpyZHERq2
zP=K+%j#cQ`YU|yQvxYCv-<#*aJyQ=byI5!Q>Hdn(QBYrt!p_b@?oN7Mah61y)m7t6
zD}Q1Y1P2d^5dN!4n(|BD1TrPwON6np8zZ5{sPfUe`y)R%Ch=t_S7<j1W<0z%m6Tg9
z?FPUbHOWLoV{6aCn}+ykR<br<D_&qEqT|4<{T5@?4FXX~JT9_Tn*8ZD@?(=vE_PFk
zuZ11Z<|kFK95qLm9#0ZQfl>(hgYaos>;aAx1(2(1qHgq89JhV|k+iO1`vLR4hZ7s|
zmGK9q|NhN(KW@fq%mxtq@T?d56?ar%A>9imu^kaMn_2+Hi_p-%0Pzy<-Vi`!L2<<+
zxdPDG52J0%J3;H7M6uW0E$q+@2*D92{BmF;JbPp1*aaLi3}kswQz}MUFV(t*3d1KE
zu~!HOpb}#nc2IOG0r`z#{VY6AoN7`NJ?yg*t^MxRM=5S<9t70J80}*se05xJa_afP
zo_mzX-(GO65%*#VR{TtUhbA_9;`q_4Q#x7g#5*X$0m1kBjvnZz07F7bm;3VrIKT;b
z*$dy<6Z#b55m}4LVD)<tISZsf&>ys<hZc?s+bT|?g$etxy#6lMOYGDK|7#Cf=CqKj
z)FPvbeGsDp!YTuS!x4t9A)o?A;PmpHkx<`H`En3lZ;g6>Krtm?MiYXy!bN$sn1Nj0
zYV`sx<&%2{H}+~gkW~=K5Vpw}fV;!3!P7+dfALiyfE94A5(0kVPtcW-g5QKmDAot~
z1Hn21e=MARKcWk8c~-K32SxBlxO5yyamocyL%CgXd0m2*g<?U#E{J3krKt>#XXDA-
zdfmb>G|ko!&k%!;s6x_A+ll&}6%ha75o;V8qF_T>0};}}M{IxwfK6DAGQ&j;exv%N
z&Doo*Ig245F-IwH#<?<n>I8q4fd2&((!%jJ4bO&-txg=)#n0*nCiGY68GONiuLg(^
z%q3FA&Siy<k>3Fd8?Xu?oCQMPYH67__zKjv`MCQx2a>ZjCWQ70+>Jq>Wo-~s41hF1
zIs-@#k3i0%q@MoLu>$Z*3mcGjq8?C5aJF3_!pKsa5kHEFDqK-STNexi&<7$_HAP*U
zC@P8mDmHd9>&%?+@%1OHtOa(X#KjK`6fN)E4?6zxizANPEz*VefDhi{-rjc+PU=IF
zt?lu~QO=D1wvSX+!c5jwxEqBfD)9i8U8?_pOR^F~t9jCAgSPuv>dO#&2T--rnYucm
z75s{M_BLFk{kEgcW{n$!tN_8lCsf+4#eNTiCVF?Pz|{;VXJPxv07)-x@4#A<sKgb<
zfWhP;PSt*PWz@6g$$=0!fEEj#sb6pgmLQsh2Z;q?tt*PQJ0N*>GHiN+DNUstEa1`$
zEA-|EfT&WS^$wPL14i*I{y<dzs2OX`P2D&#fhZ}&wAV?nPXdJdXZa9AQT}K7$T4Wg
zLlO(KIR_$I*&Dzxkk~)%>8%_WuRg#C@{dM4gHCP$<m&?zu_v(I$ylmsyGwC3?Xv{C
z(<c|d;y*DSu)iJ5y7sz*zet|#^iZJGplYp>o_(z>qD|c~y;t<n=6y1+ZADbDK0fdb
zVPR-0k+mG7_a~AOAeI#PeQL|FdBrG-75SUV+Hzk9AX<=`2}H$}X2M#t2?Ss0MLh+O
z`GDw81lk){(CI7n811`<!HTg6w+zx1Sj+~9bPFKsRK<aev||L}k)Su_8gO^WhMO^V
z14SOOAnV<Wutg<Gk+g4c(S(P(7MRH&3J$1iUAJL3Ra-!#N}(`-_%XT221ODgsSGm<
z1Tjy>qp%yQ<ZQPSWVmm{rVojB)BR+jxNSq6gzwwOsN1AS793ck$UHz>Fci!-9DD8U
z2SvLiR?1K;Kz-WoY`A9+Babs|YBOS;K?GjZ@QEgjvM9Dsd4U20qN3nE<E5Bd{JtZ5
z;^L9OoT2`QHtJ&-xEveJQhjTa6QCAfg$lxdJwc(?%>`O&=pzCm9TPT~fgrH6;AUMh
zO&>&SV5SI5kU}tEf|yQBqS4tLC=;iypL8QBCqNpyAj+!?Z;wan>%v766L<Sw@}m&g
zvw9b_<sT(JHMrhpAmzbv$AZhi;+*d@KKUW-gv0_ol?fV?$qY4=fKv=$F#($)th(PJ
zwz7VY<2K@?vDyzeM?O)4GPSwLa^1lbdI0%f45;yN_NM~En8?agDbO<Hxx|3pfV>6!
zyt&JLHBx=s2KC*8Qa^u5IsV|?@oqD!iKnQU@!rjw<L}$P?xwMjvmm<Qz{m;)T%L;P
zJ$lG>o2ygm@wE8kQ|VufhaS|;1pj(|%UFG>cFeeF*m%sidDwK!Sn_VCan6^ATw=?2
z&KOv{i-F&mn)Q8{oB6(-ySskMdFU9|<iotK^UnMVQZ0y_>H#6M;qXjz4cf^CH%E!E
zyJLq+0Of3V`s69Q;v@1|h!b4ID22pK;{26#=$hX9t0z)kxbN%El$+vdlZ2&EHPfOc
zDYF_yXSa)HHStC@uNJ~C$nWJ{i$?4EO>bARFc-*c>pvB_!*NCGKh-C%nZZ)ePyIF>
zvrxZVW%KL#n6dhLUGtWQZ%ym)_yb>G?;w@t?A&L)SBl2h>&MGXOLA*p+WfkA{voG=
z+Y1jaZGSY%E||4fr=E>gsu-hkRpsL{-zM;8Ggq2vQ;-oOK9@{rHSoMKd`JTTS}B;o
zh;obw|FLiQX7^=zz>B%eAG1puxxGa@1Kt{I$q$N79%91PTXNZo3On7DovzOhMylnz
z4IV1y%gk&1v}}jjD&}JY4lm=RxS@~dWE8((e|5TW(Gd0=e1XOUB#1-Km7_jYd8Jm(
zqGB*9BKMhF;b4+VQ+C<fq|JTbh>C{h&*S40V=F#EDiN)w6@zy}#@60VT%A7mIPmt?
zOd2BGJM7~wt^!2Dl$5uBl3;Nde@4za->!ZNy6Fi}k>7;v?eQ$tQ3p%_B{iJpFmS@w
za-yZx<1Gc{)iC2-a&3EElsf9BoWmwI61%eHPP-SW*^<X578|I_f9X+byQ@aF+fHYW
z=b^56%J))Ja3ksb96N^v+=7WbmZS%Rezn_DJ*rPMc%r1w*CnS17)|rgyE5Pra&~m`
z&s`s1@49-G;4$`k;a#CMt-q0#J1zmu4XsrJ6N|w&bAy|Q9~ekId0&8RU2`eGsWIM_
zi+&$N$hWfhgItSvXbpIYa#Ckwfi?(91%mD-`^<vyy+^lD<DqyE7Gq&g`|Jwwt?8AK
zkLumgaD10^S1p%Stgz?jW_aMk2)U-l)-yyzg=fPIwMBbb=E|T&y2mGI3+h|w6}9j8
zu^I28-@P2FxEcwYoa6QQZ~%k98nv$mJ(~N7wmahFxP}vX%;|=Zdwi=jx3;is(x$q(
zZhUO~@7k)b_M+BgMD1bd#@27@er(y=v$AJS%_BYyV`ZvOW`uG4UQsTHY9BH^1vr2<
zOXp-MWdh_|OtJf?-5YFRG8-0e>`deZ0?jbOZrU_wfaILk-N0VGc3`vE_G{9hH=wPX
zXDLuCm-TCG&oJp;Xmo^@YO~g9$9<V1`V@s>H0*x-x|mVWXPkn{9W|-EUmycAJqp3e
zV#~44N4IpT9v=Ik7xu)|_gI83A_;i&4aWKI8bd!w#FgX1!>479+(F~5ULgTRbq%e=
zu<C=xgWdMQGO-A=V4-!5zmubXM;C*_C+G>&WpQT7>B}uC7R$6lX9z)<>nz!6Vt$7$
zE*)llL@>JmC#fUo3(R+YB;rH$2_8h)uqwkd`4*KKUajJ_&vUN{R6cEDm|D_4OqyM;
z#YBc_Xy7&T9oWkkP6m9`Oo}udr9!2*MLSM$ERP9t7{Nzb(fW!w({s!&D{8`^PiNxd
z_PWwy^+kpi9(}uRz6b;xqm0l$T#@I{N{C#X4kPTGR2B3m@};WB>D*_bo&gPeeh0S?
zdL~n!u?t02o=~Q0CKA-yL+X|5m7B{Rh&@g{_vCFuCv)JqUui844-haCHh#==nvX>2
z*}@Cm6a-@&%Y-j$)uRQ%wJb!5c%0(y>pE)d$i9PLp7gIkjqK~b2`U{m*)`OGxvjOW
zxq(H>d}O#ni?P^_aa*^1`CUx_$XNRf-UOgpl>zOKMHC1o5;MF74LWQ$Pi^W;^_S+$
zW%jK7kcq`cYw$}2ru4^%0A)}Z0R4(gL@zT~SV{2SH0JaPRGvOrJK0Y?5o@J)q;YSm
zkbOUIU3+3;e3Cf1`e1jgELh#uVmG}OeB*Q|6F|FGg@dFpyp2B#-&C(>!EoyQBNrhc
z=Nr@n=1p2Tee1e9h2OZD-$;73qmf^<bLgce;JhnyY{+Y<lCa==BxWl%lQf<*>LTAg
zpY%#*J6=}D*D_oO{LbF+mH4q`k2BaY)&UOct}JDgGSOOOhVQupdSyx<lT9C{Kyj<b
zG7!kiANy+PyB|;xuw)t{ehbcD`ws@j2714mZij9>JUHxF$d<{AtUaEZVLuSw&>EXq
z_VEcG%QZdIxpfN;y?L51=8V+QS%89(Ksj8#8q<W{G=+jFk7Myymy$JvO}^3S+@s>j
zw)Tw%LthYi)LSe2pzCDdaP4p{d#7VXxHo!H*jXsK;wXcT$~oViBBh~^ITzi3i>0hJ
zonJH|WV?*`XzpB=0_zx*n9T_Dr&qToF#&-7L#SF~<IT7WlKs4uyAanc&53Q5TTik?
zyn+dQl2_x!Uxw>^5%oTQseW`cQFvWzIdXF`_GfZ_bj$HTDldE9s^;kU#NUbK;HF&F
zC#elcc;j2DCrT4SOO{~$@e&P%##~UI#@izaAyCSEpp!LVWc7$<#1usX{rYx{TyLoG
z^`MNdEd~dMM}?mp?d}b?FX_<8+oArNEyhJVcgt&9kzfE9N9w&^0W#Aq_F^OOx{RR3
zL|vbP`aZuSm)Hya+!usZ12qsAPYes${YnAWQStmMzK`}`B*)c}H_Y&oAJ{6m&T=A`
zq1^q>OTSlkry0kO*Z$?lR!@ytuy)k`Qimsdp5`Aqv@O@FPc#tVwZ0_gcWGpr^;6O_
zSGc_iK<fXix~swjCO^mGpX?i6X~i>E=hHTTO^kRa=0ND8HWMdo7%w=%W>#+M>y+Qt
z79O;{yuUc@6{*l->bcYcjnoCV!$8Q{m<p_uM;Q1vUr3@+(u4T>$#M+3@Y9Qu1Ri~Z
z4JY@lI_V2vrLtU<IIId#wl3({=@ryl{+OR^=R(gbB-+OTa4A=qWdEE_!^Go*2H{%m
zNXpc_XP@@?@$P65d%kvLJ-(r?q3l|01Q$z?aX;e{KiO=LD%gEF7FH_c@6YQ<^5vwb
zIRxX_N|OZ0zQvsfFWzhuuc;^R<P_Owv3-r5TH0IME19v)APQnacIGLSP)f{vthjr`
zU};B~lUw+yUFbH|;JX<T`BLtu;rW7FyzD7fWBrMC4@UBFJ_^x`obBt##V-HAIa!Z^
zYRGLU>=7cUUmg<U!RR6D!iRI0m#_nY^%Ri1Y7?Qp_wgt6Rg{e<lX#Ewqc%qi|2GkI
z{Cyy{7R=Q-pjpozltFrSkDE$-!rj8^NHSyxZxM}r8)Y`{+Y;}j2vKP_9!K>JuN~+d
zUR?Oxz3nZR_5ACC%7RLTsgq-iMr2r&U$|_GfJ2|sunfc*ivmmgOISp{Up|HWxa<6F
z+rz{e$a_a|`bL4n;ga_>MeG9zd6W2$DE#?w+<RNrhv(7guRHE8DAVi4RR38c7!)je
zZkAAoHbU?-bLyruLs7`Li6Rd<Ig(QJo^y025@0y=S5dA^WKv|+>t4^pwMAvkHjO-r
zAGL#&#OwSwdY@9$WwxKc>bqC3oT_@a(;`y%c`y83*s4O1$x`7M72)6J^1HIug}blq
z(^|{%dF+dmjZ>7P0L}IT2OJeIS+&ulIedK1$UNQi&`mkhiM`yHy_ZeesVyw*@T8}t
zeROY>PFp<q`>qlea!!eX+_U;vL@M~^>f~G7CKUIua$U)YYntJ@{!gNAHr6aPqbyz_
zkM20~5;_IEuiXAkyQ0ovQeObk<@lUl*zr9K5){E@5MN<l11{tKBBlHF5A)eS%RcAL
zgf-TpsFa#q8Lgw~0WmY}FpA4U`{b37!lFkn)(fTjn+Px<k`BxnzhI^=m+i&D*J7?*
zC;3!k$%cS7wEidyt8MXu3`uD{p|SlMJ4WM#H$+x;0$+S+C>)=f>YVCS@pa0>MC`7u
z4Rj7PYPUJQ8`Uj7(#5h;95TZIc%z+VBtUSO4gTQ#dovLQ9sREUr1XJDfWH3T9WQyv
zSH8+bZeBAE#K%|mib_RkYWOoo-9wyQ5f{OU#T)0%E|{MG?J_H?qw5a<E{GRKfS8U1
zAM#?>?LdJzDGsRqQxN03L<6I904(;k0UBkb5aa#o(ubvUcp-;AdWL_+M{aeJgy~)H
zN$Qdj+VENPX}Gl(EHy3=@>!bCsB7_*ozTW_@Djf&!{vvsmEafb3bkKV?$*bkDQB_7
zx(0UCkBJ4&V^<h8`Bi^WJ3d6%H6JBXt?~Wq;MVNwJmsjl(6<jyovPric#ao#$_|P~
zZN^i@Yg#L@730xXZeg&GoM}bpQ<VPj%gM7J1cU5T3Pkz3J+pq0T%y<AI5-BAlRdB(
z^$no%8x@&)13g0)3Fd9zO${uv7hMW`ZxgVm#6)!;Jw+nnM!(h2C_c!AuJ_g`B!Ta2
z?`8k?yD!{#dLnb2_hlA5RXk^$F_e-487<0OYSFQokoUf_%1c#azUpRKJ*xr?+#h>A
zpJ^-q>e<)g7y9F@8yE4^CU~K*B>W2ovYGI7*9M2Vfuqq6a~O9lt+y^Z>;2N&W<AC)
z*pIr`?%apJOqrjj<D`71Np+Yq{Va(@p?|JGct6X`@cx(2v#r=^YaG2aZmlcA$z$)d
zd7gC5egYi9H2Yk`)gnqU13Q$C78ojxoZ`mmfSfY8=i|K@=_!i*9(2d3(T(A%N=i7B
z9)Qf^)<^bqA@#3om3Ya=B)UF*%_Sa>Oi9wne;=Tg^SqkQ&nVOT{*)E7XeH|Gl9<_k
z{Xy`!adVWR55Nui!?>g{Fmj<7CCj!dTkxLo4}oS8Lm1}*l`LayI)F$L5&Zf2F<xSm
z1~Dq}jch12d$l8#|KmgIPIk>oMglR9I=7cWpGs#|X-3<nNVx?Ezv>l=D>W~GvtT)#
z8@Nt_eDiiTkA#Jb3t;uJfPP%ouWYPJz8+7Nf3DGb7G9i@PcrS)*rQt|kp>p+-9D}8
z3^rXj*kc=lLHA$(&y6vQA22d}H^cz9DoxQA0aX2-*jZ_mdqCqjKz>~3WIw=h95~>d
z=xXwDlH#>Pmm#wXhK#}NskPZ8UVP-f8*M4}*#qCR&tH<C=f>Eb&m-E+EwO`iuxH+5
z`4Qf7n`Mt<wr+i+^4T4au<pK&Azm<&+`!x*(ZK2TlXWyVV?o{|YN)J6i)ssbdCykN
zS&%Zfyf_^ypY{CToH~&tA0|s)DZn}RM@kJwrf9e@9SvVMWBAk06uR;`2$xfpCX(0O
zL$a`924C^>OBZ~9>sf_j_CP~GZ&Jmcla3CUPqv4z6z!rA0|&t#y7F=GIy{h<{|43p
zZ)@b6%nwq61J&{Tlh-jjOTHd5Lio^@=Fc?~S8tZ73naRxVWVO09b=&GDp%pno*T?A
z@jO@neee@J-2hO{2V|h+o123qS_QDFjo2i<?=rjG*BL37?>y-=85u&ESjwoN`tSeD
z_I)7ppwDwK@at#NtE8OkO)`nQU-HUrlj6@@E0)Po!~<>LmOVbmScO1YpU9_qcrW2Y
zuoH8`_&$|pL_e;ba@trRrSc0OA{T2=3WxJe`Hz{)L#DsDXIn(@TZN${8FUg6*RP<(
z1)p<(s}n)undjfy@d)KWIc_U|<GHK6(9t8_EI84NIT-aV`nOy539V_4ZPcpes;5KM
z;FQ?3PtKAT%)@f*3S`N@_1nppu-a}R&hX8%dTT28sp_%Lnc>?#-twBQTCJ3$gbFk2
z?n!>1vmi#hMR0HM?Qbz@2YctWp|f*KU9RKO@YcA(p<D$l{vG*g+L9*Ed?x4n289;?
zA)MU1SS3Ph!^_?gwWn{rMn_XV2+MwB%w|t{z`$v~gc&&>Q;m2n1my$>DJe-gNPcru
z)B&f0=(#7dx?r4vJr;Z?5tT7<N;&8Gwn4hdhaF?B*N9&Ofr_-fF1%^JX6U|GVe>%J
zTe9?dop<FuGEet~Z088?7|7QD6<kwkwACcFDPh$*^L6aT`~K1um^b@G2syrcTT0mU
zQHRQcuXJ1F-rQEcb5vMZXtb)3iJ|>h1>?OW>suxE&TyTa#`42>k#%kYZ*5NhDThT*
zJ?8N67gsVTdHZb7bh*@nP5RX%HhH=sP%Y1bk9!QS1%Yd)#T_D_aPyV)<g^!9Ntj=T
zGgnDLp3pMW)pVX><Dd?HI1X27f2&r#CqoB(RWYn^9nt4^ay$bbDmCU6jm9K<&Uh;d
zzQ-T0hAbJHX@ys}R<)LCKvwf&uz9?ywJ|{G(a9o`K~f!}&BS1CaiG`Xgg==CU2Z>c
zmTKQHCDGN1>EOU|8kKxJs2z1sG*iLW)^xd5E7x?8E^R%9!lyNOgMag)-8P7+!k^Bq
zf7(622kX7|rV_YN{(JZ9Wb1p&2e?Va?MAFq+M46__P@ejF(L8)HO5A69k1F$d`{{{
zar_9x6`czZS)q(TlsQpnPKMwhzJ`TYYZN9Lq-;GE<$0qlIqHp-*ReRGAOcN%+`XOZ
zt(tANvlW<Qx-i(eARI~c_Py`hFmbP8oevs#Ii&=ZBAHK6tlW?}18%zCz2dZsCFc=@
zZyqE(!3d^2O2R1Lj0&+l{!9{ee7EzRI=A+{Bclrwde}ANI~h5MZ)|-nvkmLpE=3;s
zhm^68eL2e;93Xnh@YZx5&%WI`gVwj0io0zVV&h6Jl7rcV=QDhgU$nemuI<(49X2$6
z#W)7xxlzSmN<?>VX(wIX)#q&nz*4oy5=C*IH{volX%@86Jok;KlHLGJ)DV27w%g6;
zVdz7}Oc_h9OtYFp*Sx5$X%?#2!GKfq@VdT7ML^VTS;&&m51r?y`raHNK>oEqh{ZyF
z&gaqHZv@*E4p)CvJmaB#B+zaR2RI)1o|kTX{k~?D&cpVciIly?10rQ=m%gDhHWWr@
z&0m}gb9zg0fVYR4{#ri!q||pTh$#c*2f~NSS$L@4X|;LSE}8OzRrS;#k8~B^1CU}I
zY_UhTkX}S$U?;SHIGNv2sc8`;IZOg8o&$e<&7oi`1i<ea7mj2y?#4b%JTC)+;GUSl
zMRhN6rq|(~-X&t|{ha?g{iu!<8M?Q(YAbvqfjJ^A#Xe{rx7Gnhz6`hB<B&$L3;jTk
zCH6q>#Z*VNnsT*dSfbhzR-H$V?yydt8oqU+)ZLzkf!^J49GNnt1Ef^0NwQ3`44$5C
zQ^IX0Govf1BOUE-DVMh6`z7$7lapE4K9hbe8G@m_Zl8|d`BZ%?Ww`K%g~JTw4EfJH
z440D_V0n*s(GlzWA5gmeW_hvhmruPki5Yoe?jVr0zfj~=py-Te|6*JU58}O}B`?&{
zu;29!fa=gg-#j<eF8$Km#ES@Uyh)5hiM9w$zB^>cw3^hs>KhEBs?%TXh3rB>;}erv
zf?%tWRlSs*iwb*rI0tnb6$ptFW_vT{z=HWp2o!VU$k}>l#a#$*-b%$VU=1tV8uI<~
zc9tU5G@DeL$b$!%@SWofytcZkCSS5=s?<y-G)j8q<f&&kzu2rOFF3uf4G@X=RjatQ
zs7AEfi<)-2?eY*HGPKHkAK$}RXOd1qN0#8F<^hbMJ`CnNQG#~eQU=9foGUcG2X4MB
z89oAhEbeiGU=fLl{@+Am;8x#LIC@^9ohUDM*XB_SsXF^>Q{Q#cWyqp^jY!={GP$FR
zu75VnpTPwqv}{JUxzbO^GX#xDH;zn4G&8L*;F{BcHw$~iCdYR%v@TRe7)7%CB3=C_
zXlI&SNZ?Iaz)<#+eWPjH><hlV#HU^Un!HOq&gG>oF#%H_D08L02ivxM=tJFokH}MG
z>!C?X-qLi*4eG`qa{;DeO}i2dx!DF2TT_W?XO{eU2kJo=k?qc(CjBSQ!gZP?%2>t<
zKz@W?c<sXXY2k?x8Vp>1Awc9gTp5hD=)KI;9*+`n(um%2D{QWMn1JfHblu0tC^DMp
zlnV*l%7T8Q*&A<ML=r`gRmzT6^zjSJ#z!H;2hJgR|K?;XP~&oos>bojcOw3<<GXf_
zu+tgS3p;l~)SR8SlOr}x(y9-qmFL8|u)Wn8zUCO`XTA_(@4j_GNZrx($`MdhZhAq{
zzOy~UG&4eZr%Dt2;kQc-SWi+M23GKTjYH$`Uh-bb0JL5ijRK&|Ph~~j;3$98(?q#m
zsMyo9Nd7(-jnf_3JHlVL5eD|0ZK0IuB@f?#2^3+dj`E_ZKB4$bD1`cgRNRYIftPlG
zr<K~BdH1r!sh0|Ej@VNYg1rC2C=xsQCl&PJ?+|vPQYo9$ewMX|Tx5kjritnA@!lg3
zrweZTT1HQdNy=xW?U~^EtoE`2Vp|y#DGDW11-;oC_pyC=6}g{-Yd^ZxJpz;cgwI@Z
z)GlH*JBsc+6C=bkRA$}DFeC<rizg=H(5CtvNmz*CEFAp8mErXq>Xjg!oSV(xP;F5?
zvvS@f2Cfx$v^A(M3;IyLWHzj%6*o6M&;+<BfQmc3beU?j{@)9bimH6TRJm?3QQm|x
z%oL-}Ja3Ku7AE~+XK8nHdXvIVq;5T9pt))N49JURjh0rO)v#^F7#~^(J2OYkv6u`-
zdj1~aAFzwF0AD#pvc<KPmxnyTEwUlzV~~Xv^h%=D980Ap=<1ZrAxv@el83nj`%{-Y
z3gFtY#P7tSQEbYkHp?Qwt=YUP=Iu2AK)(6wdZ7_Hhe8JihAD!u0s4eQIm%*>p;<)k
z<kzhK3YIwdBm`X;{P845b;$h;@Rp`K?Sf&*Xb`Okl^cy$;-UrJiW)3TDooOjKJMaN
zYiO@HKK}5hDB_r}YMaBs{Y}NIJ(D13_8Kx*RLz<PgqXG#WnWj$%_q8h_jJ|hqZ;a?
zZv<b4L{V|6C1}$hT;3^J8Osic%UI%1d{KA!n5*{+MEP|8B|S}Nmvks1Q%LrvDZdEE
z?6#ufqaO&cw|xF~;rBu&(YzAP_|?u-UbFCAC*Pkuw@b^nh!Ug~J;UW*c65UHqC3RI
z4jpMWiV<9{$c?7Goy;$jJbKuEH@(-RE2AsJa*ft;NMDc3?Y@tr;((Zd>Xj&1=y>PC
zkE06{72nChDIW`drMbtl{I%8s4MN>QBqYq(Ep<AMT1~h5JQ&q(+_!OI#y&?^S_<$T
zTuQUalH&py_VKA+rPFF3M}W^o+MlE5_1r5+_sKZ~$Hj~}K)XpJOO_|MYa4ZEpRQpF
zhm23;d2p~+4Jwx(-?uC0ueilAF9F*umqI;weKPW%S{{v8zDnVJPYoFX;j0gN`^x*u
zY1>CK2@*TW*)hb@gZB)T?<h@sZs4z+hdJNcqMDQEo3TXbrgEdB0?ork_7Xn0q?cl!
z!0#0gQjG!Iz+xqAkeqOWJonwL3O|RN;5SEFe$!vDAbF`kkUIR_>&l!tI2bxhm`+TD
zR`o=FW0zs;GUmz`d&t>oaYhqE&IuaJ?G>oMt*GCQfqZrhJ%fb4hK0AV>uhS}U{}m(
zmr{<8X{<mr(|tBFT=XiPdsSn?j`!G|g-@t+!o6(0(R|N76#nI*EE6g;$o{wx{>`yb
z&yl&#>n$bkJ!4wg$nU${uWM!I=?H%$=du6&8YM@nD}}a{RQNJN1LmD8fSPfPv<=A>
z%2w5H%~SAR*!*tx>mvtj0bEqJQ|FD%3ntEPnAjD>wh;^jcmy*>t6~(M%*>Xi)lQ!?
zecKh0EL?vpcVFN}T)5w2h6LasX^}GW3jE^@tYyL;t5k#G-rI=D**xa8X3=yILo$he
z+cpSRZ(5V|r7iv2p$7tADZ%iso<1IeJ-$FTp|wFMlcl~f#PY4Rr@}AS91AM$Fs8kA
zVg0ER1n#>Np%7Ii40NxiV3FXc4=4q`EF79h6cI}Q1Bk{T!D}zE(A!lOnLwR0y8K**
z4r<{te^;)>V<vGEEVSKE{s)^W`=hmYQDb+5=)q4js<ZE>Hl~$wK(A|(z_TxAmjvDe
zlku=G2d@tGVzI_2v_m!z;c1P&gw(0c;hvJgf7zM3@w`nCaUoV}#{Na;=kD+8T4wVy
z@{fprVwE>b?nOE0Ix|w#{8TP7{y4UiY$^b;Y_0>9aeB4N43|zgbwf9N8)&O&7q_t5
z`2Qr7U7*r|OW@++=2fKKb<|9z5$g7t&%O0oOqF!zf(hC6!4EF$PXsrleKDpVAe%d;
z-+gj)Tmglbo$z<xNL<#}$=BPYmJyUjg#`qn758Y@`J=TUpO=d6vKr7S5nYRGyNn6g
z!sCwzdz>-k`Tg+FRG!J`USpx=OL4n<$L+q7C!N1cdcZmML<W4)Iz&qBVEG<JV#W+E
z`SG}|LJB@zoHvCUEWH!LQM??MY8`ryB8vRuO^{~s_9>8ne@vE~Mj^TWjdQ1k!z%~@
z&;jHgorAhQzpTSR2@lmHo{1hLF77^WUVEVa_@!G-!{^UeB2q3Qysqcq{tBAgGXL?>
zsX*Cvfu|$Bk%L&YuMgAmZ-4G-*h=ex6&<>2Y5zMLZVzX4Ik!^3?+ugu^E@v0g|X?s
z1@I_o-cVIS-(|6<%vmc|M~;`Y#`|YV_8fzvjlLe#vCu73>qj1+cOt3LzV#th;8O(U
zvmYf`exO|H5J@NkpI*6|S}zJ%N4Xra!{M$xx6@;h*DIj~uLT>09Dd@}$jcrz4WsLI
z5oNqvNp>d4@<PVdi`R1q+ud@hFgVK%>oOg$|KQUMquPonay6}7UWYQ+bV*xBKgqkQ
zaoKqy@}y%#3=_RKH#hooG_cL+GjjV?u0ywh-?u5lFzJXB$$K>aoQ6i!6Yjs<d(n<%
zeSCWU@JJCyoW#SvE@pvDT;yGG@6$-@B|sWI-d^y8+Y7mZF3{x3t0oLFJn2%zTnW+J
z4Z0lyA967qkV#>z;>2}}xXLZ-$O72cAW@OI7`+$-j5$lj@?mg*^2tt#j7&rLtu;Eu
zj;^N74hXz07!{z10je=`Q-%L61LR0h+rIN9mc)(A$H#Hnts@)xueLl*mh<OMwp_?-
z0}Vx(BWmA5!a~9f9mHxh&bAU#Sxg;f&lz5ZekS-zEi{H~UK8nIr8YgqKe$*~ezDsf
z&g>3I<N8~YCHej|WTMK&S#7?7Ykcgw7<OmE)S%~0&@8bo2o5<narC4|{{sfVHLG`%
zF1t~RHfWJ;!}Pib9amy=y(+jHvX((jTx6@;vtJ}&c6zbqvh+AF9@`F6$5v>kQv#^>
zFCC-=(E|NLABJu%*gEI6sZra^DZ_~TGxHodjVX-&e$y@^l+L!h-+$j%J9bE)EDm?Z
z5YKP7nvfD+F@r!L&9Aw|zw>XP6zyZ^(ee{{c7LF!ig$jZT%MlF22bV2V1uJyU;58s
zc3a@Fs4lWQk%KpfPtU=Pg)Z%HkBC(~8b3W=q@LZ}YFaYrs#*WugCT4A;W6`BUx4&W
z9A;M_{^vCvRZ>n$c%qh5t+ipF|IR?(!xZ09b>G=%<q>lnF?&ZPsTsab`^Piw{}qv0
zEU&32^=RI)7fW>i+V!&Y_tNU1ZXOFoq%PVhfzT;lEFZN<_H*2?xJR>wv9MaHi>r#a
zW*i+ifrUsFm7op_FP6A=odTEB5^%rvi>@!!!on_Im>11xX2crlgZT^o8X`eb+wqNp
zd%QBlmemd4wS4b``lhm3gCx1%L+9d{PYX-%Y%;vFR=xj`QPCB&r8!J(3vxb^?IgxH
z><;|dJbQd%AFbZ9hS#9%@2<pFl>d{WmQ^2AOv^N;wBz(SPG3q*{+u9e;&=DPljQ%J
z=}xqj1crFEE0qr}yZk=d-%N(payMak$DF5DZw)Xx)U_UJ3ZkCu3yI1;f)iF>5~M|n
zV}Pa@EDDF<r|&@6Pns`c5)(Pj#_;j^0XPKDp{~QejEA#uWKb)<l{mioAb6&gJS9K{
ze2_<HW&>A0Su-aBngm$53`-)>b$=u^I==)cNM3vJQ7b?z@0l2*r?x|6(B?2*)*rA-
z-k;Zyc^v&=+V@ON5&J68ny3EctX0C`BnvqTRsQza8dvZby-3TG%e}L<u~Wyew(<EU
z=7Y<k3$tlJO38$0F;)3&B?Ko3{dOJ%`P#h;DTp;5VgP|9e&~L07YQ?E!pc8+fi}%a
z0Ro=uBY?|#`tR<loifbm`k!|4hd4=G4Q`sqeU^KPr_<#7g#PV06=3t~XQ;w8mXEF=
zsM58Ytss(6HU6-CJQ@#M+Vj<zsfeU59qt|OjW9arM`3m+Tx9v(s^53Tt39-3j{4TK
zu(HR?CU;r>CYD%w_)H}2N~ZR?!EqAX7DzFOA-%oruY61WAWKFOH^iKS?@ZM3)d2H&
z2J^S;T2TZxFi#RHDl6rps4^=Uja^n0jauuu&%)u#kP-kw*o!b{g#-Re^2^D`qX%6?
zRv~X~)p6q3`0BY_o|SINcW+RQpzU*|#25`*mr}J9sY*#?DeUii77|!fzy~jAaEyVi
zj7D8t2%8i>NT3(=F#A8JR8&SfRupG4&rDbc;VqAoe6%FyGNjsqn=1kx(y9m@LXU?@
zyN{#lWfNIzsA|&%W+<uWLlR6c5_|0?-A=(5Pog*kYN$t<QVfaL$D9@@C3LRYFMEw)
zWKGMl;4ad<ero#Af(xCehfTyH{9mM&F?yvU{oiFznH>FVoL>9NS@T}^K4<*0cG~8b
z`N1#cDY|nl1XcFmO(Yl25m(m?yqRgU2I*9gkDhTV37FAIFMW5-ZM&@9LOCLpd{6zJ
z+M}4erO_AfeOP9RsiT`?=+23XX<ur7)3EK_QUwH)dK3R-tb&D7T<2`c(4WG^_teY%
zFk!1fH6zlh?x5HT<NP}$4f@^~{awbK7pl78k`*6_L@9AQ{fLuhmwxXsi$)WWxU-@h
z<}rxN{&FUsq2WPlhyNNkY)-DH8<ZZ@a`+gOz7V`&hKT+s8(08s|9gXhj_Y+Z|5e3O
ziH7?`>pGgu$V18{R_%-i8Fu_-Owe|?Y}Rvm>Cl1gL6-&H_2rQvVeITh%>thAehKo=
zCVX)a@5@8Yg54ORHM7+{pc_B}9J5ub&zW?0_I$#Pye4>1v5qO{;px;zoa)%&Fd$##
z<JG-`Dv&x#_N&p>^j94MU#fH?>*Kk<SkxO+-WO(i55wg+=D%Fz^j|1^z&fwN+tDK%
zL62jT?snOs`$Fo~%7U9GmIHqyp$A-#v=ZjpMMFG59{fl~Y;^7_?fO8*!b<IlYTrM%
zgm8|aLkk^%=EFnNK7>h(1oIC$H&D`<*X~WQ&+prFnr<Fn*XlfwmD)KL#|&B$*o3T;
zbkoI{s|r2?8^a%f`$9s~0Vj9I9K217nHb8S`VNF{exgb%lbGRfz-<X!j&jjZF+ldO
zY1L>Np<%W|U2WGi(M>EbMC7W*1oYif<}W(3SNx*Gwv#r792wym;HmI@TAvl6<inz6
zYj-3xTiNeuPq@cqE<%l$parkdGK*;;*`An*9c_Hr;r!ejy^t8Hkv*I9eRZRdTEL!j
zsQ`a(CkRyZZT5}_RqeJcl=3DQI8Bc3S5W{Dk79jzZro<Pa;o-%o@^{m45@kz_hE>*
zd#RD&*bcoKt2>FpBADiuX1go<Ay6cW3AmlJ_{E*{s*4TI757essWozEdwYpGIN?+@
zlJxfDCludB#EI_h<uC1E-AK^vDaZ_+uR9WHES=yi56ri)UdEaBf4nzo<2inV{lW>1
zw?&rnx)^VK!aBt+p|4%5a|#@tA?p>}@_bum3#`f;Z&!d{d4RUP-@krvYcG0jN&CHy
z0Hb8TBP=6oWSFD!Q-t6t0GQ3m4uH7@Gpa6_Q|-ZyhpOYT^6<qn-OgF;sK9K@Dg753
z8CWD=K^ysti@Y7Z;t@sb=n{5X^`&#?mo_Eb4V9n^{Vqe!0HJ}01-=Eds>U{65nz5#
z^=hPQ*(hC`S?z-rg{kEWI_Emz|CQUL1GKKyz#f+KhJU=%oVJ`Vi3xsuv_dlz9^fuJ
zqXJ7`T!4mtBsH*|Mw?Z7fhqkKq^ok37gS$ABupIzFhH}p|CCv`2A)Un9sG(CKGlEz
zsVCR#x8f4uILhdMjF!uYkH=m-BEq&l+{(9Nb%C+>Xld0Y+#AJP{he!_t8-J|S3KGC
zH+<;Dbx|H4<s81J2$Qutv9QfY?+I70ApsN{k`~#Hwa;%r3(f6)S9hbW(u+rtL6qff
z(yohY-m{&Yg%~uF_ns$S=Y-=$BWZh9NXkoi>7||UrL|KhPs5^G%r+B>X~Dl6a2qx7
zksz3EDgI3b{m?VWOL+T{OC)lo&2bKAFF;0UxAi&d5F!yLC*n^C(CR56hl|2enguOQ
z&s;t+@|Ed0GQV~N0bri0mneF>hwV%4o1Jvqh1tH)Mm@cl{N?TMEGbe(@uiRI;Qt8u
zn|3j+lfY3vct+reU1`Xf$b-xA2!A7LJ%bZYJ6RC3EuuRf+VG$0P6w7|Ut@A=PMaTP
zNs#*OZ{bC}jlap}3dtoiY_&AXm&AVfPm0P%!#779c^|}#zMEsigFcB3Ds9&IBVJFj
zqZHtLlkrzOk`s>97Z^)_qv&L;sTV63?f_-dR1ock3thR0iX$W%bZ+Z_z*l2j(zjQp
zeo}^e4pfA-Psko20U?slr{9UN^vCMvOFqqQ_jj<f+ta?BgCj{orWvN4t(j8zFeJwN
zyC+Gjw11YLf0?P4KmT&QVxO}2!lZsPA@OCKh+f2}gz7`r-06+`Oy#MEQ6v=uEzOi!
zaJ2ZM-gBP&+a5P#1cOQ3FRF)pbgp3M?hvjER6r67?_-1Z@PbHhj(&{?6Z=edd5_aj
z0KnBHHy_q!>9h#B^TQG=#{h<l21&nJ=XpJeO%&xqd8yG=nWVz4mBA6)J|T^Xm0I;&
zB|Gfo`@_%6@TXFj3fM|a<z(B6emmP*yz0CCtV6Srq?p||Pxp=ebDB&zv6f$buKnwD
zRPk!tHo=rAa{B$Ld%F7C>gYct*4CeUpB-1S1BnsX#9*-EB2emaV$D)u{5Xm?-;?Of
zGz(KmL>eO-uj|<GVz1}6|6TunSxnu}%00X$+d}#@G7f9`=pYQbs`DwWzQmdt&iMr^
z(h~-q2$N_5S)5bh6p^<h=sK`h4BCoSJkWk2<q~1Svx&aF$`9nkI*5J)$6{|FO1D9A
z_28hDjZ<?D_m&Sw(uo7@qwW72`RQ(|WfgaPx9512<0IkxQ8E498lBp5_#zmuX*A1x
zZd>l|+=j2bU}M(F$RMM4zq;wsrKA`{%sA%5l|t)dqX*X8P1GNV3NS-s5ZGL&z)D$l
zCfAUCGaU?LL4gZ$`08H+IvfVqgV_z*>E79<OR8F`>W$&l&BNFSMdQ!xhQ5fFdP23V
z?9{Py?@%^S9QRaTv^k;@Y%6&5rW4;c)a8~tMx)GA=1IE+81*LOq{61sRcC*Sakjby
zgTxX_Z`X0nnm+W)(dWJ2%(#9+z~?s}zlH0y`%<MOAe;ieN5@zEBp)b5vuEM-gstx3
zvxOLmQM*co!m>}^P9N~={0z(9QeEuVy855@(uUt>xvI$Qx`(4Zi_4LM(jgzhSpSTf
zFA3a`LSq5<Qx_(9epqKdffw}U{0NhNkf5^k&#*?1&LgjPVScQN(4c>NHDIr5&a2Bd
z4Un|+#O)H#Q<r`d9~GNuS^5yJjOMfS8V(MS6Ly3jn3kK04Ici;KB>!0Fj~yrc*mA!
zm$_XdUw)wbuywOM=|5PwZSKbFGY(s;;{|?|ah#zxkPgno3yUU|+0>|G6WUX1nAxWJ
z!Q*}oR6lRznLLJFrtG7T3`LHW%MxwLlL0&upp82!68)vnh@C2*52#s~n8NcGE~Q&2
zOQvf+=~vDb<b1zxciGk}z4x$Zcxm=uP*(;AUbE!s)dWpmzrA{P4*A!d57Ay6@U^HH
zZe>gB`c^@CEKk3(wtLa2U-Z^H-jnZCy8n>6x2dL-hVeOk=z;mZmEiBd5{F<r5`}-D
zN(YmgWtXKDC2!y+96xTe4DFrhb)rX%(bn_A$MwZZB##qm;T!Uvsbk}e;e2a^v<|J}
ztKb`F0tX@^E)WKcQMXk3-vfG3r|1VCi@7StW0v8UHAN9GxWL2cER8VLD`j`3>aZ#c
z2`A2xp`%2)ckFqgsz-NLBF+a0EtNg66=!FPPsF(yz6v5FKib)-k{4H0q54T*8Qj`k
zoL-!#dkr-*P5hZ$Ok-v*_nv#&-Nf}iF|O+6O?OP)pTW!BGfBJUP>YAof&7WZ)h{~!
z+{oA)kUo2TZ0*~=lH!?R+Q$3Cyb#6F*uy^zvF6D=-+mCtr_Y@K&a78Gnj)xJA|E*s
z;G6E-3oHMs#pqlz)M692E|UQ{w{$8o2zg2u>jA1(O_6eu&z_~Lx-)bP%HHyppUX-5
zU?LD-m(0CChC7c9@ZpPHj&ikTe;YyT8;+=8I<YNjtEMgnhlWx=V21HIbi-;&xi(tb
zf7DdITH8zJk=mf6yj+ziW%LreFn6sC*f6{I*339>*-3yhcSTc*V<2Yl0HU_+?s?HA
zc7ju1l6a={KZnQ|rKZ?Or)S5n=N@f2yt#IIGwAAa4A%3xtM%CeYm;uLWmiU~*7M&M
z&%GJt8T!b9LR*NC-sO~>%LH&J5qRTG=Mc@tEa5!-(t%+^hg6@u#YFtWG>~TeXLc@z
zLUY1+<MWMv+Q=^L&TyXBIVuN}+%?ad!IeR3&u~wuM*i%*G~RBAV2Wzr)lujEYL<fg
zn8D-+>eN*wqP0xhif*YSY<1k*=C)Hy(53b!YuD&l^RVlG3=U5VaZYO>hZdVN);*IC
zvv^!~%+306`EI9irN^mrLZwoSr4x|KX-4x~kw1>d`pTAMDwnF|n$3gZ;DR&b=@TF%
z(4AtA^6!2Og0SVh6?dhpd0xuB|9oCWBSj~4)%9S!ESRNopbe{kd;Ly)`)NCA_Rb6L
z=)VPf3vX%3uN3Y^Jo_yyO!s*gexDhq+lcLp*$$8nDX2F;v<hk><<?6o)ZLXYW=2N_
z|B*n4jp_6vEIS#_;92NQ;p~oWFYC}DbomGR{!Of71ZYi(RI=}4mX9wk@>Lsl@X^{a
zlQq4wpNZ>#&)CRGcp^mFVt9QMduV=h6#`f?K8qcKR1#h;u|1W2S!B`apG!8NxdsP@
zMIMjt^j*kq{rNM|z~nji9p(TTE{5bZG2nhJHZ2{sQ%ludqA6G>1ZE9jE>ay?%Ne>d
z3=5|MUw>L_z4uU?LxelkF7cxyrhx4T;Dl-oCOaOF3}ZwT4&QheJlVhXDhxJc!6kB2
z=UXIV#q(NF!|27zyN8aGCSyeXBw3nGv-{FLrm?=XGA28<M-69Z2K{uKz*_Z-zra84
zUt2OO=nJw{fOKBDrvrAoE4c@eR%I3ISS4?J1u8WPNL3r$OD<uAV$1)_t2k{w46+MX
z)X@A7d4w+%?T@~3Bol`mJPZu>4;s_PU(WCSb$O&Mdh{suIyN9|EE!qd_G>!7WW#q%
zGwNH2wJ~Xjs4~E?e2-fE)Cnqa?Ud{-cMp?|l1@i@efFoY0msoz>~G>N@aHnkMu?8_
z_1&ZMs|%e6e{EpXYS@IF#aU({w{y%lSo+-n{%?*_W4tKni<|NiMot~)+;qPWf3gP8
z4!ABfEDWZW3{vU$6&^R$jQ;H<Xu2cDESweKgW&!-2$p$@5RF<p!L*rfXlEEkm_3(C
zPEc94az30juH!-yayo3T5diZCp1O}F+c4Jq4TY^NLndsKa2P&Ksa@oW_5P2j%%Qo{
zl`!q`#yj|xks(EVqZ*UYm8zFp-*MR6){KM~O9O1+@*k(iK7W$8|6I$#%i{8U#F-}f
zL8hSp{X0KLzS!NVKz}QHfmqdr+HT(I;LvO#XCZd_k>lLLVN)J<;R<Itq%{?!m<vmM
z#e8Vgs`7!hB<kqETK*{GB#D07o-h7tdsUlr;d8^D=WAI)FE!{J-nGW*iLLwkryCSU
z`yam<Ryl}sCxjKYz>D+c-W3>A&%m=aX_HE6%9AGj&Fd=&=Aa>Bq_j8B%pD7N$5<Py
zsG7e!K@5>P?IVxM?tp@I<$|!HkL}h8u1;tfBN4P^l7xH2tvcvJDy14D_gTn^ebAuE
zt`M=vr@DIi8@9N5@;;316RpAO1mDbaVpdc`zm(8Uzq*qr%~S39R=$-P+}T~R%!kyo
zDQ#7_g-KtjnD5*z-6`)rqqV&8kzKA}c;W8tw2SzX=-@h5pKxD~K)dIf<NO$y6`Sm<
zm>7P()rE03XwU>p^V*W9E<&?xg!^aL!Oh=H?bfT6_iWw<%D)`v1<pO~<u)FFA`gFI
zqs(i6f$s0y`4@+xV+q2Diy{Bwb>#<))sNP+1IP<(yBNjG^gAqjh7FQ8FmZ85Ml$+V
zy5B4*5OFg~rfE$Rh&SR_pBTlO32i+@45_k?B~~)n0!3G?6lxk+gE#qNB88*q5TQ&4
z<9Jv#-_Cubu~ND3NuGZu2=z`iI|b@jImP)6+@b)ECs!!L`Q5PyhPUDn`Md$T-;Z8<
zyVB9KSniJf4a#yERYzF4(|k&@W{d}Wv`uKfk46f2#*>!3<p#ybJ)a~9FL%sf@pC|d
z2z4~5&E$LWD~#}P#dmSZF#uPyPOrK6AIpY&!d6Q+K2A-rp%b#4_vZZ(@+HC5U|fZw
zUo|f6`o<EH47E+jBT1c-u$W=m9gco1>rgD25r=%o3tviqW6uC!|8l389=g-~>Gwy3
z%Iq1u#iiCym!o;Q!7UwVEl2bSEjbN5>h=i)7x8L)-6wNwOScC9WIo|7j<OFuI=?4V
zjlW1;0&cgdnV5bp`%cwTwrE1}$C&N1WS;f|{$mod{T%`l))3827>gik=He`oRn_y~
zb{!tG793-O-NTQ=LSQ!IzPA~17v^#VH6j`0E_pQttNwAvej|H)E^bRO;4grc8Kgg6
zY2Tx-L8UC2`A=2SmxgMGE$t$`Yay|6KkqGLu*1X7w}4Hqto+?;4t`phCi58$yff6$
zO1t$P#<JoVW19P`bA{z^uVRnxMP$q=)UGWQrYrmGKaMsbY<%n($k=mq1Z+S@j~<v+
z-o^h!Ubk^!jNukZv98QZyv;qnUAHb(RXLxdkKrv6T~xV^d@qj`k-Q9XbjRLh6}tW?
z>HB!n79DsVwug1dqw~cnL;WDTT=GIT3{FpuXI_I}j@jw=kYamW{FNHBOkVBTmeBm)
z`lnG>4D$bvrnBIRvi;irHA4;ET|-Jpr{qvKNC`+wOSgmw5<@5@C4zK!cS=jQG)Ne9
zOUKN-^MBWRKEb)yHGB3M`#65vnUP%bdyl&5ZZK$ejT>T(<4YZ>g$R-Zm~X{qH0?HP
zx{lMs@n*&lWb*%~1z0->f#7@k68Ac6)a&2=Ms`~n@p%8GU}^IKdp|1;In)!wujJ)5
z1EIb9f4%%O1S;Ke7gIoLFvYTH1)%w<?Pp8E8hdmw1@;(Lal%{mctD&Fe8veTc#o1E
zi~Q+$%3PitTpKA-nE7i`W;dN{HpH|TC6#fo=UiJ{Q+SAcV@cpnZLsWL*?>}a8QaD<
zqkY9tEgbRB)cf=@5C5z<8#MGKS9a@<FhuC1c6EM*mQw>o?p$p}@Xe7TX4x|_r}fpI
z=cC33F<haEW~*QMF(PD|@qB3k$d_&WH_|85wKz+E&?0o@xDHT&<rc<=N%p*yQ#)X)
zkE9TDkEh;xElO1D05xcUau!Y_KpVUcwSv{gUw7l*3&<kv4r`mw9g44ZMUeAYF^SqR
zLi6uZt?A=9TNRe$TdKR8znlvVqC+_ph>a2mYg;hBmJ(@P{i*01B?{d0zBe$22OU4-
zbCmjEC=Fe*3n?Ah;}SAc^xpQ}-oq{{98xcVnqxy)pt}t2s;&Fze~mdKOynZygKqAC
zAIGf33Qk@tN+x0(Vj~D5VZTLZge7rpY2iNCxIcet4HLVfBCj(#7iDAku#`P&f4|!1
zzA+c|rOp%>Fp_O?cdE7zR<`792AR~yySPc$jbk4P(uN9Du4(pifIC(j4GMT@Ydc&D
zU#jU`<HhF;d--!5tYX;HLe<pFVc8<wwQf8Sy;-|9=u_;{K;{a1_1ba_S02}oQ&{kE
z+`VyR3C0;nG#3$xw(6oSqm0_v`>d9pV8wN0GHvjF?&3yBGBWd^=jBA%-eJf0zLFz=
z;bkz(u*V(0^TUV`4!(lr$L52FG1)*OX~6(ZIUPH!>u0Em+$%yUEN8Is)gvV{q3-M)
zce!zcX*T4bneArvow9PZdHMd)k7<h4)cYvRCf6X1_YZ+Wf5P8{$Yl|gqHV)stD&6e
zKIICQBN2sYI`C76FY>=qWMUTb)un3d+%Mavk$)=X$gejh@klydpJ#Rkg-9b4xRP`4
zYCKT&bhKA0(de>~7bD{Cr_`$c*7&#hhic3iI#c5xMw+R1IU6p_d!TJ!iyg^2KX*&H
z|Mmg02Uozk<;iPY&Gr}lL0xIXkt@8jlWXRM{aF_sTRH?KBDMhu#WK2Sm@N4}Rbdft
zA{?7Awj;KDn)VXz=R`Fc-8(f1wHIevwqzY8X^oqS0R~367Kdn4CKga2`pOpVoEY^K
zHn#Pz(GP}kL;%+HY}!l@Zp|n`)04+Wr`Hg~O?z*~JFr=DL@4X$uj(}&G_i;Pxe^k^
zPV>CTnWYJ=!1v7(y$1&#gg?)qIx@Mo**}%L^R_y28Aaza6nAf~P)1lgB)TNDyxLR?
zpjm!vE$pXX4M}jxqW*CwJ;CK=gpPaDX+{3e&DAkN75j1a#VOuTU7EQ305-u@4!EDi
za$7DE%RU0v7l`o@dht+*bd|}ZXhgC5-KOL`?L^|3(Yc#d(=xmHy!6Gh!7&iGu}mc%
zMb=#BRi4z+W#N);RJEAfg=|U)0F@XD76S<zE!%iH2HSAnD2e@^2Md8AnvR;O3PY<X
zwz}`X6_ssXD;uNG8=kFT@sD^oTCTbte=o8PF>^55`k0hwqM{hd!z=hs6K0+mj$`iF
zai4h+i1uao`J|PYj7<jZb)ZfwQTW7l+sI1csM|(yL%cTzV!s(1KD-pDsCba2W&{Id
z@4mWZ09QnqclM~s-|O=PRaRSKkIF*?@Zf^kIYga0!xDq?ab2p$&#Pt|rLf4;*9JOX
z!iqs=SgSm39YZNZd66FyM^y^VJk=Yqm?!^3TVA!Ec|67J5RCC%htIsRy6B@%K<&s(
zt2Uko$}l=~ASJM1f_U9h=L6!Xh?##K`H4J?y{<TSVX9oby}v#2FD<^;3_rDVS4C|m
zotq~ZZD05`<IdJM4P3J62Oxa$2fiK~0fz$VVfPmXH??LIrry<e_G)I)?%TWd6I@N3
z#gcrqxC?q#U)JHDhUVUg=e*c?Hhm%1irEf^ZA;cw%E1yw>gLRVFO2B#DVkd{H?e$D
z>DsGYJW=(w>d-*_{+S@v3v65ktw|<dg}mp6<)=J(0s{}dmJ70;Z?TTDL2?5Ll`4+d
zSl%7e$oB_kAuU9|E+Fqr!xc6V9adWbab~sFBQ7R44~(O=?^@ZC&8QUz%>ZE&Y|S|*
z@tpV_wBesnMdu}sCx_FnA#|sl*o+{ra02_7lK^)0>;f$$&z<0Wwi^b4Xx1wIN-~U1
z)x1w2_{ww$zuycv=RHJJQ0b)5?BV0dDa8(BHYy@y`-*?CIAYAoeXJ@dC9XNQGNPYt
z>|dkJW0;;*x4N)(fO<+l@}%i4oKcG7-phU5T6^Xw95J@YQX@EQvopvQt^fgLjdQRR
z+5wJZz$#uLBX9cynM^~BqfIwFseqDRr-crC5RNW;=dM{(b0+S3&@Tr)a{#;AmsRNE
zCG+h8Dsdw)d2KSbJcd!<j&8UnOntH!^9A%azu%@)n8=lx;y3MCeMsqC#9yAc%Re1N
z+nxyG@e9;}Nw1Xo*Tn2l-z7x@#rhEK7xn7muf#D|LPI~18RsNF;|0T%2w|_TBq$6E
zWBwA=kmWfi7#9#=GdjMzPgn)A5=#I0w4_m^ufUfkIZs{i;NszR8u`A3fqU#}(^kJL
zmkxa*Nl0$@8XYKTc`0rdLNj3wdH(sYN-;uvTtK`ZSvN`TuHU$6fgEujV`#(kmc&J&
zRWJ1_HoEIRz%Kqm`55-%jLbYU&<2}~cxo>$HBm7|WxPV!4<^_P<H0VS!2LyPz|4P_
zmWV>u$sev6Q~$Dd3(BHDJt^*6aa2H{I#vahpAvLQPKFBw;`vh2m*KH@_v$RTd$)ni
zzigP0wRN9@x|jaBuDq#?F!;JZ>Xe3u`!m&_o9lJ$+Icxdbo+waSWJn%kZ7@O#Gl_j
z)+E*5i8I2ulzhhUY2NlB;-LfRrpkNHm%#@l=_Zz%bf`6oPW%72bMr;D<HtX{H94gM
z-vts?%0YrI9WybvIsDR{-<H-`HA^FZ_&l}o1DsKbaXmYKB(XdmJg#L*jSc3E95IXy
z+!wNgDOUTsVg>gkF|jAL;o6?}#zKt*RO~S7K0U~UbrRogpwM*NmZB&%m^>Ub&q#bC
z!?@hdCPD)nxX(pnEp}u5TSoM>?<cqhz!QwVT}~iQ1=|;(jp0{&j%Bj-OZq}Yv_!(p
zYYaY~y89I=uMHRdOe0*7!A-4CM+efro^)<=_vm}w(`I~_YsO)!tlg$Fd$W*k`6@T_
z34ub2#g5doGXBPl7AuF?X~|&C7pE(WHX@zjCl9o)MkJs)JATTOcc%YiP>3d50IUnT
zZe&0QUSriq5NttR&_~9xkkrZq2UpIr2>r#{xq9AxsQpF|JPw|Cyb4ZkwqOa%<sFbf
zOTY$s9PWNO-L1@TK4H3FhAlJ@dp<>Sb>L2zW9v6RRl;yhk^6Cb7jAE3NiJLVSxcu~
z`UCH=oNfT{;BWlwV>aZ6%GhqK=pV)GgrzKykF~D=Tmz@9dUx^}Tzd}9t@^IQPi2x(
zeDK$@@u%v?J!g>fDg`Uy{KDbkq8|&jQi?I9C&)U*UWam-!MBI{kw`-@f`Q`qA#Ayz
z%wf7uop$a^(88pPzLz0RcqJZYN&HLI3nQ{wx}W-|MMAGa@8i6+xh<nqQti$D+QezY
z;|!|E2@i7A5qZZkpZmsv2of|hV%MKv0vN4V`-i;a-=13lU*gIbfXyIhmHZz&vM+qc
zd?{a=j1rujzJGtvJ@DMDm)IJpfpTp2<>O*DE7tFXz{&!#^SrDf)w-yqeSDUqP?@kI
zcdYv{5Q}os(Zn`XS=m1)8tq2FXZcP?o@6k(+DSg6@^B2ygnd+kRSZ$bx+XdJb3#VW
zZt!=>OQ|>$<KtPf6Mx{_$XFjvB!7%2lNhxiWNUMIh`Ry%;wJGw$#JMQa#|j~zF$+Y
zdftLi(lTssSj^l|o>v}u9cpFya^13BJNCiQjQsxJoCQ4b@OdJ-ZhdEc_4nJI0?TUS
zpZ*H+HM!QrAk_;6`p*E`uJ|W?6=b}6xJv|{|MGUpZawjOI_L|Q)`4p7m?g(d`$3Sj
z^y)e>&YAgeFiVZ8-xZqD6f^EauD3IfH8lh4(54=~VW`bI`O_h=U?E^DJa3~^7b*C~
z^!EYZxJc4Atx+dv=^V^XWf)Z17cK?_v3e$pO!(r$VrBkh;af9Z6+h6c3|Zz3TLdU7
z?lmB!Ga+vc;MJAP=9i*^dsRV+A1WWu44_o_o^iO;wL(&1SOLQAwU`h}DS8Vfim{!3
zB=p~gAIGguP^j524Jg|K^+Y}w=_lnUoj5;;*%HX8S;s{TK%!J2F~h=#d0+yV`2yCN
z^0tl#GCiJ6JC)x@KFbZ97`X&~ru;j6vT*~RU%2eHV`s68u!FzRzPVF}Hvp;}UEc?>
zv$jF0gsR>CSkh;A-w0R~8e43Q2WGaBOiI#u@0h8V-XqND46G4ilk!r~v{%vdIyyt%
z-HYl)cC<Rf2Ov7Ylo{`bBrqcK!<&Txlvj>l7p?R1%A2J)Wg1-Nfj_BvxSWu=ScQ~Y
zaVzk`4K0Sj7kt|DyJw41RfjJuE1H$m!=wa1a#Fmcsd+Fr=m}>@F0dNB?ZCxgY5T6}
z&09CbgFnbq`JSapI4@OC5&~>zy%a(^$_l-Wxa^YjBTYGZsGk^MIiyj>U@Scd8|qkz
zz^fn5p}EXv_$GXK8t{oTvM3_ep~jWLYqMf$IdH?gLr?9@l&IREkvQ{*L`SN!$x*73
zLYUW7v&G`&oBC+u>5ZZAn#Y8}`b{KcKRRZa-6e9S|KSWAal%I631A-rq3=m}2Kk4N
z?OsL=xIrj~3QHz9ZHWp_P*n)?W!GP-d#A$Uy48bfO6fJLfyHaT4&lswA$zCUV4#K^
zXd>BbRQou?a5^C-CV-!zbM5<~L`Nq%oU&`OXB@jnY}&%F@8>uw$Vg{#W2p<DWIz5>
z-HBYY-N%lp!!)q4fdyGLH%RpLq2KO;Um!1$x+f;sG#>vYqZ5%G#LsPi_Fmu<?*$sO
zWPBBpF3+r28ZZ`S>KVz<|JyXZJDzGTVt--1wdvn`Lah;B3iEZB(*@4DfM(-Smd>Gi
z2N%oO{H3n*jV}SU3@3XrpSsDQ>>Z0Lj^kX)hi3XL8mvkyA01~l2uHOILSC4s&Yk~}
z6X01wtruk*L8@IIdkzIZ&$ta-pVrLL%GBcAmGvM;5<#zZ3sXBk7?8#+af0Br{`pX)
zkEF5Rl4cpw%~Y*spET;L+;)~6OP3;2dhnHG@G0~Z(+X_0fZ3iTO~pp+L9;uNOc_ms
z9e!Uex|rzhr3pX8-eEy>x1L|7#NOe6y9*6a@uB|wUzwyUBv=HPx6pXH)n8bmJJ`=T
zq^ocI$~;WV0GGs+yyL{7yH3m5wqlm!fCA}j@*mCePm{54iPaPOC3SWp>gN`|ea0cR
zY@HY%QdRTC*D}sG-V=Pce#+Z~i9R}A;?@mvsKS%x?fOf8RnYc!r2vXT@F6`JrH{H4
zB0E+<QM|{Q5a3M=qjXd(c;{G>ObzYyrp}8=7rpJw$|HKXOIbVi)wefMwTIRPKUp`x
zaa!$r6BjLkSTC^*S?{TJTG5LP_auaA4b&KcMf-X1^RlH1{vKiiqkxV5SD?xmR!gi-
z5wV!8#M)a;IhB@Aq?zB>ZwnaQq!`*0%wzJP-tB(a^Op&FdxDoYxw&l(*rNChLe``h
zKk)?RJvX<!FcZHw*Aj*M);wv%gi>QDC{F^3EXx0*HLYZXHJj8drGlPr^&J5-f6;I{
znwH<}F*L6;{$<h{IstOhe5T0#PT?I+ld^yEVp^>H0c`|i^JN6MxN`PXqViI~sSKB0
zsh~FaDITYsx~oVO&;3zaPd!S22XW5QAAKQLDFUz@Rm42UY$opO8nM5+ebelpfkqS5
zvuhhCn^34W?67c1H^NV1sTcsNgV##nUSqN+x@1oX_#~oQ)J$IxE$W_jW`t#onO~XY
zV3{ZS7RUJ4)AlsZVx0mNglFp5Tkk%l2!Cg4zsAfT`c!ffQUu%C`HxV%;L85y`!Ksq
zZSe)1q_ap&$m$u9P`r)iZ+5*uX<ChRIPi&n9)B`v!N{#$GLSbLAX*X0I%NDmxYlRE
zx%0@?`t7n-UrVcI@rq(w1^d`M{Ll>UDVG`1!*eGr9hdp3oe$6B_Zw4stuQt_n5&N<
zqB*TI>-gi4U#Q$qTZ&paFiV|)HL(z@SluarE9Y=7b@n?Jl>JS=>2u!rjQ5M9>Wj_G
zL<@iyptdl~xz9}Vx@zv=`x|yzc#(XY9{ozs$~W_`kR7>D&W*#wfLY4nNxKAJYW?-W
zMz6rjvFZ8if6q~$Ot90K4==I)yt#Z2y8kU|k7za7k_hozM{U2H#*I?^&?iMw5Xrcq
z!u592?{-4nw^jmNz}rWeE%353F@pveQ>l3VBgXW(w4oSm?(b)eUbCQY5`=jN3cR^<
zQG;l4fAZU(Hd7WAV>ggV)JrdXd0qj%Y&y%EuzOS2{1tXJcCYzm%D#xeo^g9n&4fF6
z(~sU{%a8lKX4A!wVUf!+tM9c6eVG-TZ(nQqJ2gU=5O33YCm*H6B^g#cvh7J}-H79|
zL8)qOvideB+^v3RHo{(2T45kfj1Y)|py_O-Xxv%#TZ(#NLNBI|`LA5JwRlcY;v~i_
zzV{sz^<yDhq+MLf<t<}?7q0UnV#EM%Ieq=sG<@?3cB*iXg|@W_@k_yKy!f{|&OAU3
zBn(vBm80a;PhnmwD{dWcPo}qPvAp!QUAd*>b<~V|b0Hc=ru<38B??YgX`=Gn@&}Mt
zLO@bcl4eRwM*%M2ib1o?oH&jl09-}$B!d%1rhJ{u`uEuZ$^H9`uudl`=yc=ju!(P;
z73eJL-ld!#<B@!Z@kt{>1a{zhe78ZkRXY<*e7kU=JhhmAh-z6Y^%ViJD9jmNm6ybk
zEB-k?Y~ab$@1Re5_QWDxicA00a>=8*h_N~OEt!fg=44tuEkLE?zJ?<W8YSgMf21-T
zLLz{Gl$EMpyD}O5OEIY8R=iQQ8TyqpKESdvrtM3nAfPQs4k_NYRYs-I(J#$07~*~^
z`-aw!S+#t=!a4y0L4o8&@ur)1?x0QFU?c82Oj+IDIcND7<D1-EY28aWSeMw@oJ-n;
z+8^E@EX=o);NseyS~9Z6V6#Q#XE(hz0V{v19tI|CwU{`88h+p%SGYaEEh>V+^7^Us
zlVii$^|(J=_V%Le3PtO17SiQF19RW~ps`D17SB6=PU*@O;2bNjm!RqMpcoTckpy-W
z`s{`op5j-Nszc+mX>`%qTZ`o9`AW1HB-2-Y`8^U+ZV0X5D?dQL<xgC2;7<qlj6H|t
z5-!`~KF?C_dMklOvrxUR+9x8)7d%j3)XoyI)EMb7S50{)dI=V^O+&jUX4f5k*Rs`?
zWTFUGyjEYxJ%{kR!{(%{y5DuLcDg4OB<~mrf*({mU8w5EO*>0&xRG)On>gB)_7Xit
zc-a5xc!uUMtYb6Z8X@1tL6$CFVvSYQDup|&YpXI#H%&T-u?G0!ObCK-(da13qZkgh
z#BaT9RMu!Dj(7)sHQH+;wz&P~gKj1WPP|+7A41}NtO%tE-2nivE~51CIPwWNwy0Wo
zL5XQN0rR5pddB7$#m&)bwf-fKq(FDw(ZVc$tSj3;u(~1fsb%S{^!-DMLa#j_E-U8l
z7q&q$YgWaY_`B1o+h8@qM=}F*J<+hf5{Wj>C{_tSqdwDM<TG`*Yk37H!>^k0qY*r6
z>72bD(k@MDqRZ{K`*I+{^#GKqW1OvzexguRNwuC6hE0Om*XUoZTR5;q|A|_$02(RF
zUKpIW=*U#Fd0^K%{=!=HY5r}IQs8QNMhU;B^FK1}=7+Sw1tOsN03YU)Osq75UhM8l
z3X<)f4+P|?t&C{hLA4LYk=|JFRK;G$X$G#)<sNEsSI;-4a0AzfRWLa(hdR2DrZCF7
zwkyf?sznM7IV23~%|K?-RNGwfasc|u_>2Jd!RtapE3zl&_I{0xv-^YgxPaHEph1>V
zAbZToTw|Cv=}^Sk?c-w4(l(Cc?^SO*N2A{IF|<U#4@;(#U8lN(qr}awvxY%X1CK@7
zsS0hdYl9gZ9enAb^7Y14kPENqBJmy9nAkk+L<T;2x$m+}b>9Tj{&5ptHZ>GgnC9ja
zaBk?)n2AoO|L_G3XtJMuZfcyI4n!#6V5EUymRRsD{jo%AG(77+hr-6$b=N`N0;Jtt
z5%kv&9JfzcO90*>jY9I<T#cVDJQVE>-3eHdU>t+X86&1-?-PdO=7smBL5(6Z%jrG;
zVbr-GQ()U<{FPv(t0m*g_BL?)UC0N>kV{63Cbiviu&OB?e1Ztx%@<F0<SX$Rja8J6
z|6M`{kDg7B1XT%!b@0P^fr*T_|Epdd$L{YtTNe(Rq)0Jn&uuT2MF&a0l0b@_*$;Ih
zrG8DhI*IL5Kv=SdsFtt{$hn-;)y>5(g+LFxN7EP)veXZr*!Yd!TUN~1-exZM<=jEN
zluymGDZXNpe@dmRep2-1YynjQ7=Hl~Xn^yA;#8mZzx@%@(((VzCaFw7TP;8`j|Gom
zCc*AXtD42NIyNkAMnn77kK8y(V?CXMxmv({mIUYqlc4h68<ViZM_^+DUP)UV!*qY3
zV~JlkMDy3R{+SQ%zqqs2YFX*=m-#pluX+HXguNzsh)DS{fP>^&FO0YQ;A3XCviaoT
zBd{^dsnnrR3{?%&ANu<B*{`v5nhp$j6peKR{dydl@YK5I-u%ktEx?Ia*rL5VC{ekG
zSo^|)1Ft{Fr{jC$_@vqv4G(x-*|`u?2+?FA(LIG(50PMnX+YRjX=mn5443BoLR-oc
zdTVZEZE{}xyeQvG(d@MXY~N!`?%HBvoMv|CW}j<>(5IyTcixIuLGi@grmFMWuMxC)
z)K@{x@~GL>aiXF2YNcu+R=oMyuT~#i3f274<c6e65*-GWwuLqA>z3<)>Y@c_E+FFy
zMKk6N=!c#bU_xKy&IImO^t@Zs$AQ@{qj4hZ)m<CcLx#N3uO^!0sRH2n7!ZHg<rtEv
zPyxr}*{urqFg|e7@bd41R9};xm>-#bO$~x*<gE%6(g1p&8oA7YjY~G=9-i^Olun_p
z1+k-Zza;K&urGS;vh0J%Sici&2zibvD#kyGH*?k|IRC1#<^3!4qU#pYPPKEOG+tNj
z{BH!`uPnZGSM_gO;b3VA)hq}&K{3a)dky^>(L~8PbZLe>PrZ<mTIIyGt&-_0^#NXM
z=YqNN$-npxeV#G>u@H|p3yx5Q`UoYb01De3YvPZRV1+tD8ivCDt$Ii%sxjd@b2^&0
zE!x24&FK9xPqi7i(!Wzct#%HZf2<og?lnMV!akSsy{;!+r2uG!_nJCpr*_;OI$PIc
z3nfjIfGi$YZ7W~;M8BtL{-#(41Y7E}pE#ueVOuoX(?x!H<JA3HoV@E|!WHby2%EyI
zBVp`yxo_8y$WveOGjHn-?n%J1(gMye=O>@K#5(@1TtB|D6eH-RB<Y<s=Q53y12qsm
zcJQ_9Ip>GK_uP8?$0-i)y=GBAP-qy>pH-a3&%X1hs-=Au;+7k<L#UR#eh3UTO8e&A
z3ji>tJ9FQ?NLmG-FYUVa80HQUHETm?6H##6gQIt8>$+6JpOr8TMj#qg0K+E0jmE@9
z3#1cWQ}*D{yx{1F=84b(E=6DKLJC9tt$eKOl-ds@JL+8QS81yx1>KhS+4mkKig0Am
ze|4-Zn8HJ9LcL%HU5b5!<@@uPF<tqRJDP)M3)CgS69wwR4nLmlmi+pV(U3_;8172S
zhxzyxKCh7At!-ecX>eUjjyjOLPct_sY1o%n!X~If_H-guhiKT}eCni^K91~65SOmj
z?i@Y8{wOD*znrD$?^jB^gf85e^91Q+bTtN*`Jp5u#%QuA`h#z-Zf=}9%EQGm+kN0<
zL2SB@;;)iw>pvJ?KV}9J#v}aX0uI{Yyl9}gv^gT^t5I)CIqzy<iU*Yl=qpZN$s;Gi
z9gL()P(CB0dRg~sDZuUeCaBu>@PUKWvlvn85~TR!s^{c^O_&{u=AN#h*OEc6>D;>N
z){I~G97yBVB(m})hH+q6`HJNik_&?2_y#Vb3m_!wy1S_}j%`$&wUO#b8uA&+?JVRr
z>YniPG}~`V+94SE%`Lz_KxW;ob^Tatk^hAKx?<vnMFc-u*`5z-r{O*uSpo@Ths?*d
zz4`NB(Pou+WtV-e8J~gdo$VWSuCc~)((lna(L`3MpbqBVrx>nzyg!DxP3i5gqTPyN
zbXR7D52@zC|5YE7p$z$Yi5e65jCb5{Ov943GDoq3Uvaiha7c!`<Umi!P(Lh6n=Y(1
zw<_-~MIQ5P;u@}p?GOoSxGG_oT=~X)23;17M(&202Ada%Ft%PzoAc)H_WGD}>~T!S
z6R`S64grpBt|AN_MW<#nzAMu%)5b+e-~n5){+0zFZptyNdAe_bXyWyTU@1nUX|Vry
zg|EwB^rjtfjSoX(*RaIdAf8i3TumB}BI%&7RIh3}L0Zyv#f)ji_{L(ONL8Sr*MnTC
zu|!-VdY`BkB+&&Gf6=@8`cLJ~layoM``QXA%zEUw5;6Tk$EJtJLdEt$$rXwN`1X1E
z6C)?oCH;l)iPZ*^%j^z83_pYvO|Y!&GVoZEE*6B8rQwhS<VD5oAH%?5;vmb#b`|O-
z3<Z+^(*iuPCnBLFp)g-_cU9=M`zIt2c;V_8c_^@gW0iTeWGUZGMRFUXTNXv*_zu@F
zKDgDFdjjsrYv&r`vU+g>p-bnJdsX)qD~M0fwDv>FTq5DsrYnm3KEbTPJPsMD09(7#
zF5f&@&`>CEQb5RmH4d~(yY#Zou>IMWg`*SS`|_BYDgz(#2;CFyxKemusYf*S{X$0n
z7&gBeT0x-Zp30)&01mL12wYjLI;z->F_YxPuS;R1ZG2Q|uuT2+#O+?d-$Kyx>u?Jz
zgI;h#N|0bT0ol%GyG*X9`LLQveJc0kvll-n%Puaa693LZKkv(HAtd(Y$ymSDex}t?
ztS2+v%j-fH?~W@%2Dq8cS<3gnngdSu2x8zT?>lQQ#w{?AqcJv%1!S}moR#g0Ra_ms
z_3PZIYSo^u6`&%GOZ3Kmy2AiXozI1RXZ804|7lTDo{)1@&mNi_sh~h+tw&I*$ZPy+
zO_$UkhV>*=i{wQIME}V3l1|I5Ob%<tq9z%B^EpmDf3PM_I&}qbS+snO(VMNUz<ax*
z{xGMGh~+}o9C=`yf4y}O4f<>sS8|_#ji9aqo{=U2fxllDE)ukKu3i1tY;jd)<bwm}
z8O_zu{12->ON!vj4o({wP7TE-rc&9HV2RN0SNHF1TtAX{|G%U-iE2mznUp{?12XN&
zCtp64uJbphje_-DmMB8t7cEt5Zl7SKD<yRfXnU|0kV)bwjBlJxID!*Al@$!ie0brH
z@lOx+2{ts>5R!4TIf!RAApb9<@<5)Y%<?ewbS}8jX!XQZg4eoOGsdIUT#cZ6<{%_T
z<e^p&E_zPP@G(!~Ul1O^G2;J2kb`0XO3)GKUbwkhVc0*mePv4l0@z@Q3KQH{g1?25
z31Ud0y|}}FNui$Dni4E!PY)(eDne=lPHR$Z{4Fq8dW6`sxO#f=24=bdQ*6t2zHnT2
z+*cMqU4nw+Dl$J=naFWKO;1u)F!y77C&I-Uzer3r;MZtRkd^(U<#Gin5%c?(g&0aN
zUENL)zHG@Yj4pveNGH?@t}3xpR`0_{nSgCi6+8%>Yo%Hb^-x{y+&b&#3PYtJjDF47
z1K<%MA_7|He7?_5Z71``;EI3xn6AFrSDP?iN5;J^WW=_BUAhA}-BJwS2d&ynsi!29
zNxwef?U<w%J_gr0VW|+ZwTKrEY<(WXOao!tMZ9Uk^j>(hr-plXrQ+1&COd!>b}Bs0
z2}F%Q#x_g7$~KwcB7F3xs#$G71@v0EnCj+eEBv_s!#n)*NibES*70_F+6Z^C8uuU^
z?L_s!8bH>~R*6aEqcjUqrFGp{l7z#!JF=6L!*NHSIk9;dx61XQIR6~B1u)c8{<(XU
zia8SV2)wY+MmO3tqj5fo*k*aEmoHO)0)%2e^r%+{?0$BpeTCsewdI9<@T8_>g~sg!
zmJ+>iIxF(c9aroMF3JgfVtJ7UU?>+bYqs~3xYBOgV%`T8U0a*A38~3ht=VR_2M%l#
zOpHTZZ5&MB&*aNWhP#=f2OF$L7ta6Dmk+HW+*`3sEyx0NAF9dE6Iij-F}JWDIMkve
zqael5qVVgyhP5>(19kdYl$y<Hxgn}C3$3i?FislnP5LBPo4@s$WQ7p&e$v8wd9!kf
z*EfNTXYGBP45=DYe4QNHGi2U{l=0zjkJ6(ES-YX!!=tbVA1I27l-uRxItYRVAMPq?
zgH{M<BO^37;l<ky>rbmtfv*-Nh7#RCedV{Errs{Q<hE%w{}|Y98kCl9R#Rs)Dtjh2
z<h}lSfgB6G7kGU=&<o#WblGp={Q9^SVxd70pVy0-7k}3j1k@Z&$KC&l7G<U2!*J}<
zt3A1jJho`GBnnR?Q~Ykt!cb*nB`jH%6>65nR3+<g=I7YX5bE^)Z>&2mKN+T(g+Dn7
ze~hd5*h-vS`C*rM3&z?bcKqhJ`CCh)#TKn|JH8htOq@1^XYFepCe1y_+hk?FATBc6
z19q1$<4D8r@|s2RzkCS4!LKtA|13h5D~t{d5&|+^QSF%UTm=F^i_mq)4){<4a<l7A
zCjg$Pbb_KHz6^Nzmv+vr9um7W>!s)wDdVz>yVRW!OqkM)2{&|V;EyQ0czFdhew;XP
zJ512Ed%0%n{^z_33oJ{1nErkpd%`T$@^A?Hb!ux*^sfy+Hz>j(I=Cj)GNVx>j&TpP
zX7F%0)srHgPxq)>!b}8bXqQ{mPOLEwkv&KXXx}-$iflffdfUm6I*!$aQb))qElZC-
zM|n?zDco=@FnUFvE5)2ZVCXH|uxovpnW3qp+JgHmf<zrn%ZcYE=8l2GHK?Fsz#w=&
z5N;R}uK(bl>NbB}P|7{*bXCl`#V26cVqvtp_>R8wvC8|VgL#tx)4s$HD<TCiwAce1
z3<z=u>uw!}w7&h9NDG;C&7^;<X^(BX!(a1{=eJ(gM_wHXd~nvEtH|pJg#HXw7Q;<~
zHz4o7KgqV2_=yf@HBMV8040%*2;o0O#jS?uc+$-nU{BaG{!2bmrCOy_<K}4gYHnz4
zUZTDJ*sNZzh^v+#f$=Va^+l8Zo$eZSnfyUSyd6(>rGRV9e~GjdKMOvm>gt$%vwurn
z**r&i-qf*bhIG2<FLeQFwk_$!LmI0{#^(Xo;>fsvoh^jax{uXJg2?O73)kbXA5w9a
z4#wmiK9!T{XWi|3BDv3NO=|)=*RxkQ7A;B*YYe%HRT@K{)?X)o-+1~2;U^3%3qtnn
zdJ|T|xjo-;^$9}4s||a61(!X1GuL(Mf&47i(g@C{a8}CRCDX9`eT58iA|EQNPUr-+
zxCeKl-arSx=t)DKsi8~t!lMbF1U>Ia`+;=xwci(vbUHY0pzPt=(8sH_E9gEr#Pn>k
z@kVHp)!o{;WU<ZWA*FYhx9~{$QG*Nln~qaWa1<H$_MO9nwoB!Lhnpk9;Q5VeIFcG$
z-mzL5fxicQa~-SxLKq;ig$po%VeL_3X=DcryjQE)ec4m)H>XdAcRlQ5&%@sIv&6qH
zQfm_g4SpgCW01tTBr*QxiZjN-()^#re>h#{r9Kfwd}a6B0k3pCP%Ep!2jW5XQ4Q;>
znsRk!_kFl52f=yt@1Lexy1Q)eZx%LVCr7%i1~rT4Gto#ifJ>V(+`=l9`dVW`#c`|*
zcl<)-ReZLc2xd|c3oey>N`vhCT;dfCJ<!LYRRLvnwa*CN;)d3>_3EFrKlkT(ujn{@
z<~C5t6j!;$m=R*~a0jPIZ&i|+5YTM!sM%YLZVY%NFvCv*z{z5Y>-6b-u(JoU2Nsi;
z<Si{<{HLq=J54VJeHKZ|kECE@!U)qb`jEk43Gk7yPZ}#<{5D_v%cd|CT}SuCrm!1#
zgaF*}1O}R1yfA9z-f~i~nw;}E$75G8L1nb8JlQ{83k$7UUwTA+d_^+9SrH`Lc;gYa
z!SQ8vFF2#jxuIAlT|SnutpnIOeLjvHojv+-kr1VUz_o6_io_u6m_TNnN9w50vN1VH
zNd5XXW$iLU>!WU6UZg$B!-ZtjsOm~uevKssxD3FYBEw5kFehk;q`rRn%T19*qCeGZ
zSZyHxQ|{>a>c)9N?}MIV5*aZrRF9qaWf;7lZ!0?W*S~XT5pW4~FE6BAG10B0m*vMZ
zmzQg^dNqdWmFuOQmp{1L;yTvsAGPwQuY8yM!7V3B|GE5l+mPrh5JtwtccO53aZ0mS
z?;;W?hJL8?$lO=Gc@$_h;s^?<pWiUP-%lzk<#0yn4boqKTo^bWu&7+D@YqA6KR+S3
zgs7hhrmx;NrU3q9K#rnVi5K*jH1G}pd;v&I9o(zjZ1wo~?aA?mi@bdBTiJB2*U4BU
z<+uQObWZ5y7QF~K^{B}ZkERhrN?Pq2hlew92x4YA*Z7`cnCErjcHZ+GU9zfrP?xCS
z4Pt+yH?{g=2GR7;9>3!CRNwbU5WRF=oP4KnKupqb_1sy?g!|!@H~!U&h8~$dBSD?@
zD+k*UgNMo^0cVu9r^k)O`_|Sq?yqB+wkS2z;GSgTO#2yx=DmkAAg<xK0j-;1`YGZ>
zc#W?td0DpGdU!mvp558SZ29Q<_N}j6uH_^x2h;aApP2GVFj)U&dH)?rd~@zlI|Tuv
zw!tGRNvVd{tLh+Mlw^E+gJ%q`xN#%x8c-XYitOrlKA6Fx!GTT*S@MVDJDOso^}%Xy
z_*O%Gd!I97{uqvI#18vmzc&Z>z{mXfUWEGA9K@nk)T|pa{<=jkBn1HqWmDC<d=>v#
zQP`tWo6Ff8@)<F1;8ELS)Y<9Xx>V6j$8;6Q6?}Q4Y>(=3*+8-W&h-^*`>Kd=^9G3v
z>G)#Q6pQRjb7LFYl5iDa9bLbbx_Nu*m%}JeA6NS4T|=7k7rnm(lB}v>Bk7(7Z;GNw
zW3BA|13urQiP5C9+>nk-fMYcsoTo)GKd8c}qoGr)b(KFQL$SVq*`E^K58go8zV!TU
zB+;Ftw?j#VVV>uQML5i=lQT#W0|_?Snx4C`oK-D4YyC(1;V{7)h*54wMjc@4{El8^
zE~W`!ITl_0)wTYRy}mK!W{W2G_}>$cvmo0)hGJs$hHz$~VlTkY=}Bz<Bhj(h+61;p
zflFIB_XPNa@boGq81eV_?|ZNAHj6sR_}5^DXI}9UP|D6f=(#ITV1hfOBCBCpZ&J@h
z+5Wuh1eX{)@=`a1!L?}gf%(%)UEfcC(h9RETX7@!4^HWR>u$Qx|Kbz&_*{?8M}BGI
zBTxCL$&l0Q9kzKTeF2wOxw6bhGM&Q*pO&MNFh~?hNfOC2Y(v`r;d7lQl7uyTO-lci
zbNxxbafr?wt;QandX#-sh|`t4@gu4-<WxSnIS4SGA@3Cx&!hVA$j-LV?TQ<KWdieG
zUOQ$wX3mzC_kSasVWFzaP|iw3TMB6ExDL^JQn)Gf(<;|n0Y3_&322toL;s%6VLlTz
z2#hUm)gjTDuBI5#_jtG6ZK^Y~_BmQSZyBy}wIqc-PL-Qi?y~ZeYzwce*bQgw2Vlkr
zTf27`ql+73?pribqNDfp7k1t9Ya{BDxz#U4dP#5`^yg;WzHI&DwNA~d0O^8Xt|5NR
zB6a=H@ul|b`G+6Xev;pO?z%tK!+O<|g7BxEClP@s{HNiGZ6m+Z3Y^uu;u_*N0IOAE
z^yu_*lMO;#{=WQ;23$<jkZfg%u&YVVVJf_VL!d@(-P^fY26*f%8=nW4l>5L6fUV(+
z*AU*;O1jN6f~s#!oV<eH<=;pz-6Mp5?pOBVfkXay^`@LpUg!8*PI#WQuZEb2Ft-FH
z@((0*h)X6vA5cVm9YFT~tBjBjvq_6%RY?d~t`ZN&>AZRMzfi<nCWo+<<O8lzi=N1O
zh9J~Lb#G1qxPf4V4O^H^aIYI^ezNtR+wdrCnd(c35kN+EZ!Nh;Af<|<ir5{Vt{rZC
z6Zov%ROck0AL3<#w-;vBAf5PR(OQ4S(%x|Q8v2#XSQJ8I*GqThw{97_q(=oGgkn;?
zPEP(;n-!QtMrc-GwOB4$<LW{5vrQC~nfBG5N1Ytx#y=tI21C6U>+}EzPo5^&`15(O
ztN9%Cus)JTn3f+9z8@Hy?b8iGZxxF21kca&nPneBh!4F{Pm5)9d62*4$%(joe-?2>
z{iktO+rY8RGXjRk=>A&$b^U8m6+HlC`0JCol|ZH!ccK=Qm|tU+z85?X%Mv+@!Xb^7
z^n_tYD{z^hM=%6b1;9beKNWiQ&)xVG*hVD3zCYj_uv<&S*c}nG#8~Y;f#5AJEs0`K
zl48x7hVXBp_w+gVLB*-tI=0fJpJ~1Ciy?KV2G=`|%6(auBMzJu-h&tAQd_T8ZrP3l
zp4>X3%Dmfx+6-#vUG!~3mZ1;mfnK#9jaLp=Als-=r*)u_BC4tEN&;Bso&u9#$U_3E
zgCG8cC$w5-cQeFs7IJmO&!<!MCOs)eU!h_sUQ<;X<hOa1KppBBSd2kk&5IJR0{p|_
zT4#-th+f|i5t6jx&?BxqBCcw;{U%VSDV(3~)EVC%t<1K4d^+yQbe5^0Oq=P7Z^N+K
z7js+b#Ql8yMfSf!{gA)ULC`okuQ%14kLW84YGZ1BXBdas<Hi*6b_)l@Z5keZ6v8QV
z$@rA|Y_&{&JRPAhjdY>|Ho*ArhyY7auk0w;`GYZ#Uu0UNf8Bb0PfW~g-rX*fqq&=W
z8#9>Yg(qXPs0Tl@GlJ<!K-*m7RxSa%1+lg8F@i5tm}Wlm91u7+$!f0)KIQ?d(RL_S
zpdq?NGVi;%W%`(|3Yh>0nZ6f{1r^PPL~i>{?i_-9?mKK0AdYT#`xQMu_t28xlrvSX
zK4;^6X+-wHz<??OQQZ~XY*wzL_wM(L(}xg_`ljdC)3$FdLUHuJV40~gZq?G^pW(~k
z?&(guEUm@i3_PsWYFnCHnq^OyT+k{J)9$)fQ&?pw5C{#hqsEUxtT9iTvuQD#?gKa=
zTsW3=<aM{GYK2~(lNC|;)Bp11CEhT+nNKYs2^(o!Y@B>!^Z6ex1tq3dp4$(i2@O=^
zCFs>;?&66zJOt~~>rPYernDT%^+7)Oe(z;&)8X-%<GcA_!EZf$Yr!gfJr$=Rto0Xu
zs>jprEYK=!IE9d)3qR0&<lzho0l_;zV~Ij{@6VJ;2qK`jXJ^TM=YyH&=w}l1PXbg-
zSGcdU_KV>Sxa2&J^1u42Y!5&OM+!s?KI64hn4iMs-x-qV+>FoOdxJN*WG@Rxt0^p>
zk{V1{85~Psey8s$pNb&7G}+1h*876=pK!V&g^G*Y5Ji%XM|({e^WOqm{*LGN>mC)z
zQRx6>T~w#EA3ZU#JS~A#xHgR|`y=->DuGP8Wwl4}SYoi}8$s`*by^`CJVW+YaZ$kX
zIh77Jyl$jX0aDzIemijRbnx_gCoI)2mCc_sU0bv4`}e(^;zW|SkZ=`&Vg<exI&uLU
zuQY%K^ca&@Qr4nWZ;20nj&O8BY>(dZ<JW=i#SFK~ZgguSW54FS#m)=f@S?1do_msB
z06lXHWz)d%yt-@bt>s1HzA_b7IaeM_Wfp7)agicY=Qr7ySQW}J?K;*rt7W7Dn|#s1
z=v2;EMCf$%&2=SKU)Hj}<tJS8Nc~6b-`FDt*wz6#zwt!Jf%!mCNb2=gd|>IF3EY@*
z(a9$RU2WE$d@U`koLva)Hm>8&9s2Sf6QE(WnV`WSR-;hS+(#py8bl)i&?p#_eycZS
z4`USxh~ZehJYtjssgaVh6l+*9vD#p?TYRkgIlPY}*c(f)99rdl)$k2e!`9~BNYUnY
z=Ax}<OcnxGOYX>h_Z>q$$`ur#T#oEA?77^VDm<A*&b}?3b#kve(7+A(N_HEPx|~jR
z^l<TQMZOk0v6**f5RAqZBhgdeI80zF-LH{Qm>@y_k35mRpn#j%zefi?QkgGS&bLQ>
zrgqIJK!IAsR#pTA`Nj-36Zm`SdZovC*{pwENu6&R55V?@OQ9Z82v_KmYj4ZGybG-E
z^4|MZXyeZ?=QeKQJ#!94i>*>$EO)%%pzcj@u+ZLsU5};9UAbFG$FEXzj}OepvX1{-
z^#r~82L)rEwtZEP2U!fb{PT&u;h^17<TtfzKWsQ*6OailQxAO>#et13FrX;fP%8|D
z#Ce|PvA!*<!;6R91OZi}#uXbT%d=RlU53fUywf|HMw-81oN}BICC*|dXae2t(BG{X
zK`svsH`3KGn0jjK;%!Tkl}O<lrb45p+W40E>~x)csW$dOjK3+ua-KD7fzs11sB2>r
zc+3m8G<uv2me;a>z%A>@1yrUl>MUv={91@zayL<d4_2Oa29@(XOjjcx`!~yv?ocW=
z_BnbFjhXYv%(tKzY!LQ%v-Jyh{N-f6K6_FH9Zb-s$Aal3&Hzs5*TV6ANAVb{>0Ki>
zUomA^BC91p67{+rPx;99HIM};0R>IKRe$X#VhtVJ76@fxF$|l^93UX<9mBqaSzRDI
zF%=lUb;wGNA3HPv_;CLi1+_Ww&u;kIQ>-6cA@S}C?q{`px5ng%Z_1Y!QIR>j)*M`O
zzZUE6?+|F(7y<K9i*t2}Y7lyq2k);_9N<>Z#?E#WsiKcE!>bbkT$f2beX+hg+oPui
z0vh;?c?|I&;W|C*9`aIwqTh1NriYVfe-Dnvjz$fV7E^@2IU$WX|98tv)|j@h02jJ5
zPT6B?C2+bDUP^~QV=Th~g%_;(gf_S2X&h<H0j}vAi!5rSIDNL%P9~PboGlZ%I|NPZ
zIewbUS68BErP-{ui;tYgOUK=ux3bg852Z#Ah%b6iaX6&*2*z?5gBRcX+&V6!M<L$o
z#>(Z6W8M)yZADOkf`1)ZMt~^nKs&qji&T$f-#@|dfqN_skdP3~moe$}Y^1}DT&870
zt;2=mn{Sf-&(a5E7M0cdC9MM-U|668@WHVH%)h&<gZ*!`l7ARHX)-ywn?T%(5`})(
ze#!_PAo%XRu`}^#@^-6=jAfkN7Nh&urMF)2+G}6jVAGu!y#k*hWft-o1-Ylu!6Buy
ze6k%EWfz?fxrBZl(g?k}*`i$Z0Ih~yRPo|<tcT9c?g^>{8^Fi+Y{y7{(|IiWxnSr9
zI8z0dKigQbc))*PRBStMqf<;QC*GlO|D90obV1{xxA9ik`3Dj#?)={nj|JM9FaY%N
zegaVF-+m`F@(Y|#EIFZwciXbM@q;I#si9W|F{$Zcd-}JVzs|uV3_k!Q+=-P5-n{a+
z7@PikZiSXm>z%Chde{eJ1*>!O3~t(A@6WIG&2H#kT;Svq6Jz6qJGXZ@t=E?I^nbr0
zW7GZb*aI8e6Fr-)F+>+TaffK)51F!Y4bcPM_tm-<3e0h=T$!Tz3%Z5>{vgkgQ)su~
zi`}`~wcH+AdFJeC+Sf5y=n;2NwYFXVDJb;jTc!ex@v);tqj!--a0OmN*fs{HzG`&@
z8^SulVY9MrDXlW$Fcm4l$vl)*G4~(+9==9grGEBE7Vib`8E<KB+1-Z~)%e@{n@Hje
zO9t7EuGaS+rMhmSd-m?~=2xf}(a|q8rsX}>duCtR10z<T7NA!z4Mx!a=TY;&Z*oys
z1=1=SpkKt0$G2VUQmgVYB^OSjuO@!q`Um>=2~e4G=h;+?K-l~9=E1i3Zw7_R+JC`b
zqKx!W=u_({#mIxC2F6msi$dkP(9sT#vfI(QlMZ>}y^ER0rcb#G8zLVRw93rKAEB*E
z<yyK!Ql~{bOMNf6Rlt~m2juFwI+r7Q=RGe`zxU3k(51U>Zm%g&V7X|swhUFT|A^ue
z5*j5z#%Kce_NYu@;1w{_H|_NWjN-@YtC+`hoQ0BLThDl0NfV#Sd_wz5C{*yT2gYv?
z0s<H*3BjWu!bZbpQ&vD|-V+C?O$Okk7u3Lr)zESM-X~`D%BiR2F<JWHM$sNx{G#mu
zDFdHoBP+2Bbf^}{{VICqJq55lYsQ&;S>)>6Lxi;3w1jWo1nKcE>}B^UAZ}DGUFE-B
zc-C$n_<bLhqYt&D4MuVbB}U$NiUaF=d`7@XAJ{b%@csg})S${!4^<=&|2N2PO_GZ4
zO09Fn|5j;=qJC;4-xDC*u~RrWqyR(ktpcQu(vLm^iQ+Hgov190pffam6~CvKM7p%N
z^l$v^T<BkoXxudhp!}r(er&7p+w^1DuRq5A8%rMplnIBgLYaIc{OE26sY39W&OcAQ
z;QpYlQ-bbu+}{=szslV}_=I$JuBX^DH(2*)!HrL^n6b)G)ea~vT380uxQHSR)T?2F
zy0qo4BepTj(;>-=uzB|MYb3%tS7@j}(kAQT>;Iyqn;dFSgMFvLnOcAdElsf88|I6d
z_u69MP0-E-@j77aed@hN@LNwmr8M*D;ldCMb#KAENX0<2TPJRve7o=3`3}e3<C-^?
zXaF7c!T*@4Z&eaPK3p3O;H|H%Rw9vw0@&zH<<V-H`Fh;i|K(t=%M#-2zts?K4_<Xd
zcK>Fz2oR2C+YE{Q0$zfa<RG;g;4w!;w^%5mqKMC4#x+OiSyknKglJ<e<=$Voy5fT?
zq)CQ_5=<tPv6I{dS%|Bfaf@wj`EV)dXVyO8)!8pD8idG_c<L@zeW5IAGt$8^ejhi%
z2(-YHT2BO6A!wb+g>B%Uixfh+${i*mF4b<|>yidJ{)Ceq+*@1@vP*bW+0x?|y|Ry#
zNq5XL8v&2Af5N+}yQ;m64KEOxi-;%CKqQK@7I8>eF8^ZSpc)6x@D%!jyYAXpL6aaD
zqn~y;ksxp8E-c`EonFQNE(|!UZ(i2sboq-jO+V>S1#GCoRb{kENLitnkOU~1OHtw*
zOf@M?DVpSKC^h{@8>Y(k_nG1VQIcozj!|)_a_5Q|U@qzt9p+!&?SwPcNe&g*_6yyx
zo_g-aR$_;s%ufhkj;qVKBCk)-3uAy0T&sD=g9}dm)e<?Kdn_)D!h}h;P&S9>s+J5#
z9>>Hy#bYJMat1e*E(ptQRk2-W`cwLssMaCCs}3$>4yyYCb~fCa76#_UWZ|wPn2yb6
z)h8au9{4jL*58#59yxKUbz_*44iJL0Q_#?ua{ue|vY8pI?`lFZYum7-Sq?!i`DJCr
zuVtm1_Nh2jf+i~pOuThWPhAP1)Bb?dO>5|e%0=~d=+S<ytsft>%v9cFvsgE{c|^%P
zv|<A%e)N2ucO$q6hRYI#891$!eO)<$dMMmvMu+ZUG`?_v{VHfO7)1=6;rLhc)}lD)
zncdkQJiY^7cwt+DkWeLJ9p3Lqu5=jfce12^B?@_l<p$_#zsA!+u4pN%pWhD$0LK33
z$_n~H2%jQ992(WWj%Qv|R16T6zay`iFmP&O!}Z`6?)2ADk^i=4m7(*WlsY<kSji4T
zd*A*`poLsoS?xp9j-a5{w@mr6j4DC^)oZ}S$}dzdZn3iid|y6nnrFIruXpnDrQau!
zZZA)qzLWq<#!Zz(_Ko0z#rL`~rj^t5*O3dGA(w+&=c)<B|H}~cU?<!t@*t!ZUWoIc
z5!LO*HR_IYt0zv}YC{iNDMB&|xl1lm6(jKmzt4;clOmU-VQ?j9|6a&+&J}d`cRP9Z
z%BKk$k*LzNg&t$%ZTp3kVwi~4A#jCd3yAOnIA262ae!iJ%f``n|1rrT9B|`PLH$E?
zuQX@D_m{Q+X#+S6RP_Hky6U*5-Zy#&8;uMk1=&QTky1)xgrvwoB_swaA_yWFG-HFW
zqNsqRK}$<WDz%}~Ehz|_bTeS|V882cfA6!;J-hFHpXWX2+~-u0$=4tJ$(WaZh1_oR
z$mnHgY*OVR7Y(h+EKA<6dv&Z6H9bA}qG4&J@l&h9(}T>iU2BB)l52zG)-LnmP%BsC
zXc&#0egd?nRg15ZcxjGz_XT+N=rW}n+@FGvqDMo02HE~d0W+gW4)Rl$+y*E7C@%LY
z6BH=pY(8<yiIpMII;U256am+dGS*%iAkSJVU~6jyouaDEp_`Fc7f%iT)H_i=FQRfH
zDx(7O?#Xpi;BFquN9a9{ILJcu+qAq%(v?Sk)`BFF%X~lej<TmD4yi#JT^AtnYm%?7
z2prrQHny`469OVfC4cHZiDj1Y!B&h>x%^KE#~^3}<ci?*Rr4yk#6{iY;)W6H4LV_S
z%tknD>eUz_cG)L>1$&l>ECutrdI3y<ISyA@<dW+2N4!i|`6|J&25wP-gV{M{GyjF{
zO&!jYoYI_9d(|Jd+&cR1#zIz_0XWq4IUMhqm5U=qnyt@xV|6j*5LT@d$ZAegcaj;h
z>>l*~lZJ2Oy51*ah2T_T1|qaEbF`+Kt1RjueHPM(^AY(~Zax12hx!$2_%cf58_xkp
zqHZP)DjgttZt179#xHY*Q!aIrZ0oC&KD6U$g{L|idv|>PRfpon58+_9Pmih3?NvSi
z$1-Cb{3ZlxHC7BW(lE!M@FJBA!zSH!Wh4;Z>*h`*iQ8D|duYhnJ`Jw>xf`NDH6ZXN
zq=g<*$D^mWrWZNfl?*raOr63RXY)0tW+b#`rUEuEs=Ba4H%SMX@j-JA-0ay>W>@s*
z9K%GLN!6?-jPfL4&*QsuuHZrkRU%t4JiTk<tc&&hGSQZez|c6_&t;xz=}obUsDHb8
z(vXT?SwD;F-woyI3#Z;}`1P-2i_UKSk$sfyN*MBau4gyqk_Zl7zr^Uexlh`>IeeLL
zp_zc5zz)<1!vJIHSX(ZWWsWO)D+Y(z&;~9b9bd-oLrsy+{KT7N=CE2^vc6x*n?Um{
z*j!nb#H2T91!{;+i?^@@cHP?FLvyhBet$8l#sX(_C;rp`qcQEfxPiF78AWsW7PQRq
zO6?%?U?b$3+#rzZ_4OjY=_N$!$M*am=$#LTBetpE*5dOFViOmKyn`NnzxUz1O8w?m
zap7TM7f)v`FGap8OpI#9g)^{T&mN^jm@Se#eG(B9frI<BruiR-KMpUg2GyNgX_(0+
z6Jmwv7*tBA^DOTXTg?8X_#ugnQL4=FLa~ZV@P~U-rbxuHWLZ-eis6K-@QK>)2d%py
zrPhVeDl>W702elFYh}Ble`v;2DQ4~?@(fYH(FOP7ih-b*n5`FbPH8Vq;cjpIK&{EG
z8y6KEPfY#McRJhm^Lt_rQpP~WCUy>{*z^%%JzkxjNQzUd_+%AkD~q;3mz-m>_~Y<i
zKB*TLeOcH>%cJOVIuF~&N7oxd`+Jk^5pd~ko(@at#9NpNlJLrqPQ#YRuK%vCuqej~
zrq`a?e}fzS4JfiPbT#EI*=Fopt1SVit!^JiT8%x!S2IZE0tEVNmu11{Hastzrl(`W
zHZ}OS#R4C`4ht(9_B<Hem32M$*>>qKHu0Fc)GDCsn2N!4x%a<1BNj6SyZuicAV%_+
zeP@D7y)YMto==W7L*NRy^HCY3ySHI%hC#*a=)J(6=Jb^0#$^T1u}GJjxoQr9M%o0i
zH3$GlirFbQq!Yw8U&KIP6c3LWh2oHS<4}F+%Qw~$Yk!KdVRZk9=l-H=Ymfa8hWx7Z
z3+CfKtfFnnbQ?UKYjf=MkHX)Q?9}R7`fvfgm<h<{ZTrQz$x*PZ5IH7k;zmIM>b3T8
zlz7_ukWAHBW6gRZ-rBBo(7fAoYqrJ`JVfYVRfM`*zIgH#p2w-bj(TLKsL?C{S2uVz
z6%q`{#3-qCFkCxprwkDJPz#??TueczKA2&0oTSBG{LajvFQzCeTPV<raP6-#_EmfA
z8>6jluhQeE`caLyBr*^5<>H6}R~u)pi}GFH{%lzwxM&qj3+*-5{~6~5k}M&W{(}cA
zlX>G@&$yl*tcK<BCYY(A54_2AO!-9K&cVAZ49ADn0|y8l6mcBf02mc8@nFrGeH3~Z
zMGxbHsvZgVWs6EbpWOuAVi>kg*NWjnkoKF$98r^}=Y5=CmA2Tj8_rnqD(R!sI*rj)
z>~V|_p;?-+_TQUQyRWZZ4fkF9#d7^nk((pAchv8i!e^0<D*X+MXD*#>9?tYEb_43+
za=W!vum<~=v9(wB-&eXs!+4MZ<)xP4PNf^B43B+-;_ayKqe8?w?}H0bim&ytY$Cy?
zU_bcCb^C9s@r1EIV)b7SQ{~xhL}tc`EPZ3$J8So5=a?O!>Duk?wW<Nf#Un>P#ZZ%e
zMn`XsIToN=z>te!$@EY#^3lU-B#O0JQR=@53GZaQbzlBqXR1-&W-{U!j3oqDVw!VW
zPm4OFMM@IBm2&wblEGo^*A+wkmKo`v-%rU6vx_n3fD5rq*{`0LV`$nw?baP=<j;^w
zHj{Cgvc!YnfwSMQ7<q{>S10||n71J+VE)WTJyOo?G<+w{^~hqlOfsl#a|gPI-!ZRE
zr|x-VQLdTA!SS;hSL$A04e+0TFg;M0?tOX{TdA_(<zF;wHk5sAAx${HSMZ($#fp;W
zov7_T!ZaTP#)pfL^YVa*6J+EA8^e`gYuzOI@2~0n_$Zt}z$g7B904)dQRSD{UjkZY
zY)M*2bJW?5&W)ixPo@8)4X8?Ym5c)+t#VUsag0AvtT;OcOgDEPjKPZLC+?W$mXB*6
zWO^%^Se!<^tr*D{O3syS;t(PpJULA<9ly$sgeDKX9rM!3F9=DUJIRfJG6EY|jZ?)o
zj~UNFl{Aus<9N<&a$7NE6mBmk))FShOG4^*edquFm5cyYX}!As2mgf$PBP4nIE0eg
zy6DWNho!C)3qM5kkd~|1<tKCpPCzIKxOpt)B-r(+*%?=MZE0{RlOL)Y>e`<zdM+}d
zzIsId`K)zKe=(P4L^6iHH}nBav<e9H^VRy$m1o6k3?3;Iqci~6j0mfka?iH_b&*@d
z8%9JS2Id}C;|49V)Q)X_rLj6BRY=^~->qoq38Tr=lwwYLS&Dtc4+%Zgd*5M0{UJR^
zR}Rf8_gD9ACd4ZqNob0xzPG$=Z$KSR<J^<7T(<)E%uGsh#M=??o$tYy{6D1s2^<Xu
zxp8e!lLC2TnK#R|aUG?{&amTBw{AK!+!<>-=byS3e{r5}vvge31NcE9DusL&H%64l
z3bWe;eo6Ml$s7Fn$O#99E!6!4GvBf?pKalBT_3{1PJ4}H@0;}33a!aoi?>>?+Y^y<
zz9NrYI9M)c{R?#SbP|{sxh*QWf^vr?1QFFO@wi(|9p`gSsBcF-&n-XSd&#ks&+TE~
z;gN^D_ErM2n1fusiRxW@zgG5kHa@-c3`Bbay->*1Jx?5JdmzSPtq)HKP3D2VamhYB
zrz`&2?5yC<v&8I(e++JG#6QiVZt_8-p5P?0*9VV1aVw%1BfdvBC_KvkNcL9(_Hvr&
zHs;~@EF`ZBu+%8SVz_zv9V5{l$^R0H4td#khf!3TdnzyuBR|s7aJQy$eB7J1od?D*
z(x(o$)ZBe?ZKsQxMdn{UdI`OCbukEuY{SI~3JSbK3^BK}!Q)h1tc5U16PhZqj3x|d
zxq{5gXuFr8_f9TL*{hn_RKkLbOW#-ugpBXmw<vQr>MveS*MZb`Y?_uK&HK*spx#EM
zNHuH2y=~r+a=t!~Vx_Pm(Uu~eIpOOk5&u@~&~F*iMB_MZrl<7?T(QN@MWm91jzour
z)#cu9j>sB%FAt5*`n^cGoF(kDODSD|`>6c-?l>68rw7PuW4BW8A-erN_ZM&}0)hZ>
z9Ux;Fh`LRiQkxEef3wwZMc-2*oWeK}G((>p9Br**u!mbUlDZ8Ci%T<8k2TZYWCv=w
zF9~`#vk1-;H5kty96FXDFz4%H@5>I3BwUJpWOYrk=O-%+z@NV7eYr&_0~qSq!SKml
z>HFZVH!<x4<$9nfc0mW@eZ*Zb=36XhwXHQB+ZQ|=jm|LsCT#U_FruAug756_tQ})<
z<eR75-a3#F!${C}33{qhjp`n|Kg<iO#18(Wss8z2mJ)-ycWLA#&(LOcqSC54eDYWq
z_i)dmva8n*uNy;YC8_R_s#z9zU}t`uMX@D8Z|{GXn~7Fp2v<Of7~UKolr1aa?0ajh
zO#lzjny;_k9z|5skEwNPBwhL%bzaTV*gZL~qTTD%;;V4IuI56$HylDBA0UlBljiXm
zm>EX)Xoxi#Do~;%uUuk5U6=q|8t$Nb3p*OwQeNb`Xl1{&$Zue3$HVPlG&6f7cJ1a<
zTO}d@-tF>F#5-pSp$(tthJ%}Fjdd|55`ZB(G|Qc4R<KgFv`TTgPk8D-?|j%ad31c$
zKW`jV#4{1k5`w7wykQNkSo!-jU3|*Y;i<?P>{8oa4Z|^JiWAE{Q<}t}=Efkwj$X&{
zG9UmVHhF!wO7*Wdt@xvFOSbyU+=@l&%F@c_{zmiw!a0OKcQ~*6QTI|<H3wAlEc_j2
zr84nzxbKF9vZ{c~aEjh9l0Xh#z2m+3(GHYs+9E&(nL7m4NFd?h^vxRaMZ<hcmbWwW
z!Zvf_osareVA=!GO{d@93FdtXh^K`%L5WN>S06j@X4O0av0!Uz20TEO(ArKWaBxff
zc9VmdU19g`>8R}qETHr&m}xmeJ8<bppNt*<O&4GXYIvb&#>OIXie5^@332v4M7hOi
z9n8sPw)cg77l=h-pnZmRKm)OC4InVb0kr98L~nY!79!m_t^2x1hREZOk3=h?RD@Wd
zXd82=wqQPxF?XwKOt_N&Z~0X<XNw9EMaKVb@F0`Uw#3>ciadIb<D_i9is0yr=X+n;
z7z4*cI8Ab{Z)m=L`W5t(iL8lKpQzyqu4|aM3U-PK=CkF-+Uxur+7c&kTr2Q=PD13&
zed^t+D-YvX?$jb_Q0Q3@GCv-e>w`vdFz~^dW5Z-3i0ddh{(?XHrY=kj5{yk$@cNgA
zeiv0pmWJu<FV0%dgZrpcy7R}blDxCNp4`#jdf0&G5&$r4hlihwS79LDQj0r>%;!IC
zf4=j|PyJTEzWPSsLonJZ07m6=(i=<p1(ZJB<jHzUmDf|KKkD?dj72Rxue2!)ny@LY
z1W`=>ZXD1QT=8dK)vLR4f2cFZ&y*qk&*l@6&hpJ1-oxV?VIk*zFzVrmygM|19vUIw
zpIy;Q?1VME4jS|pLh}a#H~@ba4@8T@38<;Z!;6izVWG!!w8iDTJdoq_JEnG5EXQ|F
zFU~IbDW&$_x*?kHc1A|fqyd%4KE=XdSHd&h7ANU4U&tG-{_;N(%73kmoUsfEtYJKN
zzoY6ssq8q*Q$>Q9j8TIqU`A*4M9ND>^h(!+`@$3Ov8sifgprlx=M57}$K;GE(BS#o
zbK7CttRXl5Sl&G(brXZ9ybF<*rh`_JIr+guFg**K2vCyn;j(b3HKTe0giL@Cje)*I
z2>#DbI)6n<tK1v+t=}skH<|8~=G>?i8n^=j*aF!n=LQ|Dwnm-S2Qby{UZdSl?wG+H
zVRJ<n+1WZawu2?PH;$>dd$td--fI|kUTFsA{C7+hS|)GK41|~52ik{2S$Eu+^`t&T
zBE$D=8G`g#f)?}yp_M!~^`L+KK~;6fk7MW1Qe7`^|LXBoqdY5FTUl55vjp@3e|V`B
zo%bgb;)&x(GO~KlnYgqwIi9~uVx`bMA!H^!q&xs-a*n_X%b@|{5yU(|aj+IzbENgK
zMJQ%EMLw$;oHTf)q{TLSI(j-91d<Ax=6v^;R)!Y#rULvf);hj&p9TSy!5kijYA229
z{A^CLCbP<L$EWG|Mcr<(;y@PTFjXgQ5g&hWxm2<>i$=N?aVHyvw(~+$ZCwOZc;x<-
ztHKLtz3-AbOpTT@uFdxc-|N-%%X5xJEP-}+r4=p*@O2~m(!rwHGRGZllC2Z2W<%3M
zhOPpiOT#jMX`eqQm$%<_a4g{vLK33T3nAnrJa88ZRERIM^$>6GhuKc@H^NjiE~xcr
z+_n;F-f9kcsx4$uVwC(3RHv<b>3Qe0`ud<JJ3%2~p{jLX8$Vj!oemJ~p1#bxk<xk}
zqIdU5T*~AwQcX~@<xB}U$OEu@^8lE46!~-p3(dUX%Ghx-_A%qzx2~*Do!HU#Y2l-F
zhyaNEb3V{{gn!y_ZOn7Kb9`d;AVd4!&ie+VhOzwNjv+rXbEdJjOrtPq_+kf2F!-ul
zF5PnfIJLg}6U_q>PKY7XhZs>fBw!>ID*^wN@QcXoOKF4uq=AThZOb9+@;Z|GM*{8w
zMiu*B|DvCgLA85vwtZ;1V#KzzchV8ux32UU3sh_^Z|!gI1u20-ij=dW3R23-$Bi>t
z4v~~aGTSF!yrJs~&U?0%*6rVclRH+~7Va+hLhILI;#7m1^0r4d#e9{8-JlwhR5Nxo
zW)oaA>G62^wP(XkR@qra7RHz$(K9pNZow79grx72BRqSc#_(_!z3&Yno}(%~OegL3
zgws=50F4NMcLo0G3&X7FiU||t5`3*G_?aq2HC<S=B1NUeu50R^YI=9x)}q%1A&c{^
z$=UJI@ylxSts|1jlGC02%`2WE4PQktZQ+VB&ADPHta!hquul+;=mT%oJD&L7YmHg1
zQR?|>tc?$MTpK+L<qlCm;^qf#=FF+dbZ0mh?7#L@Sy8P`3@fr-R;{Zt%CRa=Dw?%M
zvw`omNM(wiiLB2Vn}jwxFJl#!X}YFN582FZF*Yr|Mbsa49LN3=z#o11=qEX}my5$w
zwqw(BT;>YzpIjfLfJ)T6K90N5ze6-X^t6Cu?mhjqbqJcm=}xJydrEsG1*SWH2Pofs
z<sKiPB`gn)`2&+IrUENnvbv=rf2hAXnH?u5XoKn&yj|OADX)e`%wBLV4}EU^#V)=r
z^Z+*>ugKy7mJAu!q0%H7=Wo|H-X|K37S?otjLTSIjqJ8xv9<IKvz#*CXJLYSY3tYY
z+ZAFLEoya>+2|_oRteDlX{<;4fd_<Wv`aFl5U&0If$vtIVFNUUrEqo^f{=`03Hi#(
zOhDPYuri6LyI(mK_D>L+i{1~ZPEoiE1~e;w=mKL3sGcF(-%epHN?VdEmfP>?q+0L~
z>|aQepWD!SUvc?DjKHmDIQcAC^pr`;>qr4y>-$WTkMGYue;BpU96V@1+Iq3R|1(c?
zqaplRm<eOAWKM>mx$E!J#3H?hUo6XsK?TkQiA6b{1tLj56s2I9h&>zv>L+L{(j+N)
zh;5(0mVH=?`nq>4&PY57s3*Tdu0Ea|h0wH?>n1%YghvphF}zI{KDWrf(A31}%Cpp-
z^fwPF!M^V4hTE0Z!pI<5PNN_5Pf5MW0<mSO-;@*EAbBZax&$izg-Ke@4K#-+Mc<7M
z1cCQ^>BI>1YrUC@Qfjdi@8Bv~1|p-1H8-K>AbZG+MuC7#L;wyEG@CJ#{KF5vmx(yQ
ztp`u(#soFe7OcQ-Yd5+e9K%nMpzux5A(8Lq6_ETLB0rYOd&HhU_VT;Aeu?!MH0|5r
zQKG(O_e{xb(535BxE1~oiOvY^0-*%*Y9%LoGRJ$tlmz&zFY0%FMVfuP?79Yvm7?Em
zo-*lEc>Q0|td7L=*T@W`A=WbqERV05MbYq|C@(tKle4KFMB90@kNA`Ux)Gj!shy$Z
z45^_0vJ^IVboV@-p2`XMWQt35u;{~?vQ7)Jh~gFDoO&E04eU5#2S2p>Tfxz}H~J&Z
z1$6n^3mKv3BcR7O?X?vsy?0XSYNp!+MkV<mNY-kNM+@BoeY`94@2P0J#ptnfYxZ;>
zW0RyZe8p^nJR-xXQ(t`T=n>qz0j!T0PI6t)fk&$!-{LYMnf!cr_PcxrJ4#PAwuJ*d
zz}$tRC`DEOEx7}A3)J0&#1q;++=Qvc3DGs8swdU>$wiv!0vY@E_K3;WAbJBQ0DFwf
z@&Zm1Etdr^<QP3PF2^0dH$ubuoy93QzWUc*y{O7%qnoekr&*rRjqRtGiM{cw-DAfs
z_ViGQZhee^N7H!-%6A=Q^Nwu#I^zTo3XCS}k#QVQ?foiv(rPQ0k6P!>m(Qe9l+>Q(
zxdj5_mxB4%w6QJ*np_a3GLJs#ezdCz+=1dOM#E(V@4y%u?)SybHaXd!S}{-RW9WCL
zR;?dWlDMcc<1ucbbTj->F!(<RyoG(e9-4M$!40QlIgBlBqE9k~e>|sWr5bB1t4LUD
z`sMs5;j@cWL=%pK!wJ6jee=0XEIaiiyrkhID^-$*+Iy#(5T4_$)&T^hjU5|-Xkhf<
z(*Sq|QKdwj13rDhYsobY*y)+GGclKI37S;*DMtRl8g`=~vcu2@S=IyFw{yDvC~S$_
zVZO`L-j1CvhJf+@9m0#x^bc%+a2ZZ32ltxuYYI+Y5p5xhZpvWJx?iRcp@*4tPIl7=
ziX@TKKD?B|-1PhJjveu|f=~OsZpEdjQqMzm$v*G!UW2VivNQsW^229UY#b##YAD%u
zQsl~Aa;FPAF=HLCPP}8A#Nu#MG2b(Xp{gulmvu#xyj`_w%k!u7Tr>7OJ(Ml0SnX{F
z2BmZRYFa5D?8v8ZnEspvfc++VL-Att;RrosMVQkP)9H2=rp?>7lg{zGvOhd+^|+J?
zbIbYZ>-p}kIb)WeqWtBTcdoHgZI!3fJH|_Aj^<AEZ3!RO-K(ZsxF3-o17BV3(HG!%
zLf3u?M&(>bLoy|rNQrI+T#>)?&k$^w{u)cQud~aYd$GK37Chl36mx0mHmvU(^zeG4
zr8rr^O;tB(U2?NpmXjh;<t}|uvsaqTcY63QJ&H*01_f0;Ksg+bz9Kt1qk7>n<93P7
z2iw`;%j_KTt4@g=L5h@_-J&(<f7`zIQngWRsc$aET|NE%lu*WqbVCp!R?kI_po5<^
z^WIYA6fpVC`Jj`XcBPi?z(n`a0sdsjjf%s0A@!?`F0QPa0ip6+$yMbUpJCB2ZIl<l
z(f$`;mWRKWEP9FDpVMkTM>ts>d|_I8VYDlG>ZBd<!1Y}h;K)tk|K{UNrW@Qn!hQuP
z{EU!4)<E0gBc}-SMkeY7;<y=1plXB>&$GdQGgXIqmp@fY^Z-<3^EPw<x&iQY2o)>A
z|DA~_p+VqMe!y6EDCEd+M)O$pA%M?g39UZXxC1D2?Lq!%2Rb8x(flK3GL{7phT%V#
zKzLbL>>)^ng^JOa=If(|f1mS`Dd2=X6U8=RAcIKw%Sh3MhL6M9w-T7kAo*M6(Vt1|
z(n4VaBO2hiEe%+;R=Q7+gY$bjWDmhWEM~@6zH&^E=XDhf)X8mVNjXUg#G{;5(c(y8
zW@~0Xa~}~-KLgZPq0o_hUN_DD+@0$^4BDz8LSHh7X4qBJ0U8&C4E~DPXL2?EhegG)
z1?ILh67JQ(rkY9BaxXjh{}*g;!yYm!PBTH~a^KN&uY{8n)p^?~i1MT70Hvn_FGqgB
zw)a_%Zq6L8^*eCja}T>#8W)ic2PPL?%1lwCGo+gRQ(O3)CJVfNf5sMssuprcH!V9C
U^GtX>4gf!<m#-R@=)2(m2kI%UfdBvi

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..60e2d3328f89df794d7b894fd2f6e2dfbb44ba82
GIT binary patch
literal 2095
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
ZzyR4Xd;=*Q?iv69002ovPDHLkV1gL3>M{TT

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..03ebd1904875ab54fa71cbe948304fbb6266d69a
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^j6ht&!3HE(th_Z1NJ*BsMwA5Sr<If^7Ns&crsOB3
zDtP85rl$s_CZ<#to=mj?D$?_GaSW-rmGtBPe|u(OW&s5b0RuL{{})vhSj1!(AJJe`
mnsM{yP3eNAb2c+DvN1d<;HnQh5Offzlfl!~&t;ucLK6U8&?-Ox

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png
new file mode 100644
index 0000000000000000000000000000000000000000..27fe5a4e8d16eb92aa3342865479515ab0788ac8
GIT binary patch
literal 1926
zcmX9<dsGu=7M~=Ogd_tQ3MC-{iKsw<D2X72CUp`XO)A!`B1P(h1dvozKwjk`gdicJ
zlq^!VTPY^3cw&o|D0rkTP$5-VK~j%!B64I+skA8%fr6ByuwU3eX6D>)zI%U<d*_?8
zvJc*Krn0CI1UXA3(R;x&99+pxByjJL*(u-wr;B!rAn3ckaANfzAok3SNzC1sc{H~`
zeku(TrDiJ9IMNgH^t8Qc^3=lY{xksuk(ttHQT!*PijtY@eIaIOJ9-o21-bVwuaz$|
z&@!UU2f~^8eZn3%PrycR5_tY-4vt4hbE0^X^MvX${9Fd7i)`Ko;gzk0pSrTPht$5n
z^LC;%%)~*@;Z1?)eY}Yo-$=Gc#44v^pgD#LQh26ru$33Z!gdOUGon#M7~iIcQfvf1
zRzl#Y5=n2*wu-!iphayc8U&fb&<x1r9_m>~#c*aSiV>bgcqrenRo!(7sQ*l5b=5lS
zHz>XqA5MduI3AJ3)o!d^br=$OWl&|sX@~VZ$$kjMf^*+5^|JIp^;7XGD@8l4m+Fq5
zbR@7C?o*Zte`1aIhsJvoa%oiq#8D}Ki%3xN-Ksnged2uiUDl?~c^n4)<4I1OL@J{s
zVbM5~>zh<c9auEU9tWRP$_)f_DK<s9c98@_FxoD-M;iP{kMDuCZhBLgz6J)O4SNl^
zYVSNweuZDuzwcNY2mqbB!0>OgK)+qf;w)+W21PgsudT$_W{dvh%J^~W25rSR8(jc<
z_fL>Vf#GBu5+M8?a)ADqw~O-tr|7*i>Is87{CTFawH0p@a7Nez!b2*^x0zygxz-zJ
zkY>w@5g3#`3)hxc7oS!>lk?q4A2}BKF4OE+l=$q;=o6RE{<#@Y^c6ReN2_0|6weK|
z2uIAnbU>U^b5ZVub3{6?%JM{p_E&w1R}>Y<bZgqNDL7&Uqt$IBgMySjK}Xz^MD(jA
z8pIJ+F}Jnd^dv1#=wL8IXEu#s+|!o6dR{L|a>SKG<eGL4X`U2Kb_SjB3pV+YreiWf
zkZjPeIOUej;cY+D?YXCrydfOGO6v53y|*&wO(Z;oJ2MsGq7>QiTyB-Xk=tfFQe;f9
zT7frr1ow~=e}5}V$xMU*Y4I@*Evnes())7`go78n7;RKpIx`kD`E%XMaa-?OQZ-28
zi5A$#5ZvHTSuXzTXl?s@$h+&#_xArktA)i(04d2$ziJv9de^lR6uwRAw+mf3DxL5i
zZ%jZ&vDSxmHFDjcMMePT4CJ&RQMrw<kAok{Jo>F1c;wW1GqPo!<jY#zjrz<);48jx
zW*fSuDavvL;-#_iXU~E6>cSZ^A(b-S3e=k6n)X>l7c;buJdiW4TJFtS@WP;S0XgZL
zRZr~^B;3JzAm@^5`N8^|J9S$Eo}Uy8Bag4E`!ifO*#yn~@NB|Sx?P45|HI~V?QC?g
z4jFo_Dw>(fI(BuPb+<t}kD%Q?TbsauPH46p%_UTBqJ{`$Ol%!0P#!8!-md?`(SnX~
zOGyD$>*GvzfZv!*mM-wnSs#~9Fzw<?ZsbLzi7@xBa+UoMSZ5KwWQ?l1Xy$jSil)H!
zTX_LH^`={H_Wq4D;LF9yWE1(ABvVtAFTtyzp7tf$gdyExedpbHA>ephKn{u!ofyos
z#4hRx06epEi_y1?Qq$3HdB0QwjO&@~ShGCE8=pRb&BawoU$ZzWCoUoOIx7L1t28)d
z`yS1UG#((0hLy3j40^L2$5CnL#>$kX73~K-M7th}=wN8AyWKeS(#q%ETnn=#%<90t
ze7vB1Kb>x9o>VALdA9*Ak}r2xz8Rw57nC4M3H<_h<7Ki1Fz`+PZbuO%l5Br0a(oSA
zg;^8KgM`6aeM%%kx-bcr>ZGgP7Qr&44d-K|2JBpyh%9M!COO<|4q{>(ULo9=0@1|`
z{mdIm##t*?42H{S5)ek>iXW($sYURj-j(3}Ao(XED3+A5XEmxS;3@V8-Lioga8`Zm
zKGNssuY$f>>S4+Fubmb-0Ub}(`9&iCk5&1fTk<F#81#!`7;WiTVkcFr16S@Ny3-R&
zh>n{v_16n9O~0IyKJrn1yh6BoSU@*>AiDNP`V(J;9{Ld+x^0JNiTBTS>lAaos86NG
z4t<SG-@F=nz=eWhe<ckp`LHTl4~+dwwr7JT;T20(8z|e}kB8CD5ACm0uwdHX@U<OV
zqjv4{R_@(@=7uP!;H}5RyH4ONZ%14k4$7PDY~?-|_X{>j6a1y0egJwb*di9UsPQkh
zVUV*XtU<4yq=oM3s=AeRG6WkrM2iyo(WeWwm?<>=Qy<n3zq5r{|0)^my+XXaW*8>7
zPz!0(bK?q3h@tu4v->WnEttwXV40o7A14u+VB^TJY0coQo|V0F9X(&cElEqk8XNmG
iXXL~5fUGV&%!C*_ol6Q};|lnZLeiKIqOXgS)&B#53)X=E

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png
new file mode 100644
index 0000000000000000000000000000000000000000..87ead80a08146adfa553d242f315f764a467506e
GIT binary patch
literal 3749
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
DZJ4!X

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..778c231f20ca9253e64ccffb64a0aa39a3b97a76
GIT binary patch
literal 14570
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce79780fda8e5de5e89a958e4b7000ab6c6de7ed
GIT binary patch
literal 4791
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
PK2D*pzfZY$bjE)HM$sIi

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle.png
similarity index 100%
rename from osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png
rename to osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle.png
diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..6dca33317131cd69ef449c0a6c0122f0f39cd84c
GIT binary patch
literal 66280
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d8b60da9e79009e8b3e78b2003d883974b139a5
GIT binary patch
literal 12374
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
Qd;A||`ImC#G8P~IA7%MrKL7v#

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..2626c394dcdccdb7d74da5460ec3f6d6570ad9a5
GIT binary patch
literal 66281
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

literal 0
HcmV?d00001


From 6674c702800ad0d876808e06ade20e43f2b694e8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Sep 2023 01:20:01 +0300
Subject: [PATCH 1246/2100] Add support for limiting skin texture/animation
 dimensions

---
 osu.Game/Skinning/IAnimationTimeReference.cs  |  3 +-
 osu.Game/Skinning/LegacySkinExtensions.cs     | 35 ++++++++++++++-----
 .../Drawables/DrawableStoryboardAnimation.cs  |  2 +-
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Skinning/IAnimationTimeReference.cs b/osu.Game/Skinning/IAnimationTimeReference.cs
index b6a944ddf8..91f1171a72 100644
--- a/osu.Game/Skinning/IAnimationTimeReference.cs
+++ b/osu.Game/Skinning/IAnimationTimeReference.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Timing;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -13,7 +14,7 @@ namespace osu.Game.Skinning
     /// </summary>
     /// <remarks>
     /// This should not be used to start an animation immediately at the current time.
-    /// To do so, use <see cref="LegacySkinExtensions.GetAnimation(ISkin, string, WrapMode, WrapMode, bool, bool, bool, string, bool, double?)"/> with <code>startAtCurrentTime = true</code> instead.
+    /// To do so, use <see cref="LegacySkinExtensions.GetAnimation(ISkin, string, WrapMode, WrapMode, bool, bool, bool, string, bool, double?, Vector2?)"/> with <code>startAtCurrentTime = true</code> instead.
     /// </remarks>
     [Cached]
     public interface IAnimationTimeReference
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 0d2461567f..ad3b10edd3 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osuTK;
 using static osu.Game.Skinning.SkinConfiguration;
 
 namespace osu.Game.Skinning
@@ -18,16 +19,16 @@ namespace osu.Game.Skinning
     public static partial class LegacySkinExtensions
     {
         public static Drawable? GetAnimation(this ISkin? source, string componentName, bool animatable, bool looping, bool applyConfigFrameRate = false, string animationSeparator = "-",
-                                             bool startAtCurrentTime = true, double? frameLength = null)
-            => source.GetAnimation(componentName, default, default, animatable, looping, applyConfigFrameRate, animationSeparator, startAtCurrentTime, frameLength);
+                                             bool startAtCurrentTime = true, double? frameLength = null, Vector2? maxSize = null)
+            => source.GetAnimation(componentName, default, default, animatable, looping, applyConfigFrameRate, animationSeparator, startAtCurrentTime, frameLength, maxSize);
 
         public static Drawable? GetAnimation(this ISkin? source, string componentName, WrapMode wrapModeS, WrapMode wrapModeT, bool animatable, bool looping, bool applyConfigFrameRate = false,
-                                             string animationSeparator = "-", bool startAtCurrentTime = true, double? frameLength = null)
+                                             string animationSeparator = "-", bool startAtCurrentTime = true, double? frameLength = null, Vector2? maxSize = null)
         {
             if (source == null)
                 return null;
 
-            var textures = GetTextures(source, componentName, wrapModeS, wrapModeT, animatable, animationSeparator, out var retrievalSource);
+            var textures = GetTextures(source, componentName, wrapModeS, wrapModeT, animatable, animationSeparator, maxSize, out var retrievalSource);
 
             switch (textures.Length)
             {
@@ -53,7 +54,7 @@ namespace osu.Game.Skinning
             }
         }
 
-        public static Texture[] GetTextures(this ISkin? source, string componentName, WrapMode wrapModeS, WrapMode wrapModeT, bool animatable, string animationSeparator, out ISkin? retrievalSource)
+        public static Texture[] GetTextures(this ISkin? source, string componentName, WrapMode wrapModeS, WrapMode wrapModeT, bool animatable, string animationSeparator, Vector2? maxSize, out ISkin? retrievalSource)
         {
             retrievalSource = null;
 
@@ -78,7 +79,9 @@ namespace osu.Game.Skinning
             }
 
             // if an animation was not allowed or not found, fall back to a sprite retrieval.
-            var singleTexture = retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
+            var singleTexture = maxSize != null
+                ? retrievalSource.GetTextureWithMaxSize(componentName, maxSize.Value, wrapModeS, wrapModeT)
+                : retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
 
             return singleTexture != null
                 ? new[] { singleTexture }
@@ -88,9 +91,11 @@ namespace osu.Game.Skinning
             {
                 for (int i = 0; true; i++)
                 {
-                    Texture? texture;
+                    var texture = maxSize != null
+                        ? skin.GetTextureWithMaxSize(getFrameName(i), maxSize.Value, wrapModeS, wrapModeT)
+                        : skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT);
 
-                    if ((texture = skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT)) == null)
+                    if (texture == null)
                         break;
 
                     yield return texture;
@@ -100,6 +105,20 @@ namespace osu.Game.Skinning
             string getFrameName(int frameIndex) => $"{componentName}{animationSeparator}{frameIndex}";
         }
 
+        public static Texture? GetTextureWithMaxSize(this ISkin source, string componentName, Vector2 maxSize, WrapMode wrapModeS = WrapMode.None, WrapMode wrapModeT = WrapMode.None)
+        {
+            var texture = source.GetTexture(componentName, wrapModeS, wrapModeT);
+            if (texture == null)
+                return texture;
+
+            if (texture.DisplayWidth <= maxSize.X && texture.DisplayHeight <= maxSize.Y)
+                return texture;
+
+            // use scale adjust property for downscaling the texture in order to meet the specified maximum dimensions.
+            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.X, texture.DisplayHeight / maxSize.Y);
+            return texture;
+        }
+
         public static bool HasFont(this ISkin source, LegacyFont font)
         {
             return source.GetTexture($"{source.GetFontPrefix(font)}-0") != null;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 82c01ea6a1..309ca63896 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Storyboards.Drawables
 
             // When reading from a skin, we match stables weird behaviour where `FrameCount` is ignored
             // and resources are retrieved until the end of the animation.
-            foreach (var texture in skin.GetTextures(Path.GetFileNameWithoutExtension(Animation.Path)!, default, default, true, string.Empty, out _))
+            foreach (var texture in skin.GetTextures(Path.GetFileNameWithoutExtension(Animation.Path)!, default, default, true, string.Empty, null, out _))
                 AddFrame(texture, Animation.FrameDelay);
         }
 

From 351081eb278ff0f48fff992ba9f0e0de2cf98814 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Sep 2023 01:20:40 +0300
Subject: [PATCH 1247/2100] Add limit to osu! hit circle elements

---
 .../Skinning/Legacy/LegacyMainCirclePiece.cs              | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index cadac4d319..45a18152c2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public partial class LegacyMainCirclePiece : CompositeDrawable
     {
+        private static readonly Vector2 circle_piece_size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+
         public override bool RemoveCompletedTransforms => false;
 
         /// <summary>
@@ -51,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             this.priorityLookupPrefix = priorityLookupPrefix;
             this.hasNumber = hasNumber;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = circle_piece_size;
         }
 
         [BackgroundDependencyLoader]
@@ -68,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTextureWithMaxSize(circleName, circle_piece_size) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -77,7 +79,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d))
+                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: circle_piece_size))
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,

From d286816ba8b1beefe81457dd2533ecc9c937b449 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Sep 2023 01:21:02 +0300
Subject: [PATCH 1248/2100] Add limit to taiko hit elements

---
 .../Skinning/Legacy/LegacyCirclePiece.cs                  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 5516e025cd..c94016d2b1 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public partial class LegacyCirclePiece : CompositeDrawable, IHasAccentColour
     {
+        private static readonly Vector2 circle_piece_size = new Vector2(128);
+
         private Drawable backgroundLayer = null!;
         private Drawable? foregroundLayer;
 
@@ -52,9 +54,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
                 string prefix = ((drawableHitObject.HitObject as TaikoStrongableHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
-                return skin.GetAnimation($"{prefix}{lookup}", true, false) ??
+                return skin.GetAnimation($"{prefix}{lookup}", true, false, maxSize: circle_piece_size) ??
                        // fallback to regular size if "big" version doesn't exist.
-                       skin.GetAnimation($"{normal_hit}{lookup}", true, false);
+                       skin.GetAnimation($"{normal_hit}{lookup}", true, false, maxSize: circle_piece_size);
             }
 
             // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer.
@@ -96,7 +98,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             // Not all skins (including the default osu-stable) have similar sizes for "hitcircle" and "hitcircleoverlay".
             // This ensures they are scaled relative to each other but also match the expected DrawableHit size.
             foreach (var c in InternalChildren)
-                c.Scale = new Vector2(DrawHeight / 128);
+                c.Scale = new Vector2(DrawHeight / circle_piece_size.Y);
 
             if (foregroundLayer is IFramedAnimation animatableForegroundLayer)
                 animateForegroundLayer(animatableForegroundLayer);

From f182f571cbaa019ed3ad3272ff208dea98ac51a0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Sep 2023 02:22:41 +0300
Subject: [PATCH 1249/2100] Add limit to catch palpable object elements

---
 .../Skinning/Legacy/LegacyBananaPiece.cs             |  8 ++++++--
 .../Skinning/Legacy/LegacyDropletPiece.cs            |  7 +++++--
 .../Skinning/Legacy/LegacyFruitPiece.cs              | 12 ++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
index 26832b7271..9f99e3a586 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
@@ -2,17 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public partial class LegacyBananaPiece : LegacyCatchHitObjectPiece
     {
+        private static readonly Vector2 banana_max_size = new Vector2(128);
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTexture("fruit-bananas");
-            Texture? overlayTexture = Skin.GetTexture("fruit-bananas-overlay");
+            Texture? texture = Skin.GetTextureWithMaxSize("fruit-bananas", banana_max_size);
+            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-bananas-overlay", banana_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index 7ffd682698..63be1bcf91 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -2,12 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public partial class LegacyDropletPiece : LegacyCatchHitObjectPiece
     {
+        private static readonly Vector2 droplet_max_size = new Vector2(100);
+
         public LegacyDropletPiece()
         {
             Scale = new Vector2(0.8f);
@@ -17,8 +20,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTexture("fruit-drop");
-            Texture? overlayTexture = Skin.GetTexture("fruit-drop-overlay");
+            Texture? texture = Skin.GetTextureWithMaxSize("fruit-drop", droplet_max_size);
+            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-drop-overlay", droplet_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index 85b60561dd..e4d25e036b 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -2,11 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     internal partial class LegacyFruitPiece : LegacyCatchHitObjectPiece
     {
+        private static readonly Vector2 fruit_max_size = new Vector2(128);
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -22,19 +26,19 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             switch (visualRepresentation)
             {
                 case FruitVisualRepresentation.Pear:
-                    SetTexture(Skin.GetTexture("fruit-pear"), Skin.GetTexture("fruit-pear-overlay"));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-pear", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-pear-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    SetTexture(Skin.GetTexture("fruit-grapes"), Skin.GetTexture("fruit-grapes-overlay"));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-grapes", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-grapes-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    SetTexture(Skin.GetTexture("fruit-apple"), Skin.GetTexture("fruit-apple-overlay"));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-apple", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-apple-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    SetTexture(Skin.GetTexture("fruit-orange"), Skin.GetTexture("fruit-orange-overlay"));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-orange", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-orange-overlay", fruit_max_size));
                     break;
             }
         }

From d674856e29d230fb6efd6b5a9c0873f6db628050 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Sat, 2 Sep 2023 22:49:29 -0400
Subject: [PATCH 1250/2100] Use existing localisations in `BeatmapInfoWedge`

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 81759f6787..8bbf569566 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -30,6 +30,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Graphics.Containers;
+using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Screens.Select
 {
@@ -371,7 +372,7 @@ namespace osu.Game.Screens.Select
                     {
                         new InfoLabel(new BeatmapStatistic
                         {
-                            Name = $"Length (Drain: {playableBeatmap.CalculateDrainLength().ToFormattedDuration().ToString()})",
+                            Name = BeatmapsetsStrings.ShowStatsTotalLength(playableBeatmap.CalculateDrainLength().ToFormattedDuration()),
                             CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
                             Content = working.BeatmapInfo.Length.ToFormattedDuration().ToString(),
                         }),
@@ -415,7 +416,7 @@ namespace osu.Game.Screens.Select
 
                 bpmLabelContainer.Child = new InfoLabel(new BeatmapStatistic
                 {
-                    Name = "BPM",
+                    Name = BeatmapsetsStrings.ShowStatsBpm,
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Bpm),
                     Content = labelText
                 });

From 40dbf098d2d31730ddecf38032da48a8d2461910 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Sat, 2 Sep 2023 22:51:08 -0400
Subject: [PATCH 1251/2100] Use existing localisation for "view profile"

---
 osu.Game/Graphics/Containers/LinkFlowContainer.cs | 3 ++-
 osu.Game/Users/Drawables/ClickableAvatar.cs       | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 2d27ce906b..40e883f8ac 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -15,6 +15,7 @@ using osu.Framework.Localisation;
 using osu.Framework.Platform;
 using osu.Game.Online;
 using osu.Game.Users;
+using osu.Game.Localisation;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -74,7 +75,7 @@ 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");
+            => createLink(CreateChunkFor(user.Username, true, CreateSpriteText, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user), ContextMenuStrings.ViewProfile);
 
         private void createLink(ITextPart textPart, LinkDetails link, LocalisableString tooltipText, Action action = null)
         {
diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index e74ffc9d54..677a8fff36 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -6,14 +6,13 @@ using osu.Framework.Allocation;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
+using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Users.Drawables
 {
     public partial class ClickableAvatar : OsuClickableContainer
     {
-        private const string default_tooltip_text = "view profile";
-
         public override LocalisableString TooltipText
         {
             get
@@ -21,7 +20,7 @@ namespace osu.Game.Users.Drawables
                 if (!Enabled.Value)
                     return string.Empty;
 
-                return ShowUsernameTooltip ? (user?.Username ?? string.Empty) : default_tooltip_text;
+                return ShowUsernameTooltip ? (user?.Username ?? string.Empty) : ContextMenuStrings.ViewProfile;
             }
             set => throw new NotSupportedException();
         }

From ae9c901b94201de270a3c2fd6ccdbed59107da05 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Sun, 3 Sep 2023 01:45:22 -0400
Subject: [PATCH 1252/2100] Fix `BeatmapInfoWedge` tests failing due to BPM

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index a470ed47d4..7cd4f06bce 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -15,6 +15,7 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
@@ -188,7 +189,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             AddUntilStep($"displayed bpm is {target}", () =>
             {
-                var label = infoWedge.DisplayedContent.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Single(l => l.Statistic.Name == "BPM");
+                var label = infoWedge.DisplayedContent.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Single(l => l.Statistic.Name == BeatmapsetsStrings.ShowStatsBpm);
                 return label.Statistic.Content == target;
             });
         }

From 079792644886a6c57fb03eee397d9594419e5847 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 3 Sep 2023 12:19:03 +0300
Subject: [PATCH 1253/2100] Update VerticalAttributeDisplay.cs

---
 osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index 2ad420657c..95d979ebd2 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -12,7 +12,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 
-
 namespace osu.Game.Overlays.Mods
 {
     public partial class VerticalAttributeDisplay : Container, IHasCurrentValue<double>

From 8281ed5173af43556f8b2e5ba937a2e66eff7f3a Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 3 Sep 2023 14:51:53 +0300
Subject: [PATCH 1254/2100] Fixed "no animations" issue

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

diff --git a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
index 378e6f6057..281fe8abe5 100644
--- a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
+++ b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Overlays.Mods
             const float corner_radius = 7;
             const float border_thickness = 2;
 
+            AutoSizeAxes = Axes.Both;
             InternalChild = content = new InputBlockingContainer
             {
                 Origin = Anchor.BottomRight,

From b17a55d6a84aba14c6387a03d64053f5b82d4751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=E1=BB=93=20Nguy=C3=AAn=20Minh?= <honguyenminh@outlook.com>
Date: Mon, 4 Sep 2023 10:43:05 +0700
Subject: [PATCH 1255/2100] Add length check for slider velocity

---
 .../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 173a665d5c..366518eb58 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -177,6 +177,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             AddHeader("Final velocity");
             AddValue($"{beatmapVelocity * current.Value:#,0.00}x");
 
+            if (sliderVelocities.Length == 0) return;
             if (sliderVelocities.First() != sliderVelocities.Last())
             {
                 AddHeader("Beatmap velocity range");

From d5a89c4c45eddff8eb2d88cb7739c08e3260fecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=E1=BB=93=20Nguy=C3=AAn=20Minh?= <honguyenminh@outlook.com>
Date: Mon, 4 Sep 2023 13:32:42 +0700
Subject: [PATCH 1256/2100] Fix formatting

---
 .../Compose/Components/Timeline/DifficultyPointPiece.cs     | 6 +++++-
 1 file changed, 5 insertions(+), 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 366518eb58..99fb2ab874 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -177,7 +177,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             AddHeader("Final velocity");
             AddValue($"{beatmapVelocity * current.Value:#,0.00}x");
 
-            if (sliderVelocities.Length == 0) return;
+            if (sliderVelocities.Length == 0)
+            {
+                return;
+            }
+
             if (sliderVelocities.First() != sliderVelocities.Last())
             {
                 AddHeader("Beatmap velocity range");

From 0a1ba2ebe08877717f4617cb4d3070ea33d3b3b9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Sep 2023 15:56:32 +0900
Subject: [PATCH 1257/2100] Remove ModNoMod usage

---
 .../Mods/TestSceneManiaModDoubleTime.cs                         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index 08e83b04b5..00b79529a9 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -7,7 +7,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Replays;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Tests.Visual;
@@ -23,7 +22,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         [Test]
         public void TestHitWindowWithoutDoubleTime() => CreateModTest(new ModTestData
         {
-            Mod = new ModNoMod(),
             PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value != 1,
             Autoplay = false,
             Beatmap = new Beatmap

From 58844092d6984f96e5b7f1fd263d675979c8b879 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 4 Sep 2023 16:17:21 +0900
Subject: [PATCH 1258/2100] post a notification instead a screen

---
 .../Online/TestSceneReplayMissingBeatmap.cs   |  14 +-
 .../Database/MissingBeatmapNotification.cs    | 157 ++++++++++++++
 osu.Game/OsuGame.cs                           |   2 -
 osu.Game/Scoring/ScoreImporter.cs             |  10 +-
 osu.Game/Scoring/ScoreManager.cs              |   7 -
 .../Import/ReplayMissingBeatmapScreen.cs      | 199 ------------------
 6 files changed, 169 insertions(+), 220 deletions(-)
 create mode 100644 osu.Game/Database/MissingBeatmapNotification.cs
 delete mode 100644 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
index eb84d80051..60197e0eb7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.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 System.Linq;
 using System.Net;
 using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Screens.Import;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Visual.Online
@@ -24,6 +26,12 @@ namespace osu.Game.Tests.Visual.Online
                 OnlineBeatmapSetID = 173612,
                 BeatmapSet = new APIBeatmapSet
                 {
+                    Title = "FREEDOM Dive",
+                    Artist = "xi",
+                    Covers = new BeatmapSetOnlineCovers
+                    {
+                        Card = "https://assets.ppy.sh/beatmaps/173612/covers/card@2x.jpg"
+                    },
                     OnlineID = 173612
                 }
             };
@@ -40,7 +48,7 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            AddUntilStep("Replay missing screen show", () => Game.ScreenStack.CurrentScreen.GetType() == typeof(ReplayMissingBeatmapScreen));
+            AddUntilStep("Replay missing notification show", () => Game.Notifications.ChildrenOfType<MissingBeatmapNotification>().Any());
         }
 
         [Test]
@@ -58,7 +66,7 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            AddUntilStep("Replay missing screen not show", () => Game.ScreenStack.CurrentScreen.GetType() != typeof(ReplayMissingBeatmapScreen));
+            AddUntilStep("Replay missing notification not show", () => !Game.Notifications.ChildrenOfType<MissingBeatmapNotification>().Any());
         }
 
         private void setupBeatmapResponse(APIBeatmap b)
diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
new file mode 100644
index 0000000000..2587160a57
--- /dev/null
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -0,0 +1,157 @@
+// Copyright (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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
+using osu.Game.Scoring;
+using osuTK.Graphics;
+
+namespace osu.Game.Database
+{
+    public partial class MissingBeatmapNotification : ProgressNotification
+    {
+        [Resolved]
+        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
+
+        [Resolved]
+        private ScoreManager scoreManager { get; set; } = null!;
+
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        [Resolved]
+        private BeatmapSetOverlay? beatmapSetOverlay { get; set; }
+
+        private Container beatmapPanelContainer = null!;
+
+        private readonly MemoryStream scoreStream;
+
+        private readonly APIBeatmapSet beatmapSetInfo;
+
+        private BeatmapDownloadTracker? downloadTracker;
+
+        private Bindable<bool> autodownloadConfig = null!;
+
+        public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream)
+        {
+            beatmapSetInfo = beatmap.BeatmapSet!;
+
+            this.scoreStream = scoreStream;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, OsuConfigManager config)
+        {
+            autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
+
+            Text = "You do not have the required beatmap for this replay";
+
+            Content.Add(beatmapPanelContainer = new ClickableContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = 70,
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.TopLeft,
+                Action = () => beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmapSetInfo.OnlineID)
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            downloadTracker = new BeatmapDownloadTracker(beatmapSetInfo);
+            downloadTracker.State.BindValueChanged(downloadStatusChanged, true);
+
+            beatmapPanelContainer.Clear();
+            beatmapPanelContainer.Child = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                CornerRadius = 4,
+                Children = new Drawable[]
+                {
+                    downloadTracker,
+                    new DelayedLoadWrapper(() => new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.Card)
+                    {
+                        OnlineInfo = beatmapSetInfo,
+                        RelativeSizeAxes = Axes.Both
+                    })
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                        Alpha = 0.4f
+                    },
+                    new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding
+                        {
+                            Left = 10f,
+                            Top = 5f
+                        },
+                        Children = new Drawable[]
+                        {
+                            new TruncatingSpriteText
+                            {
+                                Text = beatmapSetInfo.Title,
+                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                            },
+                            new TruncatingSpriteText
+                            {
+                                Text = beatmapSetInfo.Artist,
+                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 12, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                            }
+                        }
+                    },
+                    new DownloadButton
+                    {
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        Width = 50,
+                        Height = 30,
+                        Margin = new MarginPadding
+                        {
+                            Bottom = 1f
+                        },
+                        Action = () => beatmapDownloader.Download(beatmapSetInfo),
+                        State = { BindTarget = downloadTracker.State }
+                    }
+                }
+            };
+
+            if (autodownloadConfig.Value)
+                beatmapDownloader.Download(beatmapSetInfo);
+        }
+
+        private void downloadStatusChanged(ValueChangedEvent<DownloadState> status)
+        {
+            if (status.NewValue != DownloadState.LocallyAvailable)
+                return;
+
+            var importTask = new ImportTask(scoreStream, "score.osr");
+            scoreManager.Import(this, new[] { importTask });
+        }
+    }
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5d130af6d4..c60bff9e4c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -854,8 +854,6 @@ namespace osu.Game
 
             MultiplayerClient.PostNotification = n => Notifications.Post(n);
 
-            ScoreManager.Performer = this;
-
             // make config aware of how to lookup skins for on-screen display purposes.
             // if this becomes a more common thing, tracked settings should be reconsidered to allow local DI.
             LocalConfig.LookupSkinName = id => SkinManager.Query(s => s.ID == id)?.ToString() ?? "Unknown";
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 5c354ac3d1..e3fce4a82a 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -10,7 +10,6 @@ using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.IO.Archives;
@@ -21,8 +20,6 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens;
-using osu.Game.Screens.Import;
 using Realms;
 
 namespace osu.Game.Scoring
@@ -31,8 +28,6 @@ namespace osu.Game.Scoring
     {
         public override IEnumerable<string> HandledExtensions => new[] { ".osr" };
 
-        public IPerformFromScreenRunner? Performer { get; set; }
-
         protected override string[] HashableFileTypes => new[] { ".osr" };
 
         private readonly RulesetStore rulesets;
@@ -69,9 +64,6 @@ namespace osu.Game.Scoring
 
         private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e, ArchiveReader archive, string name)
         {
-            if (Performer == null)
-                return;
-
             var stream = new MemoryStream();
 
             // stream will close after exception throw, so fetch the stream again.
@@ -87,7 +79,7 @@ namespace osu.Game.Scoring
 
             req.Success += res =>
             {
-                Performer.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, stream)));
+                PostNotification?.Invoke(new MissingBeatmapNotification(res, stream));
             };
 
             api.Queue(req);
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 9331168ab0..31b5bd8365 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -21,7 +21,6 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Online.API;
 using osu.Game.Scoring.Legacy;
-using osu.Game.Screens;
 
 namespace osu.Game.Scoring
 {
@@ -31,12 +30,6 @@ namespace osu.Game.Scoring
         private readonly ScoreImporter scoreImporter;
         private readonly LegacyScoreExporter scoreExporter;
 
-        [CanBeNull]
-        public IPerformFromScreenRunner Performer
-        {
-            set => scoreImporter.Performer = value;
-        }
-
         public override bool PauseImports
         {
             get => base.PauseImports;
diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
deleted file mode 100644
index 614d652f47..0000000000
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ /dev/null
@@ -1,199 +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;
-using System.IO;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Audio;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables.Cards;
-using osu.Game.Configuration;
-using osu.Game.Database;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Settings;
-using osu.Game.Scoring;
-using osu.Game.Screens.Ranking;
-using osuTK;
-using Realms;
-
-namespace osu.Game.Screens.Import
-{
-    [Cached(typeof(IPreviewTrackOwner))]
-    public partial class ReplayMissingBeatmapScreen : OsuScreen, IPreviewTrackOwner
-    {
-        [Resolved]
-        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
-
-        [Resolved]
-        private ScoreManager scoreManager { get; set; } = null!;
-
-        [Resolved]
-        private RealmAccess realm { get; set; } = null!;
-
-        private IDisposable? realmSubscription;
-
-        [Cached]
-        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        [Resolved]
-        private INotificationOverlay? notificationOverlay { get; set; }
-
-        private Container beatmapPanelContainer = null!;
-        private ReplayDownloadButton replayDownloadButton = null!;
-        private SettingsCheckbox automaticDownload = null!;
-
-        private readonly MemoryStream scoreStream;
-
-        private readonly APIBeatmapSet beatmapSetInfo;
-
-        public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream scoreStream)
-        {
-            beatmapSetInfo = beatmap.BeatmapSet!;
-
-            this.scoreStream = scoreStream;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OsuConfigManager config)
-        {
-            InternalChildren = new Drawable[]
-            {
-                new Container
-                {
-                    Masking = true,
-                    CornerRadius = 20,
-                    AutoSizeAxes = Axes.Both,
-                    AutoSizeDuration = 500,
-                    AutoSizeEasing = Easing.OutQuint,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = colours.Gray5,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new FillFlowContainer
-                        {
-                            Margin = new MarginPadding(20),
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Vertical,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Spacing = new Vector2(15),
-                            Children = new Drawable[]
-                            {
-                                new OsuSpriteText
-                                {
-                                    Text = "Beatmap info",
-                                    Font = OsuFont.Default.With(size: 30),
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                },
-                                new FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Direction = FillDirection.Horizontal,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Spacing = new Vector2(15),
-                                    Children = new Drawable[]
-                                    {
-                                        beatmapPanelContainer = new Container
-                                        {
-                                            AutoSizeAxes = Axes.Both,
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                        },
-                                    }
-                                },
-                                automaticDownload = new SettingsCheckbox
-                                {
-                                    LabelText = "Automatically download beatmaps",
-                                    Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                },
-                                replayDownloadButton = new ReplayDownloadButton(new ScoreInfo())
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                },
-                            }
-                        }
-                    }
-                },
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            updateStatus();
-            realmSubscription = realm.RegisterForNotifications(
-                realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
-        }
-
-        private void updateStatus()
-        {
-            beatmapPanelContainer.Clear();
-            beatmapPanelContainer.Child = new BeatmapCardNormal(beatmapSetInfo, allowExpansion: false);
-            checkForAutomaticDownload(beatmapSetInfo);
-        }
-
-        private void checkForAutomaticDownload(APIBeatmapSet beatmap)
-        {
-            if (!automaticDownload.Current.Value)
-                return;
-
-            beatmapDownloader.Download(beatmap);
-        }
-
-        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
-        {
-            if (changes?.InsertedIndices == null) return;
-
-            if (!scoreStream.CanRead) return;
-
-            if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))
-            {
-                var progressNotification = new ImportProgressNotification();
-                var importTask = new ImportTask(scoreStream, "score.osr");
-                scoreManager.Import(progressNotification, new[] { importTask })
-                            .ContinueWith(s =>
-                            {
-                                s.GetResultSafely<IEnumerable<Live<ScoreInfo>>>().FirstOrDefault()?.PerformRead(score =>
-                                {
-                                    Guid scoreid = score.ID;
-                                    Scheduler.Add(() =>
-                                    {
-                                        replayDownloadButton.Score.Value = realm.Realm.Find<ScoreInfo>(scoreid) ?? new ScoreInfo();
-                                    });
-                                });
-                            });
-
-                notificationOverlay?.Post(progressNotification);
-
-                realmSubscription?.Dispose();
-            }
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            realmSubscription?.Dispose();
-        }
-    }
-}

From 5abf271b56e24adeecffbcb60ca3edd8c62e667c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 3 Sep 2023 21:49:29 -0700
Subject: [PATCH 1259/2100] Implement beatmap options popover

---
 .../SongSelect/TestSceneSongSelectFooterV2.cs |   7 +-
 .../Select/FooterV2/BeatmapOptionsPopover.cs  | 148 ++++++++++++++++++
 .../Select/FooterV2/FooterButtonOptionsV2.cs  |  37 ++++-
 osu.Game/Screens/Select/FooterV2/FooterV2.cs  |  10 +-
 osu.Game/Screens/Select/SongSelect.cs         |  18 +--
 5 files changed, 205 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
index 72adbfc104..ed2ae67ae5 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Testing;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -37,10 +38,10 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             Children = new Drawable[]
             {
-                footer = new FooterV2
+                new PopoverContainer
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
+                    RelativeSizeAxes = Axes.Both,
+                    Child = footer = new FooterV2(),
                 },
                 overlay = new DummyOverlay()
             };
diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
new file mode 100644
index 0000000000..ec35c6ff38
--- /dev/null
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -0,0 +1,148 @@
+// Copyright (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.Sprites;
+using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
+using osu.Game.Collections;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Overlays;
+using osuTK;
+using osuTK.Graphics;
+using osuTK.Input;
+
+namespace osu.Game.Screens.Select.FooterV2
+{
+    public partial class BeatmapOptionsPopover : OsuPopover
+    {
+        private FillFlowContainer<OptionButton> buttonFlow = null!;
+        private readonly FooterButtonOptionsV2 footerButton;
+
+        public BeatmapOptionsPopover(FooterButtonOptionsV2 footerButton)
+        {
+            this.footerButton = footerButton;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours)
+        {
+            Content.Padding = new MarginPadding(5);
+
+            Child = buttonFlow = new FillFlowContainer<OptionButton>
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(3),
+            };
+
+            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
+            addButton(@"Delete all difficulties", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(), colours.Red);
+            addButton(@"Remove from unplayed", FontAwesome.Regular.TimesCircle, null);
+            addButton(@"Clear local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores());
+
+            if (songSelect != null && songSelect.AllowEditing)
+                addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit());
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(this));
+        }
+
+        private void addButton(LocalisableString text, IconUsage icon, Action? action, Color4? colour = null)
+        {
+            var button = new OptionButton
+            {
+                Text = text,
+                Icon = icon,
+                TextColour = colour,
+                Action = () =>
+                {
+                    Hide();
+                    action?.Invoke();
+                },
+            };
+
+            buttonFlow.Add(button);
+        }
+
+        private partial class OptionButton : OsuButton
+        {
+            public IconUsage Icon { get; init; }
+            public Color4? TextColour { get; init; }
+
+            public OptionButton()
+            {
+                Size = new Vector2(265, 50);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                BackgroundColour = colourProvider.Background3;
+
+                SpriteText.Colour = TextColour ?? Color4.White;
+                Content.CornerRadius = 10;
+
+                Add(new SpriteIcon
+                {
+                    Blending = BlendingParameters.Additive,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Size = new Vector2(17),
+                    X = 15,
+                    Icon = Icon,
+                    Colour = TextColour ?? Color4.White,
+                });
+            }
+
+            protected override SpriteText CreateText() => new OsuSpriteText
+            {
+                Depth = -1,
+                Origin = Anchor.CentreLeft,
+                Anchor = Anchor.CentreLeft,
+                X = 40
+            };
+        }
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            // don't absorb control as ToolbarRulesetSelector uses control + number to navigate
+            if (e.ControlPressed) return false;
+
+            if (!e.Repeat && e.Key >= Key.Number1 && e.Key <= Key.Number9)
+            {
+                int requested = e.Key - Key.Number1;
+
+                OptionButton? found = buttonFlow.Children.ElementAtOrDefault(requested);
+
+                if (found != null)
+                {
+                    found.TriggerClick();
+                    return true;
+                }
+            }
+
+            return base.OnKeyDown(e);
+        }
+
+        protected override void UpdateState(ValueChangedEvent<Visibility> state)
+        {
+            base.UpdateState(state);
+
+            if (state.NewValue == Visibility.Hidden)
+                footerButton.IsActive.Value = false;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs b/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs
index 87cca0042a..a1559d32dc 100644
--- a/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs
+++ b/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs
@@ -2,14 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select.FooterV2
 {
-    public partial class FooterButtonOptionsV2 : FooterButtonV2
+    public partial class FooterButtonOptionsV2 : FooterButtonV2, IHasPopover
     {
+        public readonly BindableBool IsActive = new BindableBool();
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colour)
         {
@@ -17,6 +24,34 @@ namespace osu.Game.Screens.Select.FooterV2
             Icon = FontAwesome.Solid.Cog;
             AccentColour = colour.Purple1;
             Hotkey = GlobalAction.ToggleBeatmapOptions;
+
+            Action = () => IsActive.Toggle();
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            IsActive.BindValueChanged(active =>
+            {
+                OverlayState.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
+            });
+
+            OverlayState.BindValueChanged(state =>
+            {
+                switch (state.NewValue)
+                {
+                    case Visibility.Hidden:
+                        this.HidePopover();
+                        break;
+
+                    case Visibility.Visible:
+                        this.ShowPopover();
+                        break;
+                }
+            });
+        }
+
+        public Popover GetPopover() => new BeatmapOptionsPopover(this);
     }
 }
diff --git a/osu.Game/Screens/Select/FooterV2/FooterV2.cs b/osu.Game/Screens/Select/FooterV2/FooterV2.cs
index cd95f3eb6c..0529f0d082 100644
--- a/osu.Game/Screens/Select/FooterV2/FooterV2.cs
+++ b/osu.Game/Screens/Select/FooterV2/FooterV2.cs
@@ -48,11 +48,17 @@ namespace osu.Game.Screens.Select.FooterV2
 
         private FillFlowContainer<FooterButtonV2> buttons = null!;
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        public FooterV2()
         {
             RelativeSizeAxes = Axes.X;
             Height = height;
+            Anchor = Anchor.BottomLeft;
+            Origin = Anchor.BottomLeft;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
             InternalChildren = new Drawable[]
             {
                 new Box
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 58755878d0..4ce7a6167e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -311,9 +311,9 @@ namespace osu.Game.Screens.Select
                     Footer.AddButton(button, overlay);
 
                 BeatmapOptions.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, () => manageCollectionsDialog?.Show());
-                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo));
+                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, DeleteBeatmap);
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
-                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo));
+                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, ClearScores);
             }
 
             sampleChangeDifficulty = audio.Samples.Get(@"SongSelect/select-difficulty");
@@ -916,18 +916,18 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        private void delete(BeatmapSetInfo? beatmap)
+        public void DeleteBeatmap()
         {
-            if (beatmap == null) return;
+            if (Beatmap.Value.BeatmapSetInfo == null) return;
 
-            dialogOverlay?.Push(new BeatmapDeleteDialog(beatmap));
+            dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap.Value.BeatmapSetInfo));
         }
 
-        private void clearScores(BeatmapInfo? beatmapInfo)
+        public void ClearScores()
         {
-            if (beatmapInfo == null) return;
+            if (Beatmap.Value.BeatmapInfo == null) return;
 
-            dialogOverlay?.Push(new BeatmapClearScoresDialog(beatmapInfo, () =>
+            dialogOverlay?.Push(new BeatmapClearScoresDialog(Beatmap.Value.BeatmapInfo, () =>
                 // schedule done here rather than inside the dialog as the dialog may fade out and never callback.
                 Schedule(() => BeatmapDetails.Refresh())));
         }
@@ -963,7 +963,7 @@ namespace osu.Game.Screens.Select
                     if (e.ShiftPressed)
                     {
                         if (!Beatmap.IsDefault)
-                            delete(Beatmap.Value.BeatmapSetInfo);
+                            DeleteBeatmap();
                         return true;
                     }
 

From 6c0bd13308589a8efcc2ba83738bc6ed0c2c6ca9 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 00:21:48 -0700
Subject: [PATCH 1260/2100] Add xmldoc to newly exposed methods

---
 osu.Game/Screens/Select/SongSelect.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4ce7a6167e..f6fc55b2a5 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -916,6 +916,9 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
+        /// <summary>
+        /// Request to delete the current beatmap.
+        /// </summary>
         public void DeleteBeatmap()
         {
             if (Beatmap.Value.BeatmapSetInfo == null) return;
@@ -923,6 +926,9 @@ namespace osu.Game.Screens.Select
             dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap.Value.BeatmapSetInfo));
         }
 
+        /// <summary>
+        /// Request to clear the scores of the current beatmap.
+        /// </summary>
         public void ClearScores()
         {
             if (Beatmap.Value.BeatmapInfo == null) return;

From 3decadaf519c26a6c4b941d065d41ce441589821 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 4 Sep 2023 16:18:14 +0900
Subject: [PATCH 1261/2100] use realm query

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

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index d71d7b7f67..1f551f1218 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -26,6 +26,7 @@ using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osu.Game.Utils;
+using Realms;
 
 namespace osu.Game.Beatmaps
 {
@@ -284,7 +285,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>The first result for the provided query, or null if no results were found.</returns>
-        public BeatmapInfo? QueryBeatmap(Expression<Func<BeatmapInfo, bool>> query) => Realm.Run(r => r.All<BeatmapInfo>().FirstOrDefault(query)?.Detach());
+        public BeatmapInfo? QueryBeatmap(Expression<Func<BeatmapInfo, bool>> query) => Realm.Run(r => r.All<BeatmapInfo>().Filter($"{nameof(BeatmapInfo.BeatmapSet)}.{nameof(BeatmapSetInfo.DeletePending)} == false").FirstOrDefault(query)?.Detach());
 
         /// <summary>
         /// A default representation of a WorkingBeatmap to use when no beatmap is available.
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index c06f4da4ae..78eed626f2 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Beatmaps
 
         public virtual WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo)
         {
-            if (beatmapInfo?.BeatmapSet == null || beatmapInfo.BeatmapSet?.DeletePending == true)
+            if (beatmapInfo?.BeatmapSet == null)
                 return DefaultBeatmap;
 
             lock (workingCache)

From 164f61f59034f2d713cdb4676f7327a4f41b512f Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 4 Sep 2023 17:14:04 +0900
Subject: [PATCH 1262/2100] clean up

---
 .../Database/MissingBeatmapNotification.cs    | 53 +++++++------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 2587160a57..7a39c6307b 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Configuration;
@@ -30,21 +31,12 @@ namespace osu.Game.Database
         [Resolved]
         private ScoreManager scoreManager { get; set; } = null!;
 
-        [Cached]
-        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        [Resolved]
-        private BeatmapSetOverlay? beatmapSetOverlay { get; set; }
-
-        private Container beatmapPanelContainer = null!;
-
         private readonly MemoryStream scoreStream;
 
         private readonly APIBeatmapSet beatmapSetInfo;
 
-        private BeatmapDownloadTracker? downloadTracker;
-
         private Bindable<bool> autodownloadConfig = null!;
+        private Bindable<bool> noVideoSetting = null!;
 
         public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream)
         {
@@ -54,35 +46,25 @@ namespace osu.Game.Database
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OsuConfigManager config)
+        private void load(OsuConfigManager config, BeatmapSetOverlay? beatmapSetOverlay)
         {
+            BeatmapDownloadTracker downloadTracker = new BeatmapDownloadTracker(beatmapSetInfo);
+            downloadTracker.State.BindValueChanged(downloadStatusChanged);
+
             autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
+            noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
             Text = "You do not have the required beatmap for this replay";
 
-            Content.Add(beatmapPanelContainer = new ClickableContainer
+            Content.Add(new ClickableContainer
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 70,
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.TopLeft,
-                Action = () => beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmapSetInfo.OnlineID)
-            });
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            downloadTracker = new BeatmapDownloadTracker(beatmapSetInfo);
-            downloadTracker.State.BindValueChanged(downloadStatusChanged, true);
-
-            beatmapPanelContainer.Clear();
-            beatmapPanelContainer.Child = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Masking = true,
                 CornerRadius = 4,
+                Masking = true,
+                Action = () => beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmapSetInfo.OnlineID),
                 Children = new Drawable[]
                 {
                     downloadTracker,
@@ -125,7 +107,7 @@ namespace osu.Game.Database
                             }
                         }
                     },
-                    new DownloadButton
+                    new BeatmapDownloadButton(beatmapSetInfo)
                     {
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
@@ -134,15 +116,18 @@ namespace osu.Game.Database
                         Margin = new MarginPadding
                         {
                             Bottom = 1f
-                        },
-                        Action = () => beatmapDownloader.Download(beatmapSetInfo),
-                        State = { BindTarget = downloadTracker.State }
+                        }
                     }
                 }
-            };
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             if (autodownloadConfig.Value)
-                beatmapDownloader.Download(beatmapSetInfo);
+                beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
         }
 
         private void downloadStatusChanged(ValueChangedEvent<DownloadState> status)

From f68a12003a6df0dc32d9eefc391ec5228d1e9ddf Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 4 Sep 2023 17:37:31 +0900
Subject: [PATCH 1263/2100] check beatmap hash before try to import

---
 .../Database/MissingBeatmapNotification.cs    | 33 ++++++++++++++-----
 osu.Game/Scoring/ScoreImporter.cs             |  2 +-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 7a39c6307b..92b33e20be 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -2,18 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.IO;
+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.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
@@ -31,31 +30,43 @@ namespace osu.Game.Database
         [Resolved]
         private ScoreManager scoreManager { get; set; } = null!;
 
-        private readonly MemoryStream scoreStream;
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
 
+        private readonly MemoryStream scoreStream;
         private readonly APIBeatmapSet beatmapSetInfo;
+        private readonly string beatmapHash;
 
         private Bindable<bool> autodownloadConfig = null!;
         private Bindable<bool> noVideoSetting = null!;
 
-        public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream)
+        public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream, string beatmapHash)
         {
             beatmapSetInfo = beatmap.BeatmapSet!;
 
+            this.beatmapHash = beatmapHash;
             this.scoreStream = scoreStream;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, BeatmapSetOverlay? beatmapSetOverlay)
         {
+            Text = "You do not have the required beatmap for this replay";
+
+            realm.Run(r =>
+            {
+                if (r.All<BeatmapSetInfo>().Any(s => s.OnlineID == beatmapSetInfo.OnlineID))
+                {
+                    Text = "You have the corresponding beatmapset but no beatmap, you may need to update the beatmap.";
+                }
+            });
+
             BeatmapDownloadTracker downloadTracker = new BeatmapDownloadTracker(beatmapSetInfo);
             downloadTracker.State.BindValueChanged(downloadStatusChanged);
 
             autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
             noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
-            Text = "You do not have the required beatmap for this replay";
-
             Content.Add(new ClickableContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -135,8 +146,14 @@ namespace osu.Game.Database
             if (status.NewValue != DownloadState.LocallyAvailable)
                 return;
 
-            var importTask = new ImportTask(scoreStream, "score.osr");
-            scoreManager.Import(this, new[] { importTask });
+            realm.Run(r =>
+            {
+                if (r.All<BeatmapInfo>().Any(s => s.MD5Hash == beatmapHash))
+                {
+                    var importTask = new ImportTask(scoreStream, "score.osr");
+                    scoreManager.Import(this, new[] { importTask });
+                }
+            });
         }
     }
 }
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index e3fce4a82a..650e25a512 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Scoring
 
             req.Success += res =>
             {
-                PostNotification?.Invoke(new MissingBeatmapNotification(res, stream));
+                PostNotification?.Invoke(new MissingBeatmapNotification(res, stream, e.Hash));
             };
 
             api.Queue(req);

From 87aa191c121214c18e0a4270e7f20f856da40ab2 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 4 Sep 2023 17:53:12 +0900
Subject: [PATCH 1264/2100] use realm Subscription instead of Beatmap Download
 Tracker

---
 .../Database/MissingBeatmapNotification.cs    | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 92b33e20be..86522d0864 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.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 osu.Framework.Allocation;
@@ -13,12 +14,12 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 using osuTK.Graphics;
+using Realms;
 
 namespace osu.Game.Database
 {
@@ -40,6 +41,8 @@ namespace osu.Game.Database
         private Bindable<bool> autodownloadConfig = null!;
         private Bindable<bool> noVideoSetting = null!;
 
+        private IDisposable? realmSubscription;
+
         public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream, string beatmapHash)
         {
             beatmapSetInfo = beatmap.BeatmapSet!;
@@ -53,17 +56,17 @@ namespace osu.Game.Database
         {
             Text = "You do not have the required beatmap for this replay";
 
+            realmSubscription = realm.RegisterForNotifications(
+                realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
+
             realm.Run(r =>
             {
-                if (r.All<BeatmapSetInfo>().Any(s => s.OnlineID == beatmapSetInfo.OnlineID))
+                if (r.All<BeatmapSetInfo>().Any(s => !s.DeletePending && s.OnlineID == beatmapSetInfo.OnlineID))
                 {
-                    Text = "You have the corresponding beatmapset but no beatmap, you may need to update the beatmap.";
+                    Text = "You have the corresponding beatmapset but no beatmap, you may need to update the beatmapset.";
                 }
             });
 
-            BeatmapDownloadTracker downloadTracker = new BeatmapDownloadTracker(beatmapSetInfo);
-            downloadTracker.State.BindValueChanged(downloadStatusChanged);
-
             autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
             noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
@@ -78,7 +81,6 @@ namespace osu.Game.Database
                 Action = () => beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmapSetInfo.OnlineID),
                 Children = new Drawable[]
                 {
-                    downloadTracker,
                     new DelayedLoadWrapper(() => new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.Card)
                     {
                         OnlineInfo = beatmapSetInfo,
@@ -141,19 +143,16 @@ namespace osu.Game.Database
                 beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
         }
 
-        private void downloadStatusChanged(ValueChangedEvent<DownloadState> status)
+        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
         {
-            if (status.NewValue != DownloadState.LocallyAvailable)
-                return;
+            if (changes?.InsertedIndices == null) return;
 
-            realm.Run(r =>
+            if (sender.Any(s => s.Beatmaps.Any(b => b.MD5Hash == beatmapHash)))
             {
-                if (r.All<BeatmapInfo>().Any(s => s.MD5Hash == beatmapHash))
-                {
-                    var importTask = new ImportTask(scoreStream, "score.osr");
-                    scoreManager.Import(this, new[] { importTask });
-                }
-            });
+                var importTask = new ImportTask(scoreStream, "score.osr");
+                scoreManager.Import(this, new[] { importTask });
+                realmSubscription?.Dispose();
+            }
         }
     }
 }

From fd1fce486a18c6b12859b3fa197c707bac583751 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 5 Sep 2023 00:21:08 +0900
Subject: [PATCH 1265/2100] ensure dispose realmSubscription

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

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 86522d0864..d6674b9434 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -154,5 +154,11 @@ namespace osu.Game.Database
                 realmSubscription?.Dispose();
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            realmSubscription?.Dispose();
+        }
     }
 }

From f616648730ac9fd438cc2d15aeb7eb065f875cae Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 09:40:35 -0700
Subject: [PATCH 1266/2100] Remove icon blending

---
 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index ec35c6ff38..4e1334fd11 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -97,7 +97,6 @@ namespace osu.Game.Screens.Select.FooterV2
 
                 Add(new SpriteIcon
                 {
-                    Blending = BlendingParameters.Additive,
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     Size = new Vector2(17),

From bf71099e5743efb966482d5b145a551b0208729f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 11:34:21 -0700
Subject: [PATCH 1267/2100] Fix truncating sprite text usage

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index b7b60cffab..7821aa5be0 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -280,15 +280,14 @@ namespace osu.Game.Screens.Select
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
                         {
-                            TitleLabel = new OsuSpriteText
+                            TitleLabel = new TruncatingSpriteText
                             {
                                 Shadow = true,
                                 Current = { BindTarget = titleBinding },
                                 Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true
                             },
-                            ArtistLabel = new OsuSpriteText
+                            ArtistLabel = new TruncatingSpriteText
                             {
                                 // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
                                 Shadow = true,
@@ -296,7 +295,6 @@ namespace osu.Game.Screens.Select
                                 // Not sure if this should be semi bold or medium
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true
                             }
                         }
                     }

From e8a793425bf28e19ba3667c8c712c4db96fc09fa Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 12:38:40 -0700
Subject: [PATCH 1268/2100] Use right padding instead of negative x offset

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 7821aa5be0..284f14cd9e 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -155,18 +155,21 @@ namespace osu.Game.Screens.Select
 
                 LoadComponentAsync(loadingInfo = new Container
                 {
-                    Masking = true,
-                    // We offset this by the portion of the colour bar underneath we wish to show
-                    X = -colour_bar_width,
-                    CornerRadius = corner_radius,
+                    Padding = new MarginPadding { Right = colour_bar_width },
                     RelativeSizeAxes = Axes.Both,
                     Depth = DisplayedContent?.Depth + 1 ?? 0,
-                    Children = new Drawable[]
+                    Child = new Container
                     {
-                        // TODO: New wedge design uses a coloured horizontal gradient for its background, however this lacks implementation information in the figma draft.
-                        // pending https://www.figma.com/file/DXKwqZhD5yyb1igc3mKo1P?node-id=2980:3361#340801912 being answered.
-                        new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
-                        Info = new WedgeInfoText(beatmap) { Shear = -Shear }
+                        Masking = true,
+                        CornerRadius = corner_radius,
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            // TODO: New wedge design uses a coloured horizontal gradient for its background, however this lacks implementation information in the figma draft.
+                            // pending https://www.figma.com/file/DXKwqZhD5yyb1igc3mKo1P?node-id=2980:3361#340801912 being answered.
+                            new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
+                            Info = new WedgeInfoText(beatmap) { Shear = -Shear }
+                        }
                     }
                 }, loaded =>
                 {

From 2df20027355ddbf24bd43401ef5feabf5a7e1823 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 12:42:01 -0700
Subject: [PATCH 1269/2100] Move negative corner radius margin to constructor

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs    | 16 ++++++++++------
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs    |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 09b93119cc..ae5b739c4d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -50,13 +50,17 @@ namespace osu.Game.Tests.Visual.SongSelect
                     RelativeSizeAxes = Axes.X,
                     Margin = new MarginPadding { Top = 20, Left = -10 }
                 },
-                infoWedge = new TestBeatmapInfoWedgeV2
+                new Container
                 {
-                    State = { Value = Visibility.Visible },
-                    Width = 0.6f,
-                    RelativeSizeAxes = Axes.X,
-                    Margin = new MarginPadding { Top = 20, Left = -10 }
-                },
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Top = 20 },
+                    Child = infoWedge = new TestBeatmapInfoWedgeV2
+                    {
+                        State = { Value = Visibility.Visible },
+                        Width = 0.6f,
+                        RelativeSizeAxes = Axes.X,
+                    },
+                }
             });
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 284f14cd9e..742d9011b9 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -55,6 +55,7 @@ namespace osu.Game.Screens.Select
             Height = WEDGE_HEIGHT;
             Shear = wedged_container_shear;
             Masking = true;
+            Margin = new MarginPadding { Left = -corner_radius };
             EdgeEffect = new EdgeEffectParameters
             {
                 Colour = Colour4.Black.Opacity(0.2f),

From e70510ef191ef345eee35b490a12118fbb29a755 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 12:56:20 -0700
Subject: [PATCH 1270/2100] Move drawable and binding logic to standard places

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 742d9011b9..de3e634819 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -46,9 +46,9 @@ namespace osu.Game.Screens.Select
 
         protected WedgeInfoText? Info { get; private set; }
 
-        private readonly Container difficultyColourBar;
-        private readonly StarCounter starCounter;
-        private readonly BufferedContainer bufferedContent;
+        private Container difficultyColourBar = null!;
+        private StarCounter starCounter = null!;
+        private BufferedContainer bufferedContent = null!;
 
         public BeatmapInfoWedgeV2()
         {
@@ -63,7 +63,11 @@ namespace osu.Game.Screens.Select
                 Radius = 3,
             };
             CornerRadius = corner_radius;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             // We want to buffer the wedge to avoid weird transparency overlaps between the colour bar and the background.
             Child = bufferedContent = new BufferedContainer(pixelSnapping: true)
             {
@@ -107,9 +111,10 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             ruleset.BindValueChanged(_ => updateDisplay());
         }
 
@@ -228,6 +233,8 @@ namespace osu.Game.Screens.Select
             public WedgeInfoText(WorkingBeatmap working)
             {
                 this.working = working;
+
+                RelativeSizeAxes = Axes.Both;
             }
 
             [BackgroundDependencyLoader]
@@ -236,8 +243,6 @@ namespace osu.Game.Screens.Select
                 var beatmapInfo = working.BeatmapInfo;
                 var metadata = working.Metadata;
 
-                RelativeSizeAxes = Axes.Both;
-
                 titleBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
                 artistBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
 

From 82fb9dc2ef5eb03f2db25426f11a19f836e62f68 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 12:59:21 -0700
Subject: [PATCH 1271/2100] Simplify text initialization

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index de3e634819..fd655c50ca 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -212,9 +212,6 @@ namespace osu.Game.Screens.Select
 
             private StarRatingDisplay starRatingDisplay = null!;
 
-            private ILocalisedBindableString titleBinding = null!;
-            private ILocalisedBindableString artistBinding = null!;
-
             private readonly WorkingBeatmap working;
 
             public IBindable<double> DisplayedStars => starRatingDisplay.DisplayedStars;
@@ -238,14 +235,11 @@ namespace osu.Game.Screens.Select
             }
 
             [BackgroundDependencyLoader]
-            private void load(LocalisationManager localisation)
+            private void load()
             {
                 var beatmapInfo = working.BeatmapInfo;
                 var metadata = working.Metadata;
 
-                titleBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
-                artistBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
-
                 Children = new Drawable[]
                 {
                     new FillFlowContainer
@@ -292,7 +286,7 @@ namespace osu.Game.Screens.Select
                             TitleLabel = new TruncatingSpriteText
                             {
                                 Shadow = true,
-                                Current = { BindTarget = titleBinding },
+                                Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
                                 Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
                             },
@@ -300,7 +294,7 @@ namespace osu.Game.Screens.Select
                             {
                                 // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
                                 Shadow = true,
-                                Current = { BindTarget = artistBinding },
+                                Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
                                 // Not sure if this should be semi bold or medium
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,

From e0a9c7e9a9680004b98a8086354fb758b65daa51 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 14:54:58 -0700
Subject: [PATCH 1272/2100] Fix wedge showing abruptly in test

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index ae5b739c4d..3236841dc3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Padding = new MarginPadding { Top = 20 },
                     Child = infoWedge = new TestBeatmapInfoWedgeV2
                     {
-                        State = { Value = Visibility.Visible },
                         Width = 0.6f,
                         RelativeSizeAxes = Axes.X,
                     },
@@ -165,6 +164,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 containerBefore = infoWedge.DisplayedContent;
                 infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
+                infoWedge.Show();
             });
 
             AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);

From 854bb323cc09e0a296ebd2ca948e4a6074950044 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 15:02:00 -0700
Subject: [PATCH 1273/2100] Remove weird red edge effect visibility

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 3236841dc3..827d23c0fc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -7,7 +7,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
@@ -94,17 +93,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestWedgeVisibility()
         {
-            // Mostly just in case someone runs this test before others,
-            // leading to the shadow being very hard to see if it is black
-            AddStep("make shadow red for test visibility", () =>
-            {
-                infoWedge.EdgeEffect = new EdgeEffectParameters
-                {
-                    Colour = Colour4.Red,
-                    Type = EdgeEffectType.Shadow,
-                    Radius = 5,
-                };
-            });
             AddStep("hide", () => { infoWedge.Hide(); });
             AddWaitStep("wait for hide", 3);
             AddAssert("check visibility", () => infoWedge.Alpha == 0);

From 9accd0ded262e451792a10013762e442b5523441 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 15:02:38 -0700
Subject: [PATCH 1274/2100] Fix star rating rolling counter regression

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index fd655c50ca..5316b4620b 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -314,7 +314,7 @@ namespace osu.Game.Screens.Select
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
-                    if (starRatingDisplay.Alpha > 0)
+                    if (!starRatingDisplay.IsPresent)
                         starRatingDisplay.FinishTransforms(true);
 
                     starRatingDisplay.FadeIn(transition_duration);

From 98d027d207143532178e4588c279368abb391d8b Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 21:34:53 -0700
Subject: [PATCH 1275/2100] Fix star counter animating weird and delayed

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 5316b4620b..de930ff837 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -187,11 +187,16 @@ namespace osu.Game.Screens.Select
 
                     Info.DisplayedStars.BindValueChanged(s =>
                     {
-                        starCounter.Current = (float)s.NewValue;
                         starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
 
                         difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                     }, true);
+
+                    Info.ActualStars.BindValueChanged(s =>
+                    {
+                        // use actual stars as star counter has its own animation
+                        starCounter.Current = (float)s.NewValue;
+                    });
                 });
             });
 
@@ -215,6 +220,7 @@ namespace osu.Game.Screens.Select
             private readonly WorkingBeatmap working;
 
             public IBindable<double> DisplayedStars => starRatingDisplay.DisplayedStars;
+            public Bindable<double> ActualStars = new Bindable<double>();
 
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
@@ -312,6 +318,7 @@ namespace osu.Game.Screens.Select
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
+                    ActualStars.Value = s.NewValue?.Stars ?? 0;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
                     if (!starRatingDisplay.IsPresent)

From 94516133912a4c32048dddc52c53fb9696bb0477 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 21:39:26 -0700
Subject: [PATCH 1276/2100] Rename null beatmap test to indicate there's a
 background

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 827d23c0fc..a8484caf1c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        public void TestNullBeatmap()
+        public void TestNullBeatmapWithBackground()
         {
             selectBeatmap(null);
             AddAssert("check default title", () => infoWedge.Info!.TitleLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Title);

From 1215ad7ace400cb404121d9a8ead9ac81f2ad2a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 15:40:00 +0900
Subject: [PATCH 1277/2100] 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 2d15bce85a..2bfdce5ab8 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.823.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.904.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 cd57c33109..052528f93b 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.823.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.904.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.822.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 d515a035da..760ea2e31e 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.823.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.904.0" />
   </ItemGroup>
 </Project>

From a8c9c2bf17e7c1ecaf00fb5061e35b793c2b28de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 15:45:13 +0900
Subject: [PATCH 1278/2100] Remove buffered container (doesn't seem like it's
 doing anything anymore)

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index de930ff837..0ebd875cbe 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Select
 
         private Container difficultyColourBar = null!;
         private StarCounter starCounter = null!;
-        private BufferedContainer bufferedContent = null!;
+        private Container content = null!;
 
         public BeatmapInfoWedgeV2()
         {
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             // We want to buffer the wedge to avoid weird transparency overlaps between the colour bar and the background.
-            Child = bufferedContent = new BufferedContainer(pixelSnapping: true)
+            Child = content = new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
@@ -177,13 +177,13 @@ namespace osu.Game.Screens.Select
                             Info = new WedgeInfoText(beatmap) { Shear = -Shear }
                         }
                     }
-                }, loaded =>
+                }, d =>
                 {
                     // Ensure we are the most recent loaded wedge.
-                    if (loaded != loadingInfo) return;
+                    if (d != loadingInfo) return;
 
                     removeOldInfo();
-                    bufferedContent.Add(DisplayedContent = loaded);
+                    content.Add(DisplayedContent = d);
 
                     Info.DisplayedStars.BindValueChanged(s =>
                     {

From 340edf68d3555ecf852221b6728933175fbd5afa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 15:58:53 +0900
Subject: [PATCH 1279/2100] Fix test scene not updating all star counters

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index a8484caf1c..a7070f845e 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -63,6 +63,12 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
             {
+                // Difficulty cache lookup is a pain in the ass to work with.
+                // This logic is ugly and needs to be reconsidered.
+
+                if (infoWedge.Info != null)
+                    infoWedge.Info!.ActualStars.Value = v;
+
                 foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
                     hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
             });

From 4ff3630484cbf09d562de96ab5e0eb2bbbb1d3e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 16:14:01 +0900
Subject: [PATCH 1280/2100] Add a slight delay before hiding the popover to
 better visualise button click

---
 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 4e1334fd11..aa338c4496 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Select.FooterV2
                 TextColour = colour,
                 Action = () =>
                 {
-                    Hide();
+                    Scheduler.AddDelayed(Hide, 50);
                     action?.Invoke();
                 },
             };

From 02fefff5e7b09d070ed4e2616ea449f7b1fde39f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 16:44:22 +0900
Subject: [PATCH 1281/2100] Add better testing of options popover

---
 .../SongSelect/TestSceneSongSelectFooterV2.cs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
index ed2ae67ae5..013bad55bc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Testing;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Select.FooterV2;
 using osuTK.Input;
 
@@ -57,6 +58,24 @@ namespace osu.Game.Tests.Visual.SongSelect
             overlay.Hide();
         });
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("set beatmap", () => Beatmap.Value = CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)));
+        }
+
+        [Test]
+        public void TestShowOptions()
+        {
+            AddStep("enable options", () =>
+            {
+                var optionsButton = this.ChildrenOfType<FooterButtonV2>().Last();
+
+                optionsButton.Enabled.Value = true;
+                optionsButton.TriggerClick();
+            });
+        }
+
         [Test]
         public void TestState()
         {

From 84d8d33ad723c5fbeb6a3a49787964bc88ba589b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 16:44:55 +0900
Subject: [PATCH 1282/2100] Add headers and generally improve the UI of the
 popover

---
 .../Select/FooterV2/BeatmapOptionsPopover.cs  | 60 ++++++++++++++++---
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index aa338c4496..3e37bdc2ea 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -10,8 +10,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
@@ -24,33 +26,48 @@ namespace osu.Game.Screens.Select.FooterV2
 {
     public partial class BeatmapOptionsPopover : OsuPopover
     {
-        private FillFlowContainer<OptionButton> buttonFlow = null!;
+        private FillFlowContainer buttonFlow = null!;
         private readonly FooterButtonOptionsV2 footerButton;
 
+        private WorkingBeatmap beatmapWhenOpening = null!;
+
         public BeatmapOptionsPopover(FooterButtonOptionsV2 footerButton)
         {
             this.footerButton = footerButton;
         }
 
         [BackgroundDependencyLoader]
-        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours)
+        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours, IBindable<WorkingBeatmap> beatmap)
         {
             Content.Padding = new MarginPadding(5);
 
-            Child = buttonFlow = new FillFlowContainer<OptionButton>
+            Child = buttonFlow = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
                 Spacing = new Vector2(3),
             };
 
-            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
-            addButton(@"Delete all difficulties", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(), colours.Red);
-            addButton(@"Remove from unplayed", FontAwesome.Regular.TimesCircle, null);
-            addButton(@"Clear local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores());
+            beatmapWhenOpening = beatmap.Value;
+
+            addHeader("For all difficulties", beatmapWhenOpening.BeatmapSetInfo.ToString());
+
+            addButton(@"Delete beatmap", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(), colours.Red1);
+
+            addHeader("For selected difficulty", beatmapWhenOpening.BeatmapInfo.DifficultyName);
+
+            // TODO: make work, and make show "unplayed" or "played" based on status.
+            addButton(@"Mark as played", FontAwesome.Regular.TimesCircle, null);
+
+            addButton(@"Hide", FontAwesome.Solid.Magic, null);
+            addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
                 addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit());
+
+            addHeader("General");
+
+            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
         }
 
         protected override void LoadComplete()
@@ -60,6 +77,33 @@ namespace osu.Game.Screens.Select.FooterV2
             ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(this));
         }
 
+        [Resolved]
+        private OverlayColourProvider overlayColourProvider { get; set; } = null!;
+
+        private void addHeader(string text, string? context = null)
+        {
+            var textFlow = new OsuTextFlowContainer
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Padding = new MarginPadding(10),
+            };
+
+            textFlow.AddText(text, t => t.Font = OsuFont.Default.With(weight: FontWeight.SemiBold));
+
+            if (context != null)
+            {
+                textFlow.NewLine();
+                textFlow.AddText(context, t =>
+                {
+                    t.Colour = overlayColourProvider.Content2;
+                    t.Font = t.Font.With(size: 13);
+                });
+            }
+
+            buttonFlow.Add(textFlow);
+        }
+
         private void addButton(LocalisableString text, IconUsage icon, Action? action, Color4? colour = null)
         {
             var button = new OptionButton
@@ -124,7 +168,7 @@ namespace osu.Game.Screens.Select.FooterV2
             {
                 int requested = e.Key - Key.Number1;
 
-                OptionButton? found = buttonFlow.Children.ElementAtOrDefault(requested);
+                OptionButton? found = buttonFlow.Children.OfType<OptionButton>().ElementAtOrDefault(requested);
 
                 if (found != null)
                 {

From 4cd4eb3b0a2aec1683efa72ab73d5ad7d449385f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 16:46:49 +0900
Subject: [PATCH 1283/2100] Move "general" to top for key binding compatibility

---
 .../Screens/Select/FooterV2/BeatmapOptionsPopover.cs   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 3e37bdc2ea..550b3e5cf6 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -50,24 +50,20 @@ namespace osu.Game.Screens.Select.FooterV2
 
             beatmapWhenOpening = beatmap.Value;
 
-            addHeader("For all difficulties", beatmapWhenOpening.BeatmapSetInfo.ToString());
+            addHeader("General");
+            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
 
+            addHeader("For all difficulties", beatmapWhenOpening.BeatmapSetInfo.ToString());
             addButton(@"Delete beatmap", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(), colours.Red1);
 
             addHeader("For selected difficulty", beatmapWhenOpening.BeatmapInfo.DifficultyName);
-
             // TODO: make work, and make show "unplayed" or "played" based on status.
             addButton(@"Mark as played", FontAwesome.Regular.TimesCircle, null);
-
             addButton(@"Hide", FontAwesome.Solid.Magic, null);
             addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
                 addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit());
-
-            addHeader("General");
-
-            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
         }
 
         protected override void LoadComplete()

From 691c08ebde66fbca9f078040fb2c54047a644c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Sep 2023 10:24:21 +0200
Subject: [PATCH 1284/2100] Update spectator server development endpoint URLs

With the way `dev.ppy.sh` was previously configured, the `osu-web`
`/multiplayer` routes and `osu-server-spectator` `/multiplayer` routes
would conflict with each other, with the `osu-server-spectator` route
taking precedence. This would mean that some `osu-web` pages would just
straight up not be available on dev.

To counteract this, the `osu-server-spectator` routes are now exposed
under `https://dev.ppy.sh/signalr/`. This PR updates the client-side
configuration to use these new routes.
---
 osu.Game/Online/DevelopmentEndpointConfiguration.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/DevelopmentEndpointConfiguration.cs b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
index 69276f452a..5f3c353f4d 100644
--- a/osu.Game/Online/DevelopmentEndpointConfiguration.cs
+++ b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
@@ -10,9 +10,9 @@ namespace osu.Game.Online
             WebsiteRootUrl = APIEndpointUrl = @"https://dev.ppy.sh";
             APIClientSecret = @"3LP2mhUrV89xxzD1YKNndXHEhWWCRLPNKioZ9ymT";
             APIClientID = "5";
-            SpectatorEndpointUrl = $"{APIEndpointUrl}/spectator";
-            MultiplayerEndpointUrl = $"{APIEndpointUrl}/multiplayer";
-            MetadataEndpointUrl = $"{APIEndpointUrl}/metadata";
+            SpectatorEndpointUrl = $@"{APIEndpointUrl}/signalr/spectator";
+            MultiplayerEndpointUrl = $@"{APIEndpointUrl}/signalr/multiplayer";
+            MetadataEndpointUrl = $@"{APIEndpointUrl}/signalr/metadata";
         }
     }
 }

From 96f12cfbaac4cfc0d8782de0d2890aa8b63e3fdb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 18:01:09 +0900
Subject: [PATCH 1285/2100] Update `GetTexture` signature rather than creating
 new overload

---
 .../Skinning/Legacy/LegacyBananaPiece.cs      |  5 ++--
 .../Skinning/Legacy/LegacyDropletPiece.cs     |  5 ++--
 .../Skinning/Legacy/LegacyFruitPiece.cs       |  9 ++++----
 .../LegacyMainCirclePieceTest.cs              |  5 ++--
 .../TestSceneCursorTrail.cs                   |  2 +-
 .../TestSceneGameplayCursor.cs                |  2 +-
 .../TestSceneSkinFallbacks.cs                 |  3 ++-
 .../Skinning/Legacy/LegacyMainCirclePiece.cs  |  2 +-
 .../TestSceneHitObjectAccentColour.cs         |  3 ++-
 .../Skinning/LegacySkinAnimationTest.cs       |  3 ++-
 .../TestSceneRulesetSkinProvidingContainer.cs |  3 ++-
 .../Skins/SkinDeserialisationTest.cs          |  3 ++-
 .../TestSceneBeatmapSkinLookupDisables.cs     |  4 +++-
 .../Skins/TestSceneSkinConfigurationLookup.cs |  4 +++-
 .../Skins/TestSceneSkinProvidingContainer.cs  |  3 ++-
 .../Skins/TestSceneSkinResources.cs           |  3 ++-
 .../Gameplay/TestSceneSkinnableDrawable.cs    |  6 ++---
 .../Gameplay/TestSceneSkinnableSound.cs       |  6 ++++-
 osu.Game/Screens/Edit/EditorBeatmapSkin.cs    |  6 ++++-
 osu.Game/Skinning/ArgonSkin.cs                |  3 ++-
 osu.Game/Skinning/ISkin.cs                    | 11 +++------
 osu.Game/Skinning/LegacySkin.cs               |  5 ++--
 osu.Game/Skinning/LegacySkinExtensions.cs     | 23 +++++++------------
 osu.Game/Skinning/ResourceStoreBackedSkin.cs  |  4 +++-
 osu.Game/Skinning/Skin.cs                     |  5 ++--
 osu.Game/Skinning/SkinManager.cs              |  4 +++-
 osu.Game/Skinning/SkinProvidingContainer.cs   | 11 +++++----
 osu.Game/Skinning/SkinTransformer.cs          |  5 ++--
 osu.Game/Skinning/TrianglesSkin.cs            |  3 ++-
 osu.Game/Tests/Visual/SkinnableTestScene.cs   |  6 ++---
 30 files changed, 84 insertions(+), 73 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
index 9f99e3a586..d471a7ee32 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -15,8 +14,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTextureWithMaxSize("fruit-bananas", banana_max_size);
-            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-bananas-overlay", banana_max_size);
+            Texture? texture = Skin.GetTexture("fruit-bananas", banana_max_size);
+            Texture? overlayTexture = Skin.GetTexture("fruit-bananas-overlay", banana_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index 63be1bcf91..f1b1b45288 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -20,8 +19,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTextureWithMaxSize("fruit-drop", droplet_max_size);
-            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-drop-overlay", droplet_max_size);
+            Texture? texture = Skin.GetTexture("fruit-drop", droplet_max_size);
+            Texture? overlayTexture = Skin.GetTexture("fruit-drop-overlay", droplet_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index e4d25e036b..3c853e5d3d 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -26,19 +25,19 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             switch (visualRepresentation)
             {
                 case FruitVisualRepresentation.Pear:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-pear", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-pear-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-pear", fruit_max_size), Skin.GetTexture("fruit-pear-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-grapes", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-grapes-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-grapes", fruit_max_size), Skin.GetTexture("fruit-grapes-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-apple", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-apple-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-apple", fruit_max_size), Skin.GetTexture("fruit-apple-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-orange", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-orange-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-orange", fruit_max_size), Skin.GetTexture("fruit-orange-overlay", fruit_max_size));
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
index baaa24959f..dbeae2a76e 100644
--- a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
@@ -14,6 +14,7 @@ using osu.Framework.Testing;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -77,9 +78,9 @@ namespace osu.Game.Rulesets.Osu.Tests
                 // shouldn't be required as GetTexture(string) calls GetTexture(string, WrapMode, WrapMode) by default,
                 // but moq doesn't handle that well, therefore explicitly requiring to use `CallBase`:
                 // https://github.com/moq/moq4/issues/972
-                skin.Setup(s => s.GetTexture(It.IsAny<string>())).CallBase();
+                skin.Setup(s => s.GetTexture(It.IsAny<string>(), It.IsAny<Vector2>(), It.IsAny<WrapMode>(), It.IsAny<WrapMode>())).CallBase();
 
-                skin.Setup(s => s.GetTexture(It.IsIn(textureFilenames), It.IsAny<WrapMode>(), It.IsAny<WrapMode>()))
+                skin.Setup(s => s.GetTexture(It.IsIn(textureFilenames), It.IsAny<Vector2>(), It.IsAny<WrapMode>(), It.IsAny<WrapMode>()))
                     .Returns((string componentName, WrapMode _, WrapMode _) =>
                     {
                         var tex = renderer.CreateTexture(1, 1);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index 9582ee491b..22111d4412 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => null;
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
             {
                 switch (componentName)
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index c84a6ab70f..29dffd029e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private class TopLeftCursorSkin : ISkin
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => null;
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => null;
             public ISample GetSample(ISampleInfo sampleInfo) => null;
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 09b906cb10..da959b6be0 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -25,6 +25,7 @@ using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -163,7 +164,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 };
             }
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => null;
 
             public ISample GetSample(ISampleInfo sampleInfo) => null;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 45a18152c2..cf91ac4596 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTextureWithMaxSize(circleName, circle_piece_size) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName, circle_piece_size) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index f38c2c9416..bf8f5fd1e8 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Gameplay
@@ -140,7 +141,7 @@ namespace osu.Game.Tests.Gameplay
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => throw new NotImplementedException();
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
index 197e9404ff..34ea459988 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -18,6 +18,7 @@ using osu.Framework.Timing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Tests.NonVisual.Skinning
 {
@@ -68,7 +69,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
                 this.renderer = renderer;
             }
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
             {
                 return lookup_names.Contains(componentName) ? renderer.WhitePixel : null;
             }
diff --git a/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs b/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
index 11f3fe660d..705fd19d93 100644
--- a/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osu.Game.Tests.Testing;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Tests.Rulesets
 {
@@ -80,7 +81,7 @@ namespace osu.Game.Tests.Rulesets
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => skin.GetTexture(componentName);
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => skin.GetTexture(componentName);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index 82d204f134..79ce4de720 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -16,6 +16,7 @@ using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
+using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -133,7 +134,7 @@ namespace osu.Game.Tests.Skins
             {
             }
 
-            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
index 0bbf4406fb..5144f57f8d 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -100,7 +101,8 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+                skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index 816834989c..a433b67bfb 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Visual;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Skins
@@ -223,7 +224,8 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+                skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs b/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
index df314b56a9..4acd127a58 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
@@ -16,6 +16,7 @@ using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -89,7 +90,7 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => throw new System.NotImplementedException();
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
             {
                 if (componentName == TEXTURE_NAME)
                     return renderer.WhitePixel;
diff --git a/osu.Game.Tests/Skins/TestSceneSkinResources.cs b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
index aaec319b57..636f1071dd 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
@@ -22,6 +22,7 @@ using osu.Game.IO;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -100,7 +101,7 @@ namespace osu.Game.Tests.Skins
             {
             }
 
-            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index c02cec8c75..326e233e3f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -297,7 +297,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                     : null;
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
@@ -308,7 +308,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup componentLookupName) => new SecondarySourceBox();
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
@@ -320,7 +320,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup componentLookupName) => new BaseSourceBox();
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 3f78dbfd96..0071c7e2c0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -163,7 +164,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => SamplePlaybackDisabled;
 
             public Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => source.GetDrawableComponent(lookup);
-            public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source.GetTexture(componentName, wrapModeS, wrapModeT);
+
+            public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+                source.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+
             public ISample? GetSample(ISampleInfo sampleInfo) => OverridingSample ?? source.GetSample(sampleInfo);
 
             public IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
diff --git a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
index 80239504d8..d04bb72bd9 100644
--- a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit
@@ -54,7 +55,10 @@ namespace osu.Game.Screens.Edit
         #region Delegated ISkin implementation
 
         public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => Skin.GetDrawableComponent(lookup);
-        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Skin.GetTexture(componentName, wrapModeS, wrapModeT);
+
+        public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+            Skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+
         public ISample GetSample(ISampleInfo sampleInfo) => Skin.GetSample(sampleInfo);
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Skin.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 61b0dc5aa1..3d14df70ce 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -67,7 +67,8 @@ namespace osu.Game.Skinning
             };
         }
 
-        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Textures?.Get(componentName, wrapModeS, wrapModeT);
+        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+            Textures?.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
 
         public override ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index fa04dda202..5cc677ad1c 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -25,17 +26,11 @@ namespace osu.Game.Skinning
         /// Retrieve a <see cref="Texture"/>.
         /// </summary>
         /// <param name="componentName">The requested texture.</param>
-        /// <returns>A matching texture, or null if unavailable.</returns>
-        Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
-
-        /// <summary>
-        /// Retrieve a <see cref="Texture"/>.
-        /// </summary>
-        /// <param name="componentName">The requested texture.</param>
+        /// <param name="maxSize">The maximum dimensions that the texture should be.</param>
         /// <param name="wrapModeS">The texture wrap mode in horizontal direction.</param>
         /// <param name="wrapModeT">The texture wrap mode in vertical direction.</param>
         /// <returns>A matching texture, or null if unavailable.</returns>
-        Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT);
+        Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default);
 
         /// <summary>
         /// Retrieve a <see cref="SampleChannel"/>.
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index cf51fa8f74..1b0b1be585 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -466,7 +466,7 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
         {
             switch (componentName)
             {
@@ -497,7 +497,8 @@ namespace osu.Game.Skinning
                     continue;
 
                 texture.ScaleAdjust = ratio;
-                return texture;
+
+                return texture.WithMaximumSize(maxSize);
             }
 
             return null;
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index ad3b10edd3..bd38eda259 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
                 if (animatable && s.GetTexture(getFrameName(0)) != null)
                     return true;
 
-                return s.GetTexture(componentName, wrapModeS, wrapModeT) != null;
+                return s.GetTexture(componentName, maxSize, wrapModeS, wrapModeT) != null;
             }) ?? source;
 
             if (animatable)
@@ -79,21 +79,15 @@ namespace osu.Game.Skinning
             }
 
             // if an animation was not allowed or not found, fall back to a sprite retrieval.
-            var singleTexture = maxSize != null
-                ? retrievalSource.GetTextureWithMaxSize(componentName, maxSize.Value, wrapModeS, wrapModeT)
-                : retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
+            var singleTexture = retrievalSource.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
-            return singleTexture != null
-                ? new[] { singleTexture }
-                : Array.Empty<Texture>();
+            return singleTexture != null ? new[] { singleTexture } : Array.Empty<Texture>();
 
             IEnumerable<Texture> getTextures(ISkin skin)
             {
                 for (int i = 0; true; i++)
                 {
-                    var texture = maxSize != null
-                        ? skin.GetTextureWithMaxSize(getFrameName(i), maxSize.Value, wrapModeS, wrapModeT)
-                        : skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT);
+                    var texture = skin.GetTexture(getFrameName(i), maxSize, wrapModeS, wrapModeT);
 
                     if (texture == null)
                         break;
@@ -105,17 +99,16 @@ namespace osu.Game.Skinning
             string getFrameName(int frameIndex) => $"{componentName}{animationSeparator}{frameIndex}";
         }
 
-        public static Texture? GetTextureWithMaxSize(this ISkin source, string componentName, Vector2 maxSize, WrapMode wrapModeS = WrapMode.None, WrapMode wrapModeT = WrapMode.None)
+        public static Texture? WithMaximumSize(this Texture? texture, Vector2? maxSize)
         {
-            var texture = source.GetTexture(componentName, wrapModeS, wrapModeT);
-            if (texture == null)
+            if (texture == null || maxSize == null)
                 return texture;
 
-            if (texture.DisplayWidth <= maxSize.X && texture.DisplayHeight <= maxSize.Y)
+            if (texture.DisplayWidth <= maxSize.Value.X && texture.DisplayHeight <= maxSize.Value.Y)
                 return texture;
 
             // use scale adjust property for downscaling the texture in order to meet the specified maximum dimensions.
-            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.X, texture.DisplayHeight / maxSize.Y);
+            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.Value.X, texture.DisplayHeight / maxSize.Value.Y);
             return texture;
         }
 
diff --git a/osu.Game/Skinning/ResourceStoreBackedSkin.cs b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
index f5c6192ba5..35165c2e6f 100644
--- a/osu.Game/Skinning/ResourceStoreBackedSkin.cs
+++ b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Game.Audio;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -29,7 +30,8 @@ namespace osu.Game.Skinning
 
         public Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => null;
 
-        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => textures.Get(componentName, wrapModeS, wrapModeT);
+        public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+            textures.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
 
         public ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index a6250d7488..0e96feaccc 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -18,6 +18,7 @@ using osu.Framework.Logging;
 using osu.Game.Audio;
 using osu.Game.Database;
 using osu.Game.IO;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -44,9 +45,7 @@ namespace osu.Game.Skinning
 
         public abstract ISample? GetSample(ISampleInfo sampleInfo);
 
-        public Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
-
-        public abstract Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT);
+        public abstract Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default);
 
         public abstract IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
             where TLookup : notnull
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 51605c6045..f0819211c0 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -25,6 +25,7 @@ using osu.Game.Database;
 using osu.Game.IO;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Utils;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -223,7 +224,8 @@ namespace osu.Game.Skinning
 
         public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => lookupWithFallback(s => s.GetDrawableComponent(lookup));
 
-        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => lookupWithFallback(s => s.GetTexture(componentName, wrapModeS, wrapModeT));
+        public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+            lookupWithFallback(s => s.GetTexture(componentName, maxSize, wrapModeS, wrapModeT));
 
         public ISample GetSample(ISampleInfo sampleInfo) => lookupWithFallback(s => s.GetSample(sampleInfo));
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 2612e0b47c..342d6d8009 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -127,19 +128,19 @@ namespace osu.Game.Skinning
             return ParentSource?.GetDrawableComponent(lookup);
         }
 
-        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+        public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
         {
             foreach (var (_, lookupWrapper) in skinSources)
             {
                 Texture? sourceTexture;
-                if ((sourceTexture = lookupWrapper.GetTexture(componentName, wrapModeS, wrapModeT)) != null)
+                if ((sourceTexture = lookupWrapper.GetTexture(componentName, maxSize, wrapModeS, wrapModeT)) != null)
                     return sourceTexture;
             }
 
             if (!AllowFallingBackToParent)
                 return null;
 
-            return ParentSource?.GetTexture(componentName, wrapModeS, wrapModeT);
+            return ParentSource?.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
         }
 
         public ISample? GetSample(ISampleInfo sampleInfo)
@@ -251,10 +252,10 @@ namespace osu.Game.Skinning
                 return null;
             }
 
-            public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
             {
                 if (provider.AllowTextureLookup(componentName))
-                    return skin.GetTexture(componentName, wrapModeS, wrapModeT);
+                    return skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
                 return null;
             }
diff --git a/osu.Game/Skinning/SkinTransformer.cs b/osu.Game/Skinning/SkinTransformer.cs
index ed5b04da1e..cd7755b854 100644
--- a/osu.Game/Skinning/SkinTransformer.cs
+++ b/osu.Game/Skinning/SkinTransformer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -28,9 +29,7 @@ namespace osu.Game.Skinning
 
         public virtual Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => Skin.GetDrawableComponent(lookup);
 
-        public virtual Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
-
-        public virtual Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Skin.GetTexture(componentName, wrapModeS, wrapModeT);
+        public virtual Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => Skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
         public virtual ISample? GetSample(ISampleInfo sampleInfo) => Skin.GetSample(sampleInfo);
 
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index 0957f60579..d1d094b301 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -44,7 +44,8 @@ namespace osu.Game.Skinning
             this.resources = resources;
         }
 
-        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Textures?.Get(componentName, wrapModeS, wrapModeT);
+        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+            Textures?.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
 
         public override ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index aab1b72990..6c286f37c7 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -207,9 +207,9 @@ namespace osu.Game.Tests.Visual
                 this.extrapolateAnimations = extrapolateAnimations;
             }
 
-            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
             {
-                var lookup = base.GetTexture(componentName, wrapModeS, wrapModeT);
+                var lookup = base.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
                 if (lookup != null)
                     return lookup;
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Visual
                     var match = Regex.Match(componentName, "-([0-9]*)");
 
                     if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out int number) && number < 60)
-                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
+                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), maxSize, wrapModeS, wrapModeT);
                 }
 
                 return null;

From 9d1753977858dd0e1e0c4312db964749931c11f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 17:35:28 +0900
Subject: [PATCH 1286/2100] Add size limitations for taiko drum rolls

---
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
index 5543a31ec9..33f85328fa 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
@@ -47,13 +48,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-end", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
+                    Texture = skin.GetTexture("taiko-roll-end", new Vector2(128, 256), WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                     FillMode = FillMode.Fit,
                 },
                 body = new Sprite
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-middle", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
+                    Texture = skin.GetTexture("taiko-roll-middle", new Vector2(2, 256), WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                 },
                 headCircle = new LegacyCirclePiece
                 {

From 6e6dd86a511f34aa7de1dcb8b5831cc620c396e1 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 11:09:35 -0700
Subject: [PATCH 1287/2100] Remove buffered container comment

While it is true that there is a transparency overlap, it is only seen when entering/exiting song select. And there are other components game-wide that exhibit the same issue when transparency changes. Should be reconsidered another time.
---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 0ebd875cbe..270d063dfa 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -68,7 +68,6 @@ namespace osu.Game.Screens.Select
         [BackgroundDependencyLoader]
         private void load()
         {
-            // We want to buffer the wedge to avoid weird transparency overlaps between the colour bar and the background.
             Child = content = new Container
             {
                 RelativeSizeAxes = Axes.Both,

From b63c1e42574952f62eafa6c5e5645af616b39915 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 12:14:17 -0700
Subject: [PATCH 1288/2100] Remove mods dependency

BPM is not in the wedge anymore.
---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 270d063dfa..834b3f07a0 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using osuTK;
 using osu.Framework.Allocation;
@@ -16,10 +15,8 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
-using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.Select
 {
@@ -221,14 +218,9 @@ namespace osu.Game.Screens.Select
             public IBindable<double> DisplayedStars => starRatingDisplay.DisplayedStars;
             public Bindable<double> ActualStars = new Bindable<double>();
 
-            [Resolved]
-            private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
-
             [Resolved]
             private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
-            private ModSettingChangeTracker? settingChangeTracker;
-
             private IBindable<StarDifficulty?>? starDifficulty;
             private CancellationTokenSource? cancellationSource;
 
@@ -325,13 +317,6 @@ namespace osu.Game.Screens.Select
 
                     starRatingDisplay.FadeIn(transition_duration);
                 });
-
-                mods.BindValueChanged(m =>
-                {
-                    settingChangeTracker?.Dispose();
-
-                    settingChangeTracker = new ModSettingChangeTracker(m.NewValue);
-                }, true);
             }
 
             protected override void Dispose(bool isDisposing)
@@ -339,7 +324,6 @@ namespace osu.Game.Screens.Select
                 base.Dispose(isDisposing);
 
                 cancellationSource?.Cancel();
-                settingChangeTracker?.Dispose();
             }
         }
     }

From 40d1196aea1871751f6094d8878a4457045854ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Sep 2023 11:15:35 +0200
Subject: [PATCH 1289/2100] Add test cases covering overlapping slider input
 expectations

---
 .../TestSceneLegacyHitPolicy.cs               | 54 +++++++++++++++++++
 .../TestSceneStartTimeOrderedHitPolicy.cs     | 52 ++++++++++++++++++
 2 files changed, 106 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 2cfbe6611f..c9aa44eb5a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -505,6 +505,54 @@ namespace osu.Game.Rulesets.Osu.Tests
             addClickActionAssert(0, ClickAction.Shake);
         }
 
+        [Test]
+        public void TestInputDoesNotFallThroughOverlappingSliders()
+        {
+            const double time_first_slider = 1000;
+            const double time_second_slider = 1250;
+            Vector2 positionFirstSlider = new Vector2(100, 50);
+            Vector2 positionSecondSlider = new Vector2(100, 80);
+            var midpoint = (positionFirstSlider + positionSecondSlider) / 2;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new Slider
+                {
+                    StartTime = time_first_slider,
+                    Position = positionFirstSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                },
+                new Slider
+                {
+                    StartTime = time_second_slider,
+                    Position = positionSecondSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_slider, Position = midpoint, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_first_slider + 25, Position = midpoint, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_slider + 50, Position = midpoint },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Ok);
+            addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
+            addJudgementAssert(hitObjects[1], HitResult.Miss);
+            // the slider head of the first slider prevents the second slider's head from being hit, so the judgement offset should be very late.
+            addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, referenceHitWindows.WindowFor(HitResult.Meh));
+            addClickActionAssert(0, ClickAction.Hit);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
@@ -523,6 +571,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, () => Is.EqualTo(offset).Within(50));
         }
 
+        private void addJudgementOffsetAssert(string name, Func<OsuHitObject?> hitObject, double offset)
+        {
+            AddAssert($"{name} @ judged at {offset}",
+                () => judgementResults.Single(r => r.HitObject == hitObject()).TimeOffset, () => Is.EqualTo(offset).Within(50));
+        }
+
         private void addClickActionAssert(int inputIndex, ClickAction action)
             => AddAssert($"input #{inputIndex} resulted in {action}", () => testPolicy.ClickActions[inputIndex], () => Is.EqualTo(action));
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index f4257a9ee7..909eb821cf 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -336,6 +336,52 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.IgnoreHit);
         }
 
+        [Test]
+        public void TestInputFallsThroughJudgedSliders()
+        {
+            const double time_first_slider = 1000;
+            const double time_second_slider = 1250;
+            Vector2 positionFirstSlider = new Vector2(100, 50);
+            Vector2 positionSecondSlider = new Vector2(100, 80);
+            var midpoint = (positionFirstSlider + positionSecondSlider) / 2;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestSlider
+                {
+                    StartTime = time_first_slider,
+                    Position = positionFirstSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                },
+                new TestSlider
+                {
+                    StartTime = time_second_slider,
+                    Position = positionSecondSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_slider, Position = midpoint, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_first_slider + 25, Position = midpoint, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_slider + 50, Position = midpoint },
+            });
+
+            addJudgementAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, HitResult.Great);
+            addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
+            addJudgementAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.Great);
+            addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, -200);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
@@ -354,6 +400,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, offset, 100));
         }
 
+        private void addJudgementOffsetAssert(string name, Func<OsuHitObject> hitObject, double offset)
+        {
+            AddAssert($"{name} @ judged at {offset}",
+                () => judgementResults.Single(r => r.HitObject == hitObject()).TimeOffset, () => Is.EqualTo(offset).Within(50));
+        }
+
         private ScoreAccessibleReplayPlayer currentPlayer;
         private List<JudgementResult> judgementResults;
 

From 03c61a573ec9f8f1e83cd98193fd84bd18a75043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Sep 2023 11:38:19 +0200
Subject: [PATCH 1290/2100] Block input to objects lying under already-hit
 hitcircles when classic note lock is active

---
 .../TestSceneLegacyHitPolicy.cs               |  2 ++
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   | 23 +++++++++++++++++++
 .../Objects/Drawables/DrawableHitCircle.cs    |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index c9aa44eb5a..615044b642 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -549,6 +549,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // the slider head of the first slider prevents the second slider's head from being hit, so the judgement offset should be very late.
+            // this is not strictly done by the hit policy implementation itself (see `OsuModClassic.blockInputToUnderlyingObjects()`),
+            // but we're testing this here anyways to just keep everything related to input handling and note lock in one place.
             addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, referenceHitWindows.WindowFor(HitResult.Meh));
             addClickActionAssert(0, ClickAction.Hit);
         }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 5dbf23f7ea..1d95f833b0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -74,6 +74,10 @@ namespace osu.Game.Rulesets.Osu.Mods
                     head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(head);
+
+                    if (ClassicNoteLock.Value)
+                        blockInputToUnderlyingObjects(head);
+
                     break;
 
                 case DrawableSliderTail tail:
@@ -83,10 +87,29 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableHitCircle circle:
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(circle);
+
+                    if (ClassicNoteLock.Value)
+                        blockInputToUnderlyingObjects(circle);
+
                     break;
             }
         }
 
+        /// <summary>
+        /// On stable, hitcircles that have already been hit block input from reaching objects that may be underneath them.
+        /// The purpose of this method is to restore that behaviour.
+        /// In order to avoid introducing yet another confusing config option, this behaviour is roped into the general notion of "note lock".
+        /// </summary>
+        private static void blockInputToUnderlyingObjects(DrawableHitCircle circle)
+        {
+            var oldHitAction = circle.HitArea.Hit;
+            circle.HitArea.Hit = () =>
+            {
+                oldHitAction?.Invoke();
+                return true;
+            };
+        }
+
         private void applyEarlyFading(DrawableHitCircle circle)
         {
             circle.ApplyCustomUpdateState += (dho, state) =>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 932f6d3fff..6beed0294d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     case OsuAction.RightButton:
                         if (IsHovered && (Hit?.Invoke() ?? false))
                         {
-                            HitAction = e.Action;
+                            HitAction ??= e.Action;
                             return true;
                         }
 

From 912c8b0901aba37b5d99eb06a4fa57d0e4267b83 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 6 Sep 2023 00:10:41 +0300
Subject: [PATCH 1291/2100] `currentSpins` -> `completedFullSpins`

---
 .../Objects/Drawables/DrawableSpinner.cs               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2d2a4a05ac..6611cca2bd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
-        private int currentSpins;
+        private int completedFullSpins;
 
         private void updateBonusScore()
         {
@@ -295,14 +295,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             int spins = (int)(Result.RateAdjustedRotation / 360);
 
-            if (spins < currentSpins)
+            if (spins < completedFullSpins)
             {
                 // rewinding, silently handle
-                currentSpins = spins;
+                completedFullSpins = spins;
                 return;
             }
 
-            while (currentSpins != spins)
+            while (completedFullSpins != spins)
             {
                 var tick = ticks.FirstOrDefault(t => !t.Result.HasResult);
 
@@ -315,7 +315,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                         gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequired);
                 }
 
-                currentSpins++;
+                completedFullSpins++;
             }
         }
     }

From 6d3a6b7a5dfb55abadb5e841dae457634b0dffbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Sep 2023 23:35:03 +0200
Subject: [PATCH 1292/2100] Fix `HitCircleLateFade` failures due to hitcircle
 not being loaded when applying mods

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index d74a31ada4..483155e646 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -142,6 +142,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             drawableHitCircle.Scale = new Vector2(2f);
 
+            LoadComponent(drawableHitCircle);
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObject>())
                 mod.ApplyToDrawableHitObject(drawableHitCircle);
 

From 5becac64312dccfeac0d91ad5bfb9893f743c1f6 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 14:43:43 -0700
Subject: [PATCH 1293/2100] Make beatmap non-nullable

Doesn't seem like it'll be null after first set: https://github.com/ppy/osu/blob/5454d1caa1927428fe339e3d5b47ddfe45f9dfb6/osu.Game/OsuGameBase.cs#L363
---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 834b3f07a0..52fe99d6b8 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -128,9 +128,9 @@ namespace osu.Game.Screens.Select
             this.FadeOut(200, Easing.OutQuint);
         }
 
-        private WorkingBeatmap? beatmap;
+        private WorkingBeatmap beatmap = null!;
 
-        public WorkingBeatmap? Beatmap
+        public WorkingBeatmap Beatmap
         {
             get => beatmap;
             set
@@ -149,12 +149,6 @@ namespace osu.Game.Screens.Select
         {
             Scheduler.AddOnce(() =>
             {
-                if (beatmap == null)
-                {
-                    removeOldInfo();
-                    return;
-                }
-
                 LoadComponentAsync(loadingInfo = new Container
                 {
                     Padding = new MarginPadding { Right = colour_bar_width },
@@ -198,8 +192,6 @@ namespace osu.Game.Screens.Select
 
             void removeOldInfo()
             {
-                State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
-
                 DisplayedContent?.FadeOut(transition_duration);
                 DisplayedContent?.Expire();
                 DisplayedContent = null;

From 676240928ea9ebb2dc86a3504c5128fb0550042b Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 14:57:55 -0700
Subject: [PATCH 1294/2100] Move actual star updating to star rating display

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs      | 6 ------
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs             | 8 ++++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index a7070f845e..a8484caf1c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -63,12 +63,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
             {
-                // Difficulty cache lookup is a pain in the ass to work with.
-                // This logic is ugly and needs to be reconsidered.
-
-                if (infoWedge.Info != null)
-                    infoWedge.Info!.ActualStars.Value = v;
-
                 foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
                     hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
             });
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 52fe99d6b8..596f90827f 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -186,7 +186,7 @@ namespace osu.Game.Screens.Select
                     {
                         // use actual stars as star counter has its own animation
                         starCounter.Current = (float)s.NewValue;
-                    });
+                    }, true);
                 });
             });
 
@@ -301,7 +301,6 @@ namespace osu.Game.Screens.Select
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
-                    ActualStars.Value = s.NewValue?.Stars ?? 0;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
                     if (!starRatingDisplay.IsPresent)
@@ -309,6 +308,11 @@ namespace osu.Game.Screens.Select
 
                     starRatingDisplay.FadeIn(transition_duration);
                 });
+
+                starRatingDisplay.Current.BindValueChanged(s =>
+                {
+                    ActualStars.Value = s.NewValue.Stars;
+                });
             }
 
             protected override void Dispose(bool isDisposing)

From 3f92dae55c38414521cde874eb6c2464b570e01b Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 15:20:20 -0700
Subject: [PATCH 1295/2100] Move star rating display and status pill out of
 reloadable content

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs |   2 +-
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 201 ++++++++----------
 2 files changed, 92 insertions(+), 111 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index a8484caf1c..2a3269ea0a 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
             {
-                foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
+                foreach (var hasCurrentValue in infoWedge.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
                     hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
             });
         }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 596f90827f..bde9df97d7 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -39,14 +39,22 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
+        [Resolved]
+        private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
+
         protected Container? DisplayedContent { get; private set; }
 
         protected WedgeInfoText? Info { get; private set; }
 
         private Container difficultyColourBar = null!;
         private StarCounter starCounter = null!;
+        private StarRatingDisplay starRatingDisplay = null!;
+        private BeatmapSetOnlineStatusPill statusPill = null!;
         private Container content = null!;
 
+        private IBindable<StarDifficulty?>? starDifficulty;
+        private CancellationTokenSource? cancellationSource;
+
         public BeatmapInfoWedgeV2()
         {
             Height = WEDGE_HEIGHT;
@@ -102,7 +110,38 @@ namespace osu.Game.Screens.Select
                             Scale = new Vector2(0.35f),
                             Direction = FillDirection.Vertical
                         }
-                    }
+                    },
+                    new FillFlowContainer
+                    {
+                        Name = "Topright-aligned metadata",
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding { Top = 3, Right = colour_bar_width + 8 },
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(0, 5),
+                        Depth = float.MinValue,
+                        Children = new Drawable[]
+                        {
+                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                Alpha = 0,
+                            },
+                            statusPill = new BeatmapSetOnlineStatusPill
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                TextSize = 11,
+                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
+                                Alpha = 0,
+                            }
+                        }
+                    },
                 }
             };
         }
@@ -112,6 +151,19 @@ namespace osu.Game.Screens.Select
             base.LoadComplete();
 
             ruleset.BindValueChanged(_ => updateDisplay());
+
+            starRatingDisplay.Current.BindValueChanged(s =>
+            {
+                // use actual stars as star counter has its own animation
+                starCounter.Current = (float)s.NewValue.Stars;
+            }, true);
+
+            starRatingDisplay.DisplayedStars.BindValueChanged(s =>
+            {
+                // sync color with star rating display
+                starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
+                difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
+            }, true);
         }
 
         private const double animation_duration = 600;
@@ -147,6 +199,17 @@ namespace osu.Game.Screens.Select
 
         private void updateDisplay()
         {
+            statusPill.Status = beatmap.BeatmapInfo.Status;
+
+            starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+
+            starDifficulty.BindValueChanged(s =>
+            {
+                starRatingDisplay.Current.Value = s.NewValue ?? default;
+
+                starRatingDisplay.FadeIn(transition_duration);
+            });
+
             Scheduler.AddOnce(() =>
             {
                 LoadComponentAsync(loadingInfo = new Container
@@ -174,19 +237,6 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     content.Add(DisplayedContent = d);
-
-                    Info.DisplayedStars.BindValueChanged(s =>
-                    {
-                        starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
-
-                        difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
-                    }, true);
-
-                    Info.ActualStars.BindValueChanged(s =>
-                    {
-                        // use actual stars as star counter has its own animation
-                        starCounter.Current = (float)s.NewValue;
-                    }, true);
                 });
             });
 
@@ -198,24 +248,20 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            cancellationSource?.Cancel();
+        }
+
         public partial class WedgeInfoText : Container
         {
             public OsuSpriteText TitleLabel { get; private set; } = null!;
             public OsuSpriteText ArtistLabel { get; private set; } = null!;
 
-            private StarRatingDisplay starRatingDisplay = null!;
-
             private readonly WorkingBeatmap working;
 
-            public IBindable<double> DisplayedStars => starRatingDisplay.DisplayedStars;
-            public Bindable<double> ActualStars = new Bindable<double>();
-
-            [Resolved]
-            private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
-
-            private IBindable<StarDifficulty?>? starDifficulty;
-            private CancellationTokenSource? cancellationSource;
-
             public WedgeInfoText(WorkingBeatmap working)
             {
                 this.working = working;
@@ -226,101 +272,36 @@ namespace osu.Game.Screens.Select
             [BackgroundDependencyLoader]
             private void load()
             {
-                var beatmapInfo = working.BeatmapInfo;
                 var metadata = working.Metadata;
 
-                Children = new Drawable[]
+                Child = new FillFlowContainer
                 {
-                    new FillFlowContainer
+                    Name = "Top-left aligned metadata",
+                    Direction = FillDirection.Vertical,
+                    Padding = new MarginPadding { Horizontal = text_margin + shear_width, Top = 12 },
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Children = new Drawable[]
                     {
-                        Name = "Topright-aligned metadata",
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Top = 3, Right = 8 },
-                        AutoSizeAxes = Axes.Both,
-                        Shear = wedged_container_shear,
-                        Spacing = new Vector2(0f, 5f),
-                        Children = new Drawable[]
+                        TitleLabel = new TruncatingSpriteText
                         {
-                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Shear = -wedged_container_shear,
-                                Alpha = 0f,
-                            },
-                            new BeatmapSetOnlineStatusPill
-                            {
-                                AutoSizeAxes = Axes.Both,
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Shear = -wedged_container_shear,
-                                TextSize = 11,
-                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
-                                Status = beatmapInfo.Status,
-                                Alpha = string.IsNullOrEmpty(beatmapInfo.DifficultyName) ? 0 : 1
-                            }
-                        }
-                    },
-                    new FillFlowContainer
-                    {
-                        Name = "Top-left aligned metadata",
-                        Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Horizontal = text_margin + shear_width, Top = 12 },
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Children = new Drawable[]
+                            Shadow = true,
+                            Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
+                            Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
+                            RelativeSizeAxes = Axes.X,
+                        },
+                        ArtistLabel = new TruncatingSpriteText
                         {
-                            TitleLabel = new TruncatingSpriteText
-                            {
-                                Shadow = true,
-                                Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
-                                Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
-                                RelativeSizeAxes = Axes.X,
-                            },
-                            ArtistLabel = new TruncatingSpriteText
-                            {
-                                // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
-                                Shadow = true,
-                                Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
-                                // Not sure if this should be semi bold or medium
-                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
-                                RelativeSizeAxes = Axes.X,
-                            }
+                            // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
+                            Shadow = true,
+                            Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
+                            // Not sure if this should be semi bold or medium
+                            Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
+                            RelativeSizeAxes = Axes.X,
                         }
                     }
                 };
             }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
-                starDifficulty.BindValueChanged(s =>
-                {
-                    starRatingDisplay.Current.Value = s.NewValue ?? default;
-
-                    // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
-                    if (!starRatingDisplay.IsPresent)
-                        starRatingDisplay.FinishTransforms(true);
-
-                    starRatingDisplay.FadeIn(transition_duration);
-                });
-
-                starRatingDisplay.Current.BindValueChanged(s =>
-                {
-                    ActualStars.Value = s.NewValue.Stars;
-                });
-            }
-
-            protected override void Dispose(bool isDisposing)
-            {
-                base.Dispose(isDisposing);
-
-                cancellationSource?.Cancel();
-            }
         }
     }
 }

From 8e8fae0fbaa3c94f74ea44175f57299d63c8a9f8 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 15:21:23 -0700
Subject: [PATCH 1296/2100] Fix left padding adding shear width

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index bde9df97d7..a7bfbc8214 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -278,7 +278,7 @@ namespace osu.Game.Screens.Select
                 {
                     Name = "Top-left aligned metadata",
                     Direction = FillDirection.Vertical,
-                    Padding = new MarginPadding { Horizontal = text_margin + shear_width, Top = 12 },
+                    Padding = new MarginPadding { Left = text_margin, Right = text_margin + shear_width, Top = 12 },
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
                     Children = new Drawable[]

From 9f10082ffcf292ec421a085acd815368f88c8f6f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 18:23:11 -0700
Subject: [PATCH 1297/2100] Revert param removal of delete beatmap and clear
 scores methods

---
 .../Select/FooterV2/BeatmapOptionsPopover.cs  |  4 ++--
 osu.Game/Screens/Select/SongSelect.cs         | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 550b3e5cf6..91f315f0d3 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -54,13 +54,13 @@ namespace osu.Game.Screens.Select.FooterV2
             addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
 
             addHeader("For all difficulties", beatmapWhenOpening.BeatmapSetInfo.ToString());
-            addButton(@"Delete beatmap", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(), colours.Red1);
+            addButton(@"Delete beatmap", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(beatmapWhenOpening.BeatmapSetInfo), colours.Red1);
 
             addHeader("For selected difficulty", beatmapWhenOpening.BeatmapInfo.DifficultyName);
             // TODO: make work, and make show "unplayed" or "played" based on status.
             addButton(@"Mark as played", FontAwesome.Regular.TimesCircle, null);
             addButton(@"Hide", FontAwesome.Solid.Magic, null);
-            addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(), colours.Red1);
+            addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(beatmapWhenOpening.BeatmapInfo), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
                 addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit());
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f6fc55b2a5..cca18b93af 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -311,9 +311,9 @@ namespace osu.Game.Screens.Select
                     Footer.AddButton(button, overlay);
 
                 BeatmapOptions.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, () => manageCollectionsDialog?.Show());
-                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, DeleteBeatmap);
+                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => DeleteBeatmap(Beatmap.Value.BeatmapSetInfo));
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
-                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, ClearScores);
+                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => ClearScores(Beatmap.Value.BeatmapInfo));
             }
 
             sampleChangeDifficulty = audio.Samples.Get(@"SongSelect/select-difficulty");
@@ -917,23 +917,23 @@ namespace osu.Game.Screens.Select
         }
 
         /// <summary>
-        /// Request to delete the current beatmap.
+        /// Request to delete a specific beatmap.
         /// </summary>
-        public void DeleteBeatmap()
+        public void DeleteBeatmap(BeatmapSetInfo? beatmap)
         {
-            if (Beatmap.Value.BeatmapSetInfo == null) return;
+            if (beatmap == null) return;
 
-            dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap.Value.BeatmapSetInfo));
+            dialogOverlay?.Push(new BeatmapDeleteDialog(beatmap));
         }
 
         /// <summary>
-        /// Request to clear the scores of the current beatmap.
+        /// Request to clear the scores of a specific beatmap.
         /// </summary>
-        public void ClearScores()
+        public void ClearScores(BeatmapInfo? beatmapInfo)
         {
-            if (Beatmap.Value.BeatmapInfo == null) return;
+            if (beatmapInfo == null) return;
 
-            dialogOverlay?.Push(new BeatmapClearScoresDialog(Beatmap.Value.BeatmapInfo, () =>
+            dialogOverlay?.Push(new BeatmapClearScoresDialog(beatmapInfo, () =>
                 // schedule done here rather than inside the dialog as the dialog may fade out and never callback.
                 Schedule(() => BeatmapDetails.Refresh())));
         }
@@ -969,7 +969,7 @@ namespace osu.Game.Screens.Select
                     if (e.ShiftPressed)
                     {
                         if (!Beatmap.IsDefault)
-                            DeleteBeatmap();
+                            DeleteBeatmap(Beatmap.Value.BeatmapSetInfo);
                         return true;
                     }
 

From 9565039192b87c9cf8db95e86d104725a0058f40 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 18:18:45 -0700
Subject: [PATCH 1298/2100] Hide beatmap options popover when beatmap changes

---
 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 91f315f0d3..2194d4946b 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -31,13 +31,16 @@ namespace osu.Game.Screens.Select.FooterV2
 
         private WorkingBeatmap beatmapWhenOpening = null!;
 
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
+
         public BeatmapOptionsPopover(FooterButtonOptionsV2 footerButton)
         {
             this.footerButton = footerButton;
         }
 
         [BackgroundDependencyLoader]
-        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours, IBindable<WorkingBeatmap> beatmap)
+        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours)
         {
             Content.Padding = new MarginPadding(5);
 
@@ -71,6 +74,8 @@ namespace osu.Game.Screens.Select.FooterV2
             base.LoadComplete();
 
             ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(this));
+
+            beatmap.BindValueChanged(_ => Hide());
         }
 
         [Resolved]

From 69fa8747f0f04b305be4de4f3cb3c708b199796d Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 18:35:35 -0700
Subject: [PATCH 1299/2100] Explicitly add beatmapinfo param to edit call

---
 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 2194d4946b..817b05bdeb 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Select.FooterV2
             addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(beatmapWhenOpening.BeatmapInfo), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
-                addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit());
+                addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
         }
 
         protected override void LoadComplete()

From 6d2e57b73e5aa7ffcf099e6dd7b9751e3142e861 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 18:43:42 -0700
Subject: [PATCH 1300/2100] Add localisation support to beatmap options popover

---
 osu.Game/Localisation/SongSelectStrings.cs    | 40 +++++++++++++++++++
 .../Select/FooterV2/BeatmapOptionsPopover.cs  | 23 ++++++-----
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Localisation/SongSelectStrings.cs b/osu.Game/Localisation/SongSelectStrings.cs
index e1ac328420..72c5643d52 100644
--- a/osu.Game/Localisation/SongSelectStrings.cs
+++ b/osu.Game/Localisation/SongSelectStrings.cs
@@ -19,6 +19,46 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString LocallyModifiedTooltip => new TranslatableString(getKey(@"locally_modified_tooltip"), @"Has been locally modified");
 
+        /// <summary>
+        /// "General"
+        /// </summary>
+        public static LocalisableString General => new TranslatableString(getKey(@"general"), @"General");
+
+        /// <summary>
+        /// "Manage collections"
+        /// </summary>
+        public static LocalisableString ManageCollections => new TranslatableString(getKey(@"manage_collections"), @"Manage collections");
+
+        /// <summary>
+        /// "For all difficulties"
+        /// </summary>
+        public static LocalisableString ForAllDifficulties => new TranslatableString(getKey(@"for_all_difficulties"), @"For all difficulties");
+
+        /// <summary>
+        /// "Delete beatmap"
+        /// </summary>
+        public static LocalisableString DeleteBeatmap => new TranslatableString(getKey(@"delete_beatmap"), @"Delete beatmap");
+
+        /// <summary>
+        /// "For selected difficulty"
+        /// </summary>
+        public static LocalisableString ForSelectedDifficulty => new TranslatableString(getKey(@"for_selected_difficulty"), @"For selected difficulty");
+
+        /// <summary>
+        /// "Mark as played"
+        /// </summary>
+        public static LocalisableString MarkAsPlayed => new TranslatableString(getKey(@"mark_as_played"), @"Mark as played");
+
+        /// <summary>
+        /// "Clear all local scores"
+        /// </summary>
+        public static LocalisableString ClearAllLocalScores => new TranslatableString(getKey(@"clear_all_local_scores"), @"Clear all local scores");
+
+        /// <summary>
+        /// "Edit beatmap"
+        /// </summary>
+        public static LocalisableString EditBeatmap => new TranslatableString(getKey(@"edit_beatmap"), @"Edit beatmap");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 817b05bdeb..20b9da4778 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 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.Graphics.Sprites;
@@ -21,6 +22,8 @@ using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
+using osu.Game.Localisation;
+using CommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
 
 namespace osu.Game.Screens.Select.FooterV2
 {
@@ -53,20 +56,20 @@ namespace osu.Game.Screens.Select.FooterV2
 
             beatmapWhenOpening = beatmap.Value;
 
-            addHeader("General");
-            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
+            addHeader(SongSelectStrings.General);
+            addButton(SongSelectStrings.ManageCollections, FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
 
-            addHeader("For all difficulties", beatmapWhenOpening.BeatmapSetInfo.ToString());
-            addButton(@"Delete beatmap", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(beatmapWhenOpening.BeatmapSetInfo), colours.Red1);
+            addHeader(SongSelectStrings.ForAllDifficulties, beatmapWhenOpening.BeatmapSetInfo.ToString());
+            addButton(SongSelectStrings.DeleteBeatmap, FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(beatmapWhenOpening.BeatmapSetInfo), colours.Red1);
 
-            addHeader("For selected difficulty", beatmapWhenOpening.BeatmapInfo.DifficultyName);
+            addHeader(SongSelectStrings.ForSelectedDifficulty, beatmapWhenOpening.BeatmapInfo.DifficultyName);
             // TODO: make work, and make show "unplayed" or "played" based on status.
-            addButton(@"Mark as played", FontAwesome.Regular.TimesCircle, null);
-            addButton(@"Hide", FontAwesome.Solid.Magic, null);
-            addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(beatmapWhenOpening.BeatmapInfo), colours.Red1);
+            addButton(SongSelectStrings.MarkAsPlayed, FontAwesome.Regular.TimesCircle, null);
+            addButton(CommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, null);
+            addButton(SongSelectStrings.ClearAllLocalScores, FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(beatmapWhenOpening.BeatmapInfo), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
-                addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
+                addButton(SongSelectStrings.EditBeatmap, FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
         }
 
         protected override void LoadComplete()
@@ -81,7 +84,7 @@ namespace osu.Game.Screens.Select.FooterV2
         [Resolved]
         private OverlayColourProvider overlayColourProvider { get; set; } = null!;
 
-        private void addHeader(string text, string? context = null)
+        private void addHeader(LocalisableString text, string? context = null)
         {
             var textFlow = new OsuTextFlowContainer
             {

From 701e24e8d30467b52f5eadd871e42e4633d3cf5e Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 18:50:24 -0700
Subject: [PATCH 1301/2100] Move hide button to end and make it work

---
 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 20b9da4778..0a874cb653 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Select.FooterV2
         }
 
         [BackgroundDependencyLoader]
-        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours)
+        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours, BeatmapManager? beatmapManager)
         {
             Content.Padding = new MarginPadding(5);
 
@@ -65,11 +65,12 @@ namespace osu.Game.Screens.Select.FooterV2
             addHeader(SongSelectStrings.ForSelectedDifficulty, beatmapWhenOpening.BeatmapInfo.DifficultyName);
             // TODO: make work, and make show "unplayed" or "played" based on status.
             addButton(SongSelectStrings.MarkAsPlayed, FontAwesome.Regular.TimesCircle, null);
-            addButton(CommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, null);
             addButton(SongSelectStrings.ClearAllLocalScores, FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(beatmapWhenOpening.BeatmapInfo), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
                 addButton(SongSelectStrings.EditBeatmap, FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
+
+            addButton(CommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, () => beatmapManager?.Hide(beatmapWhenOpening.BeatmapInfo));
         }
 
         protected override void LoadComplete()

From 73604d171ab5b31a0307d08e11bc37acafccf3d5 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 23:00:07 -0700
Subject: [PATCH 1302/2100] Make "general" a common string

---
 osu.Game/Localisation/CommonStrings.cs                    | 5 +++++
 osu.Game/Localisation/DebugSettingsStrings.cs             | 5 -----
 osu.Game/Localisation/GameplaySettingsStrings.cs          | 5 -----
 osu.Game/Localisation/GeneralSettingsStrings.cs           | 5 -----
 osu.Game/Localisation/SongSelectStrings.cs                | 5 -----
 osu.Game/Localisation/UserInterfaceStrings.cs             | 5 -----
 osu.Game/Overlays/OSD/CopyUrlToast.cs                     | 2 +-
 .../Settings/Sections/DebugSettings/GeneralSettings.cs    | 2 +-
 .../Settings/Sections/Gameplay/GeneralSettings.cs         | 2 +-
 osu.Game/Overlays/Settings/Sections/GeneralSection.cs     | 2 +-
 .../Settings/Sections/UserInterface/GeneralSettings.cs    | 2 +-
 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs | 8 ++++----
 12 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index 480d68619d..2c377a81d9 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -169,6 +169,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString RevertToDefault => new TranslatableString(getKey(@"revert_to_default"), @"Revert to default");
 
+        /// <summary>
+        /// "General"
+        /// </summary>
+        public static LocalisableString General => new TranslatableString(getKey(@"general"), @"General");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Localisation/DebugSettingsStrings.cs b/osu.Game/Localisation/DebugSettingsStrings.cs
index dd21739096..18fd3e83da 100644
--- a/osu.Game/Localisation/DebugSettingsStrings.cs
+++ b/osu.Game/Localisation/DebugSettingsStrings.cs
@@ -14,11 +14,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString DebugSectionHeader => new TranslatableString(getKey(@"debug_section_header"), @"Debug");
 
-        /// <summary>
-        /// "General"
-        /// </summary>
-        public static LocalisableString GeneralHeader => new TranslatableString(getKey(@"general_header"), @"General");
-
         /// <summary>
         /// "Show log overlay"
         /// </summary>
diff --git a/osu.Game/Localisation/GameplaySettingsStrings.cs b/osu.Game/Localisation/GameplaySettingsStrings.cs
index f52f6abb89..8ee76fdd55 100644
--- a/osu.Game/Localisation/GameplaySettingsStrings.cs
+++ b/osu.Game/Localisation/GameplaySettingsStrings.cs
@@ -19,11 +19,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString BeatmapHeader => new TranslatableString(getKey(@"beatmap_header"), @"Beatmap");
 
-        /// <summary>
-        /// "General"
-        /// </summary>
-        public static LocalisableString GeneralHeader => new TranslatableString(getKey(@"general_header"), @"General");
-
         /// <summary>
         /// "Audio"
         /// </summary>
diff --git a/osu.Game/Localisation/GeneralSettingsStrings.cs b/osu.Game/Localisation/GeneralSettingsStrings.cs
index a525af508b..ebf57d8109 100644
--- a/osu.Game/Localisation/GeneralSettingsStrings.cs
+++ b/osu.Game/Localisation/GeneralSettingsStrings.cs
@@ -9,11 +9,6 @@ namespace osu.Game.Localisation
     {
         private const string prefix = @"osu.Game.Resources.Localisation.GeneralSettings";
 
-        /// <summary>
-        /// "General"
-        /// </summary>
-        public static LocalisableString GeneralSectionHeader => new TranslatableString(getKey(@"general_section_header"), @"General");
-
         /// <summary>
         /// "Language"
         /// </summary>
diff --git a/osu.Game/Localisation/SongSelectStrings.cs b/osu.Game/Localisation/SongSelectStrings.cs
index 72c5643d52..e715ba8880 100644
--- a/osu.Game/Localisation/SongSelectStrings.cs
+++ b/osu.Game/Localisation/SongSelectStrings.cs
@@ -19,11 +19,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString LocallyModifiedTooltip => new TranslatableString(getKey(@"locally_modified_tooltip"), @"Has been locally modified");
 
-        /// <summary>
-        /// "General"
-        /// </summary>
-        public static LocalisableString General => new TranslatableString(getKey(@"general"), @"General");
-
         /// <summary>
         /// "Manage collections"
         /// </summary>
diff --git a/osu.Game/Localisation/UserInterfaceStrings.cs b/osu.Game/Localisation/UserInterfaceStrings.cs
index ea664d7b50..612668171c 100644
--- a/osu.Game/Localisation/UserInterfaceStrings.cs
+++ b/osu.Game/Localisation/UserInterfaceStrings.cs
@@ -14,11 +14,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString UserInterfaceSectionHeader => new TranslatableString(getKey(@"user_interface_section_header"), @"User Interface");
 
-        /// <summary>
-        /// "General"
-        /// </summary>
-        public static LocalisableString GeneralHeader => new TranslatableString(getKey(@"general_header"), @"General");
-
         /// <summary>
         /// "Rotate cursor when dragging"
         /// </summary>
diff --git a/osu.Game/Overlays/OSD/CopyUrlToast.cs b/osu.Game/Overlays/OSD/CopyUrlToast.cs
index ce5a5f56c4..2c5a9179f2 100644
--- a/osu.Game/Overlays/OSD/CopyUrlToast.cs
+++ b/osu.Game/Overlays/OSD/CopyUrlToast.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Overlays.OSD
     public partial class CopyUrlToast : Toast
     {
         public CopyUrlToast()
-            : base(UserInterfaceStrings.GeneralHeader, ToastStrings.UrlCopied, "")
+            : base(CommonStrings.General, ToastStrings.UrlCopied, "")
         {
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
index cf97743fde..049ccedf37 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
 {
     public partial class GeneralSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => DebugSettingsStrings.GeneralHeader;
+        protected override LocalisableString Header => CommonStrings.General;
 
         [BackgroundDependencyLoader]
         private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, IPerformFromScreenRunner? performer)
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index c7f5aa5665..83e9140b33 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
 {
     public partial class GeneralSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => GameplaySettingsStrings.GeneralHeader;
+        protected override LocalisableString Header => CommonStrings.General;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
index f4a79d65e6..2b043d40bc 100644
--- a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections
         [Resolved(CanBeNull = true)]
         private OsuGame? game { get; set; }
 
-        public override LocalisableString Header => GeneralSettingsStrings.GeneralSectionHeader;
+        public override LocalisableString Header => CommonStrings.General;
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
index 844b8aeac6..3f39980b43 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
     public partial class GeneralSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => UserInterfaceStrings.GeneralHeader;
+        protected override LocalisableString Header => CommonStrings.General;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 0a874cb653..f81036f745 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -18,12 +18,12 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
-using osu.Game.Localisation;
-using CommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
+using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
 
 namespace osu.Game.Screens.Select.FooterV2
 {
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Select.FooterV2
 
             beatmapWhenOpening = beatmap.Value;
 
-            addHeader(SongSelectStrings.General);
+            addHeader(CommonStrings.General);
             addButton(SongSelectStrings.ManageCollections, FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
 
             addHeader(SongSelectStrings.ForAllDifficulties, beatmapWhenOpening.BeatmapSetInfo.ToString());
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Select.FooterV2
             if (songSelect != null && songSelect.AllowEditing)
                 addButton(SongSelectStrings.EditBeatmap, FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
 
-            addButton(CommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, () => beatmapManager?.Hide(beatmapWhenOpening.BeatmapInfo));
+            addButton(WebCommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, () => beatmapManager?.Hide(beatmapWhenOpening.BeatmapInfo));
         }
 
         protected override void LoadComplete()

From 034c887dcb3c71a2be8dd92911c86ac128ada2dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 15:04:25 +0900
Subject: [PATCH 1303/2100] Add animation support for beatmap status pills

To be used in conjunction with https://github.com/ppy/osu/pull/22116
---
 .../TestSceneBeatmapSetOnlineStatusPill.cs    | 28 +++++++++++++++++
 .../Drawables/BeatmapSetOnlineStatusPill.cs   | 30 +++++++++++++++----
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs
index 88e47ea560..dcc4654437 100644
--- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs
@@ -47,7 +47,35 @@ namespace osu.Game.Tests.Visual.Beatmaps
                 pill.AutoSizeAxes = Axes.Y;
                 pill.Width = 90;
             }));
+
             AddStep("unset fixed width", () => statusPills.ForEach(pill => pill.AutoSizeAxes = Axes.Both));
         }
+
+        [Test]
+        public void TestChangeLabels()
+        {
+            AddStep("Change labels", () =>
+            {
+                foreach (var pill in this.ChildrenOfType<BeatmapSetOnlineStatusPill>())
+                {
+                    switch (pill.Status)
+                    {
+                        // cycle at end
+                        case BeatmapOnlineStatus.Loved:
+                            pill.Status = BeatmapOnlineStatus.LocallyModified;
+                            break;
+
+                        // skip none
+                        case BeatmapOnlineStatus.LocallyModified:
+                            pill.Status = BeatmapOnlineStatus.Graveyard;
+                            break;
+
+                        default:
+                            pill.Status = (pill.Status + 1);
+                            break;
+                    }
+                }
+            });
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
index c353b9e904..f18355505a 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Beatmaps.Drawables
 {
     public partial class BeatmapSetOnlineStatusPill : CircularContainer, IHasTooltip
     {
+        private const double animation_duration = 400;
+
         private BeatmapOnlineStatus status;
 
         public BeatmapOnlineStatus Status
@@ -32,7 +34,12 @@ namespace osu.Game.Beatmaps.Drawables
                 status = value;
 
                 if (IsLoaded)
+                {
+                    AutoSizeDuration = (float)animation_duration;
+                    AutoSizeEasing = Easing.OutQuint;
+
                     updateState();
+                }
             }
         }
 
@@ -61,6 +68,8 @@ namespace osu.Game.Beatmaps.Drawables
         {
             Masking = true;
 
+            Alpha = 0;
+
             Children = new Drawable[]
             {
                 background = new Box
@@ -83,21 +92,32 @@ namespace osu.Game.Beatmaps.Drawables
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
             updateState();
+            FinishTransforms(true);
         }
 
         private void updateState()
         {
-            Alpha = Status == BeatmapOnlineStatus.None ? 0 : 1;
+            if (Status == BeatmapOnlineStatus.None)
+            {
+                this.FadeOut(animation_duration, Easing.OutQuint);
+                return;
+            }
 
-            statusText.Text = Status.GetLocalisableDescription().ToUpper();
+            this.FadeIn(animation_duration, Easing.OutQuint);
+
+            Color4 statusTextColour;
 
             if (colourProvider != null)
-                statusText.Colour = status == BeatmapOnlineStatus.Graveyard ? colourProvider.Background1 : colourProvider.Background3;
+                statusTextColour = status == BeatmapOnlineStatus.Graveyard ? colourProvider.Background1 : colourProvider.Background3;
             else
-                statusText.Colour = status == BeatmapOnlineStatus.Graveyard ? colours.GreySeaFoamLight : Color4.Black;
+                statusTextColour = status == BeatmapOnlineStatus.Graveyard ? colours.GreySeaFoamLight : Color4.Black;
 
-            background.Colour = OsuColour.ForBeatmapSetOnlineStatus(Status) ?? colourProvider?.Light1 ?? colours.GreySeaFoamLighter;
+            statusText.FadeColour(statusTextColour, animation_duration, Easing.OutQuint);
+            background.FadeColour(OsuColour.ForBeatmapSetOnlineStatus(Status) ?? colourProvider?.Light1 ?? colours.GreySeaFoamLighter, animation_duration, Easing.OutQuint);
+
+            statusText.Text = Status.GetLocalisableDescription().ToUpper();
         }
 
         public LocalisableString TooltipText

From b884f1af4aada2a8e196be5b0102b19c354df79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Sep 2023 08:18:39 +0200
Subject: [PATCH 1304/2100] Assign random statuses to beatmap sets in carousel
 test

Just to have visual coverage of the statuses before fixing them not
propagating to split difficulty mode.
---
 .../Visual/SongSelect/TestSceneBeatmapCarousel.cs     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 040b341584..c509d40e07 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -515,6 +515,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             checkVisibleItemCount(false, local_set_count * local_diff_count);
 
             var firstAdded = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
+            firstAdded.Status = BeatmapOnlineStatus.Loved;
 
             AddStep("Add new set", () => carousel.UpdateBeatmapSet(firstAdded));
 
@@ -1176,12 +1177,18 @@ namespace osu.Game.Tests.Visual.SongSelect
             if (beatmapSets == null)
             {
                 beatmapSets = new List<BeatmapSetInfo>();
+                var statuses = Enum.GetValues<BeatmapOnlineStatus>()
+                                   .Except(new[] { BeatmapOnlineStatus.None }) // make sure a badge is always shown.
+                                   .ToArray();
 
                 for (int i = 1; i <= (setCount ?? set_count); i++)
                 {
-                    beatmapSets.Add(randomDifficulties
+                    var set = randomDifficulties
                         ? TestResources.CreateTestBeatmapSetInfo()
-                        : TestResources.CreateTestBeatmapSetInfo(diffCount ?? diff_count));
+                        : TestResources.CreateTestBeatmapSetInfo(diffCount ?? diff_count);
+                    set.Status = statuses[RNG.Next(statuses.Length)];
+
+                    beatmapSets.Add(set);
                 }
             }
 

From 63e92f8fabe450cd317e69286d8dbf033041b755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Sep 2023 08:25:19 +0200
Subject: [PATCH 1305/2100] Fix status on carousel beatmap set not showing in
 split difficulty mode

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 9ea94b2a52..16ae54b413 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -145,7 +145,8 @@ namespace osu.Game.Screens.Select
                     return createCarouselSet(new BeatmapSetInfo(new[] { b })
                     {
                         ID = b.BeatmapSet!.ID,
-                        OnlineID = b.BeatmapSet!.OnlineID
+                        OnlineID = b.BeatmapSet!.OnlineID,
+                        Status = b.BeatmapSet!.Status,
                     });
                 }).OfType<CarouselBeatmapSet>();
 
@@ -431,7 +432,8 @@ namespace osu.Game.Screens.Select
                     var newSet = createCarouselSet(new BeatmapSetInfo(new[] { beatmap })
                     {
                         ID = beatmapSet.ID,
-                        OnlineID = beatmapSet.OnlineID
+                        OnlineID = beatmapSet.OnlineID,
+                        Status = beatmapSet.Status,
                     });
 
                     if (newSet != null)

From 6c95b88589d60f1406959437e6aa2f04d202d722 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 17:37:17 +0900
Subject: [PATCH 1306/2100] Add debug output for skin configuration lookups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We've struggle with debugging these over the years so I think this was
worth a couple of hours of work.

Example of osu! lookups:

```log
[runtime] 2023-09-06 08:38:30 [verbose]: BeatmapSkinProvidingContainer.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacyBeatmapSkin{ Name: Vickeblanka - Lucky Ending (TV Size) (tears_) [Normal] } } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: SpinnerFrequencyModulate) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: SpinnerFrequencyModulate) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: osu.Game.Skinning.ResourceStoreBackedSkin }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-osu.Game.Skinning.ResourceStoreBackedSkin.GetConfig(lookup: SpinnerFrequencyModulate) 🔴
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: TrianglesSkin{ Name: osu! "triangles" (2017) } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-TrianglesSkin{ Name: osu! "triangles" (2017) }.GetConfig(lookup: SpinnerFrequencyModulate) 🔴
[runtime] 2023-09-06 08:38:30 [verbose]:
[runtime] 2023-09-06 08:38:30 [verbose]: BeatmapSkinProvidingContainer.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacyBeatmapSkin{ Name: Vickeblanka - Lucky Ending (TV Size) (tears_) [Normal] } } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: ScorePrefix) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: ScorePrefix) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: osu.Game.Skinning.ResourceStoreBackedSkin }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-osu.Game.Skinning.ResourceStoreBackedSkin.GetConfig(lookup: ScorePrefix) 🔴
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: TrianglesSkin{ Name: osu! "triangles" (2017) } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-TrianglesSkin{ Name: osu! "triangles" (2017) }.GetConfig(lookup: ScorePrefix) 🔴
```

Example of osu!mania lookups:

```log
[runtime] 2023-09-06 08:28:34 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnWidth col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnWidth col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4]) 🔴
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnWidth col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4]) 🟢
[runtime] 2023-09-06 08:28:34 [verbose]:
[runtime] 2023-09-06 08:28:34 [verbose]: BeatmapSkinProvidingContainer.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacyBeatmapSkin{ Name: antiPLUR - Runengon (Raveille) [Easy] } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4]) 🔴
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4]) 🟢
[runtime] 2023-09-06 08:28:34 [verbose]:

```
---
 .../Skinning/ManiaSkinConfigurationLookup.cs  |  2 +
 osu.Game/Skinning/ArgonSkin.cs                |  5 ++
 osu.Game/Skinning/LegacyBeatmapSkin.cs        |  2 +
 .../LegacyManiaSkinConfigurationLookup.cs     |  2 +
 osu.Game/Skinning/LegacySkin.cs               | 74 +++++++++++--------
 osu.Game/Skinning/ResourceStoreBackedSkin.cs  |  5 +-
 osu.Game/Skinning/Skin.cs                     | 52 +++++++++++++
 osu.Game/Skinning/SkinManager.cs              | 19 +++--
 osu.Game/Skinning/SkinProvidingContainer.cs   | 65 ++++++++++------
 osu.Game/Skinning/SkinTransformer.cs          | 15 +++-
 osu.Game/Skinning/TrianglesSkin.cs            |  5 ++
 11 files changed, 185 insertions(+), 61 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
index 6c39ffdcc3..aa50aeb130 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
@@ -30,5 +30,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             Lookup = lookup;
             ColumnIndex = columnIndex;
         }
+
+        public override string ToString() => $"[{nameof(ManiaSkinConfigurationLookup)} lookup:{Lookup} col:{ColumnIndex}]";
     }
 }
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 61b0dc5aa1..6e17458082 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -219,15 +219,20 @@ namespace osu.Game.Skinning
                     switch (global)
                     {
                         case GlobalSkinColours.ComboColours:
+                        {
+                            LogLookupDebug(this, lookup, LookupDebugType.Hit);
                             return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>?>(Configuration.ComboColours));
+                        }
                     }
 
                     break;
 
                 case SkinComboColourLookup comboColour:
+                    LogLookupDebug(this, lookup, LookupDebugType.Hit);
                     return SkinUtils.As<TValue>(new Bindable<Color4>(getComboColour(Configuration, comboColour.ColourIndex)));
             }
 
+            LogLookupDebug(this, lookup, LookupDebugType.Miss);
             return null;
         }
 
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 1cbfda16cf..83dcc3895d 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -72,6 +72,8 @@ namespace osu.Game.Skinning
                     // If it is decided that we need this due to beatmaps somehow using it, the default (1.0 specified in LegacySkinDecoder.CreateTemplateObject)
                     // needs to be removed else it will cause incorrect skin behaviours. This is due to the config lookup having no context of which skin
                     // it should be returning the version for.
+
+                    Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Miss);
                     return null;
             }
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index a2408a92bb..784e57708e 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Skinning
             Lookup = lookup;
             ColumnIndex = columnIndex;
         }
+
+        public override string ToString() => $"[{nameof(LegacyManiaSkinConfigurationLookup)} lookup:{Lookup} col:{ColumnIndex} totalcols:{TotalColumns}]";
     }
 
     public enum LegacyManiaSkinConfigurationLookups
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index cf51fa8f74..ab0d608d3e 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -84,48 +84,58 @@ namespace osu.Game.Skinning
 
         public override IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
         {
-            switch (lookup)
+            bool wasHit = true;
+
+            try
             {
-                case GlobalSkinColours colour:
-                    switch (colour)
-                    {
-                        case GlobalSkinColours.ComboColours:
-                            var comboColours = Configuration.ComboColours;
-                            if (comboColours != null)
-                                return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>>(comboColours));
+                switch (lookup)
+                {
+                    case GlobalSkinColours colour:
+                        switch (colour)
+                        {
+                            case GlobalSkinColours.ComboColours:
+                                var comboColours = Configuration.ComboColours;
+                                if (comboColours != null)
+                                    return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>>(comboColours));
 
-                            break;
+                                break;
 
-                        default:
-                            return SkinUtils.As<TValue>(getCustomColour(Configuration, colour.ToString()));
-                    }
+                            default:
+                                return SkinUtils.As<TValue>(getCustomColour(Configuration, colour.ToString()));
+                        }
 
-                    break;
-
-                case SkinComboColourLookup comboColour:
-                    return SkinUtils.As<TValue>(GetComboColour(Configuration, comboColour.ColourIndex, comboColour.Combo));
-
-                case SkinCustomColourLookup customColour:
-                    return SkinUtils.As<TValue>(getCustomColour(Configuration, customColour.Lookup.ToString() ?? string.Empty));
-
-                case LegacyManiaSkinConfigurationLookup maniaLookup:
-                    if (!AllowManiaSkin)
                         break;
 
-                    var result = lookupForMania<TValue>(maniaLookup);
-                    if (result != null)
-                        return result;
+                    case SkinComboColourLookup comboColour:
+                        return SkinUtils.As<TValue>(GetComboColour(Configuration, comboColour.ColourIndex, comboColour.Combo));
 
-                    break;
+                    case SkinCustomColourLookup customColour:
+                        return SkinUtils.As<TValue>(getCustomColour(Configuration, customColour.Lookup.ToString() ?? string.Empty));
 
-                case SkinConfiguration.LegacySetting legacy:
-                    return legacySettingLookup<TValue>(legacy);
+                    case LegacyManiaSkinConfigurationLookup maniaLookup:
+                        if (!AllowManiaSkin)
+                            break;
 
-                default:
-                    return genericLookup<TLookup, TValue>(lookup);
+                        var result = lookupForMania<TValue>(maniaLookup);
+                        if (result != null)
+                            return result;
+
+                        break;
+
+                    case SkinConfiguration.LegacySetting legacy:
+                        return legacySettingLookup<TValue>(legacy);
+
+                    default:
+                        return genericLookup<TLookup, TValue>(lookup);
+                }
+
+                wasHit = false;
+                return null;
+            }
+            finally
+            {
+                LogLookupDebug(this, lookup, wasHit ? LookupDebugType.Hit : LookupDebugType.Miss);
             }
-
-            return null;
         }
 
         private IBindable<TValue>? lookupForMania<TValue>(LegacyManiaSkinConfigurationLookup maniaLookup)
diff --git a/osu.Game/Skinning/ResourceStoreBackedSkin.cs b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
index f5c6192ba5..206c400a88 100644
--- a/osu.Game/Skinning/ResourceStoreBackedSkin.cs
+++ b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
@@ -46,7 +46,10 @@ namespace osu.Game.Skinning
         public IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
             where TLookup : notnull
             where TValue : notnull
-            => null;
+        {
+            Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Miss);
+            return null;
+        }
 
         public void Dispose()
         {
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index a6250d7488..d979cab72b 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -6,10 +6,13 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
+using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
@@ -54,6 +57,8 @@ namespace osu.Game.Skinning
 
         private readonly RealmBackedResourceStore<SkinInfo>? realmBackedStorage;
 
+        public string Name { get; }
+
         /// <summary>
         /// Construct a new skin.
         /// </summary>
@@ -63,6 +68,8 @@ namespace osu.Game.Skinning
         /// <param name="configurationFilename">An optional filename to read the skin configuration from. If not provided, the configuration will be retrieved from the storage using "skin.ini".</param>
         protected Skin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? storage = null, string configurationFilename = @"skin.ini")
         {
+            Name = skin.Name;
+
             if (resources != null)
             {
                 SkinInfo = skin.ToLive(resources.RealmAccess);
@@ -239,5 +246,50 @@ namespace osu.Game.Skinning
         }
 
         #endregion
+
+        public override string ToString() => $"{GetType().ReadableName()}{{ Name: {Name} }}";
+
+        private static readonly ThreadLocal<int> nested_level = new ThreadLocal<int>(() => 0);
+
+        [Conditional("SKIN_LOOKUP_DEBUG")]
+        internal static void LogLookupDebug(object callingClass, object lookup, LookupDebugType type, [CallerMemberName] string callerMethod = "")
+        {
+            string icon = string.Empty;
+            int level = nested_level.Value;
+
+            switch (type)
+            {
+                case LookupDebugType.Hit:
+                    icon = "🟢";
+                    break;
+
+                case LookupDebugType.Miss:
+                    icon = "🔴";
+                    break;
+
+                case LookupDebugType.Enter:
+                    nested_level.Value++;
+                    break;
+
+                case LookupDebugType.Exit:
+                    nested_level.Value--;
+                    if (nested_level.Value == 0)
+                        Logger.Log(string.Empty);
+                    return;
+            }
+
+            string lookupString = lookup.ToString() ?? string.Empty;
+            string callingClassString = callingClass.ToString() ?? string.Empty;
+
+            Logger.Log($"{string.Join(null, Enumerable.Repeat("|-", level))}{callingClassString}.{callerMethod}(lookup: {lookupString}) {icon}");
+        }
+
+        internal enum LookupDebugType
+        {
+            Hit,
+            Miss,
+            Enter,
+            Exit
+        }
     }
 }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 51605c6045..ca46d3af0c 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -261,13 +261,22 @@ namespace osu.Game.Skinning
         private T lookupWithFallback<T>(Func<ISkin, T> lookupFunction)
             where T : class
         {
-            foreach (var source in AllSources)
+            try
             {
-                if (lookupFunction(source) is T skinSourced)
-                    return skinSourced;
-            }
+                Skin.LogLookupDebug(this, lookupFunction, Skin.LookupDebugType.Enter);
 
-            return null;
+                foreach (var source in AllSources)
+                {
+                    if (lookupFunction(source) is T skinSourced)
+                        return skinSourced;
+                }
+
+                return null;
+            }
+            finally
+            {
+                Skin.LogLookupDebug(this, lookupFunction, Skin.LookupDebugType.Exit);
+            }
         }
 
         #region IResourceStorageProvider
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 2612e0b47c..2d2a2e48f6 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
@@ -161,17 +162,26 @@ namespace osu.Game.Skinning
             where TLookup : notnull
             where TValue : notnull
         {
-            foreach (var (_, lookupWrapper) in skinSources)
+            try
             {
-                IBindable<TValue>? bindable;
-                if ((bindable = lookupWrapper.GetConfig<TLookup, TValue>(lookup)) != null)
-                    return bindable;
+                Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Enter);
+
+                foreach (var (_, lookupWrapper) in skinSources)
+                {
+                    IBindable<TValue>? bindable;
+                    if ((bindable = lookupWrapper.GetConfig<TLookup, TValue>(lookup)) != null)
+                        return bindable;
+                }
+
+                if (!AllowFallingBackToParent)
+                    return null;
+
+                return ParentSource?.GetConfig<TLookup, TValue>(lookup);
+            }
+            finally
+            {
+                Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Exit);
             }
-
-            if (!AllowFallingBackToParent)
-                return null;
-
-            return ParentSource?.GetConfig<TLookup, TValue>(lookup);
         }
 
         /// <summary>
@@ -271,25 +281,36 @@ namespace osu.Game.Skinning
                 where TLookup : notnull
                 where TValue : notnull
             {
-                switch (lookup)
+                try
                 {
-                    case GlobalSkinColours:
-                    case SkinComboColourLookup:
-                    case SkinCustomColourLookup:
-                        if (provider.AllowColourLookup)
-                            return skin.GetConfig<TLookup, TValue>(lookup);
+                    Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Enter);
 
-                        break;
+                    switch (lookup)
+                    {
+                        case GlobalSkinColours:
+                        case SkinComboColourLookup:
+                        case SkinCustomColourLookup:
+                            if (provider.AllowColourLookup)
+                                return skin.GetConfig<TLookup, TValue>(lookup);
 
-                    default:
-                        if (provider.AllowConfigurationLookup)
-                            return skin.GetConfig<TLookup, TValue>(lookup);
+                            break;
 
-                        break;
+                        default:
+                            if (provider.AllowConfigurationLookup)
+                                return skin.GetConfig<TLookup, TValue>(lookup);
+
+                            break;
+                    }
+
+                    return null;
+                }
+                finally
+                {
+                    Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Exit);
                 }
-
-                return null;
             }
+
+            public override string ToString() => $"{GetType().ReadableName()}{{ skin: {skin} }}";
         }
     }
 }
diff --git a/osu.Game/Skinning/SkinTransformer.cs b/osu.Game/Skinning/SkinTransformer.cs
index ed5b04da1e..4e7dd4f222 100644
--- a/osu.Game/Skinning/SkinTransformer.cs
+++ b/osu.Game/Skinning/SkinTransformer.cs
@@ -34,6 +34,19 @@ namespace osu.Game.Skinning
 
         public virtual ISample? GetSample(ISampleInfo sampleInfo) => Skin.GetSample(sampleInfo);
 
-        public virtual IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup) where TLookup : notnull where TValue : notnull => Skin.GetConfig<TLookup, TValue>(lookup);
+        public virtual IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup) where TLookup : notnull where TValue : notnull
+        {
+            try
+            {
+                Skinning.Skin.LogLookupDebug(this, lookup, Skinning.Skin.LookupDebugType.Enter);
+                return Skin.GetConfig<TLookup, TValue>(lookup);
+            }
+            finally
+            {
+                Skinning.Skin.LogLookupDebug(this, lookup, Skinning.Skin.LookupDebugType.Exit);
+            }
+        }
+
+        public override string ToString() => $"{nameof(SkinTransformer)}{{ Skin: {Skin} }}";
     }
 }
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index 0957f60579..a2dca5d333 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -190,15 +190,20 @@ namespace osu.Game.Skinning
                     switch (global)
                     {
                         case GlobalSkinColours.ComboColours:
+                        {
+                            LogLookupDebug(this, lookup, LookupDebugType.Hit);
                             return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>?>(Configuration.ComboColours));
+                        }
                     }
 
                     break;
 
                 case SkinComboColourLookup comboColour:
+                    LogLookupDebug(this, lookup, LookupDebugType.Hit);
                     return SkinUtils.As<TValue>(new Bindable<Color4>(getComboColour(Configuration, comboColour.ColourIndex)));
             }
 
+            LogLookupDebug(this, lookup, LookupDebugType.Miss);
             return null;
         }
 

From 14936677fc9182cf525a158d6bfa46d736b22785 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 17:57:32 +0900
Subject: [PATCH 1307/2100] Ignore unused thing inspection

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

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index ab0d608d3e..f286dfb776 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -84,6 +84,7 @@ namespace osu.Game.Skinning
 
         public override IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
         {
+            // ReSharper disable once RedundantAssignment (used in `finally` debug logic)
             bool wasHit = true;
 
             try

From 88b9d3237aeac4809500788387da75c8db09c0f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 18:00:49 +0900
Subject: [PATCH 1308/2100] Fix osu!mania legacy skin configurations not
 working when notes are not skinned

---
 osu.Game/Skinning/LegacyBeatmapSkin.cs |  2 +-
 osu.Game/Skinning/LegacySkin.cs        | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 83dcc3895d..90eb5fa013 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Skinning
 {
     public class LegacyBeatmapSkin : LegacySkin
     {
-        protected override bool AllowManiaSkin => false;
+        protected override bool AllowManiaConfigLookups => false;
         protected override bool UseCustomSampleBanks => true;
 
         /// <summary>
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index f286dfb776..1f485cbdf6 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -29,13 +29,7 @@ namespace osu.Game.Skinning
 {
     public class LegacySkin : Skin
     {
-        /// <summary>
-        /// Whether texture for the keys exists.
-        /// Used to determine if the mania ruleset is skinned.
-        /// </summary>
-        private readonly Lazy<bool> hasKeyTexture;
-
-        protected virtual bool AllowManiaSkin => hasKeyTexture.Value;
+        protected virtual bool AllowManiaConfigLookups => true;
 
         /// <summary>
         /// Whether this skin can use samples with a custom bank (custom sample set in stable terminology).
@@ -61,10 +55,6 @@ namespace osu.Game.Skinning
         protected LegacySkin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? storage, string configurationFilename = @"skin.ini")
             : base(skin, resources, storage, configurationFilename)
         {
-            // todo: this shouldn't really be duplicated here (from ManiaLegacySkinTransformer). we need to come up with a better solution.
-            hasKeyTexture = new Lazy<bool>(() => this.GetAnimation(
-                lookupForMania<string>(new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value ?? "mania-key1", true,
-                true) != null);
         }
 
         protected override void ParseConfigurationStream(Stream stream)
@@ -114,7 +104,7 @@ namespace osu.Game.Skinning
                         return SkinUtils.As<TValue>(getCustomColour(Configuration, customColour.Lookup.ToString() ?? string.Empty));
 
                     case LegacyManiaSkinConfigurationLookup maniaLookup:
-                        if (!AllowManiaSkin)
+                        if (!AllowManiaConfigLookups)
                             break;
 
                         var result = lookupForMania<TValue>(maniaLookup);

From d06490220d323c5ee5de302e62bcc2ff6cb24d20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 18:58:58 +0900
Subject: [PATCH 1309/2100] Add better xmldoc for `Slider.Velocity`

---
 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 4189f8ba1e..9c0dda1ed3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         public double SpanDuration => Duration / this.SpanCount();
 
         /// <summary>
-        /// Velocity of this <see cref="Slider"/>.
+        /// The computed velocity of this <see cref="Slider"/>. This is the amount of path distance travelled in 1 ms.
         /// </summary>
         public double Velocity { get; private set; }
 

From 1a37543d288fa3b62d19a34d443ee97943920fbd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 18:59:15 +0900
Subject: [PATCH 1310/2100] Rename `SliderVelocity` to
 `SliderVelocityMultiplier` to distinguish from `Velocity`

---
 .../Editor/TestSceneJuiceStreamPlacementBlueprint.cs |  4 ++--
 .../Editor/TestSceneJuiceStreamSelectionBlueprint.cs |  4 ++--
 .../Beatmaps/CatchBeatmapConverter.cs                |  2 +-
 .../Edit/Blueprints/Components/EditablePath.cs       |  2 +-
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs       | 12 ++++++------
 .../Legacy/DistanceObjectPatternGenerator.cs         |  2 +-
 .../Mods/TestSceneOsuModAutoplay.cs                  |  2 +-
 .../TestSceneSliderFollowCircleInput.cs              |  2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs  |  2 +-
 .../TestSceneStartTimeOrderedHitPolicy.cs            |  2 +-
 .../Beatmaps/OsuBeatmapConverter.cs                  |  2 +-
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs   |  4 ++--
 osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs   |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs              | 10 +++++-----
 .../Beatmaps/TaikoBeatmapConverter.cs                |  4 ++--
 .../TestSceneHitObjectComposerDistanceSnapping.cs    |  6 +++---
 .../TestSceneHitObjectDifficultyPointAdjustments.cs  |  6 +++---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs    |  2 +-
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs    |  2 +-
 osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs |  2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs    | 10 +++++-----
 .../Rulesets/Objects/Types/IHasSliderVelocity.cs     |  4 ++--
 .../Edit/Compose/Components/HitObjectInspector.cs    |  2 +-
 .../Components/Timeline/DifficultyPointPiece.cs      | 10 +++++-----
 .../Timeline/TimelineHitObjectBlueprint.cs           |  6 +++---
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs  |  2 +-
 26 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
index 2426f8c886..d010bb02ad 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.SliderVelocityBindable.IsDefault);
+            AddAssert("default slider velocity", () => lastObject.SliderVelocityMultiplierBindable.IsDefault);
         }
 
         [Test]
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
             addPlacementSteps(times, positions);
             addPathCheckStep(times, positions);
 
-            AddAssert("slider velocity changed", () => !lastObject.SliderVelocityBindable.IsDefault);
+            AddAssert("slider velocity changed", () => !lastObject.SliderVelocityMultiplierBindable.IsDefault);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
index beba5811fe..05d7a38a95 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.SliderVelocityBindable.IsDefault);
+            AddAssert("default slider velocity", () => hitObject.SliderVelocityMultiplierBindable.IsDefault);
 
             addDragStartStep(times[1], positions[1]);
             AddMouseMoveStep(times[1], 400);
-            AddAssert("slider velocity changed", () => !hitObject.SliderVelocityBindable.IsDefault);
+            AddAssert("slider velocity changed", () => !hitObject.SliderVelocityMultiplierBindable.IsDefault);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 2c8ef9eae0..5e8a0b1216 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         ComboOffset = comboData?.ComboOffset ?? 0,
                         LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0,
                         LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y,
-                        SliderVelocity = sliderVelocityData?.SliderVelocity ?? 1
+                        SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1
                     }.Yield();
 
                 case IHasDuration endTime:
diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
index 7a577f8a83..df76bf0a8c 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.SliderVelocityBindable;
+            var svBindable = hitObject.SliderVelocityMultiplierBindable;
             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 169e99c90c..724bdc3401 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -28,17 +28,17 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public int RepeatCount { get; set; }
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1)
+        public BindableNumber<double> SliderVelocityMultiplierBindable { get; } = new BindableDouble(1)
         {
             Precision = 0.01,
             MinValue = 0.1,
             MaxValue = 10
         };
 
-        public double SliderVelocity
+        public double SliderVelocityMultiplier
         {
-            get => SliderVelocityBindable.Value;
-            set => SliderVelocityBindable.Value = value;
+            get => SliderVelocityMultiplierBindable.Value;
+            set => SliderVelocityMultiplierBindable.Value = value;
         }
 
         [JsonIgnore]
@@ -48,10 +48,10 @@ namespace osu.Game.Rulesets.Catch.Objects
         private double tickDistanceFactor;
 
         [JsonIgnore]
-        public double Velocity => velocityFactor * SliderVelocity;
+        public double Velocity => velocityFactor * SliderVelocityMultiplier;
 
         [JsonIgnore]
-        public double TickDistance => tickDistanceFactor * SliderVelocity;
+        public double TickDistance => tickDistanceFactor * SliderVelocityMultiplier;
 
         /// <summary>
         /// The length of one span of this <see cref="JuiceStream"/>.
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 91b7be6e8f..49c1a055a6 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             if (hitObject.LegacyBpmMultiplier.HasValue)
                 beatLength = timingPoint.BeatLength * hitObject.LegacyBpmMultiplier.Value;
             else if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocity;
+                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocityMultiplier;
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index 32028823ae..6980438b59 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                                 new PathControlPoint(new Vector2(0, 6.25f))
                             }),
                             RepeatCount = 1,
-                            SliderVelocity = 10
+                            SliderVelocityMultiplier = 10
                         }
                     }
                 },
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
index fc2e6d1f72..5adc50859f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     {
                         StartTime = time_slider_start,
                         Position = new Vector2(0, 0),
-                        SliderVelocity = velocity,
+                        SliderVelocityMultiplier = 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 d83926ab9b..644524f532 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -349,7 +349,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                         {
                             StartTime = time_slider_start,
                             Position = new Vector2(0, 0),
-                            SliderVelocity = 0.1f,
+                            SliderVelocityMultiplier = 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 909eb821cf..f0af3f0c39 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -451,7 +451,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             public TestSlider()
             {
-                SliderVelocity = 0.1f;
+                SliderVelocityMultiplier = 0.1f;
 
                 DefaultsApplied += _ =>
                 {
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index 9e786caf0c..f3aaf831d3 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         // 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,
                         GenerateTicks = generateTicksData?.GenerateTicks ?? true,
-                        SliderVelocity = sliderVelocityData?.SliderVelocity ?? 1,
+                        SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1,
                     }.Yield();
 
                 case IHasDuration endTimeData:
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 966092c6fe..ba7b855511 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -85,9 +85,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     BeginPlacement();
 
                     double? nearestSliderVelocity = (editorBeatmap.HitObjects
-                                                                  .LastOrDefault(h => h is Slider && h.GetEndTime() < HitObject.StartTime) as Slider)?.SliderVelocity;
+                                                                  .LastOrDefault(h => h is Slider && h.GetEndTime() < HitObject.StartTime) as Slider)?.SliderVelocityMultiplier;
 
-                    HitObject.SliderVelocity = nearestSliderVelocity ?? 1;
+                    HitObject.SliderVelocityMultiplier = nearestSliderVelocity ?? 1;
                     HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
 
                     // Replacing the DifficultyControlPoint above doesn't trigger any kind of invalidation.
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
index 72031b4958..9b5d405025 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 ComboOffset = original.ComboOffset;
                 LegacyLastTickOffset = original.LegacyLastTickOffset;
                 TickDistanceMultiplier = original.TickDistanceMultiplier;
-                SliderVelocity = original.SliderVelocity;
+                SliderVelocityMultiplier = original.SliderVelocityMultiplier;
             }
 
             protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 9c0dda1ed3..1e7e8e2981 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -134,17 +134,17 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public bool OnlyJudgeNestedObjects = true;
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1)
+        public BindableNumber<double> SliderVelocityMultiplierBindable { get; } = new BindableDouble(1)
         {
             Precision = 0.01,
             MinValue = 0.1,
             MaxValue = 10
         };
 
-        public double SliderVelocity
+        public double SliderVelocityMultiplier
         {
-            get => SliderVelocityBindable.Value;
-            set => SliderVelocityBindable.Value = value;
+            get => SliderVelocityMultiplierBindable.Value;
+            set => SliderVelocityMultiplierBindable.Value = value;
         }
 
         public bool GenerateTicks { get; set; } = true;
@@ -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.SliderMultiplier * SliderVelocityMultiplier;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 5f3d0f898e..3e9252e1fd 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 {
                     if (hitObject is not IHasSliderVelocity hasSliderVelocity) continue;
 
-                    double nextScrollSpeed = hasSliderVelocity.SliderVelocity;
+                    double nextScrollSpeed = hasSliderVelocity.SliderVelocityMultiplier;
                     EffectControlPoint currentEffectPoint = converted.ControlPointInfo.EffectPointAt(hitObject.StartTime);
 
                     if (!Precision.AlmostEquals(lastScrollSpeed, nextScrollSpeed, acceptableDifference: currentEffectPoint.ScrollSpeedBindable.Precision))
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             if (obj.LegacyBpmMultiplier.HasValue)
                 beatLength = timingPoint.BeatLength * obj.LegacyBpmMultiplier.Value;
             else if (obj is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocity;
+                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocityMultiplier;
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index e30caac95e..6b78eea009 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Editing
         {
             assertSnapDistance(100, new Slider
             {
-                SliderVelocity = multiplier
+                SliderVelocityMultiplier = multiplier
             }, false);
         }
 
@@ -88,7 +88,7 @@ namespace osu.Game.Tests.Editing
         {
             assertSnapDistance(100 * multiplier, new Slider
             {
-                SliderVelocity = multiplier
+                SliderVelocityMultiplier = multiplier
             }, true);
         }
 
@@ -112,7 +112,7 @@ namespace osu.Game.Tests.Editing
 
             var referenceObject = new Slider
             {
-                SliderVelocity = slider_velocity
+                SliderVelocityMultiplier = slider_velocity
             };
 
             assertSnapDistance(base_distance * slider_velocity, referenceObject, true);
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
index c78f50c821..530b3db208 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Editing
                             new PathControlPoint(new Vector2(100, 0))
                         }
                     },
-                    SliderVelocity = 2
+                    SliderVelocityMultiplier = 2
                 });
             });
         }
@@ -110,7 +110,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("unify slider velocity", () =>
             {
                 foreach (var h in EditorBeatmap.HitObjects.OfType<IHasSliderVelocity>())
-                    h.SliderVelocity = 1.5;
+                    h.SliderVelocityMultiplier = 1.5;
             });
 
             AddStep("select both objects", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
@@ -194,7 +194,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 is IHasSliderVelocity hasSliderVelocity && hasSliderVelocity.SliderVelocity == velocity;
+            return h is IHasSliderVelocity hasSliderVelocity && hasSliderVelocity.SliderVelocityMultiplier == velocity;
         });
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 5da51f6c8e..7c375b7604 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Beatmaps.Formats
             }
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                hasSliderVelocity.SliderVelocity = difficultyControlPoint.SliderVelocity;
+                hasSliderVelocity.SliderVelocityMultiplier = difficultyControlPoint.SliderVelocity;
 
             hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty);
         }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index fc9de13c89..4f8e935ee4 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -269,7 +269,7 @@ namespace osu.Game.Beatmaps.Formats
                 foreach (var hitObject in hitObjects)
                 {
                     if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                        yield return new DifficultyControlPoint { Time = hitObject.StartTime, SliderVelocity = hasSliderVelocity.SliderVelocity };
+                        yield return new DifficultyControlPoint { Time = hitObject.StartTime, SliderVelocity = hasSliderVelocity.SliderVelocityMultiplier };
                 }
             }
 
diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index 817e8bd5fe..e08cb41a26 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -244,7 +244,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.SliderVelocityMultiplier : 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 7ddd372dc9..d91ecf956a 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -41,12 +41,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
         public double Velocity = 1;
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1);
+        public BindableNumber<double> SliderVelocityMultiplierBindable { get; } = new BindableDouble(1);
 
-        public double SliderVelocity
+        public double SliderVelocityMultiplier
         {
-            get => SliderVelocityBindable.Value;
-            set => SliderVelocityBindable.Value = value;
+            get => SliderVelocityMultiplierBindable.Value;
+            set => SliderVelocityMultiplierBindable.Value = value;
         }
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
@@ -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.SliderMultiplier * SliderVelocityMultiplier;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
         }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
index 80fd8dd8dc..e665dcc752 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// The slider velocity multiplier.
         /// </summary>
-        double SliderVelocity { get; set; }
+        double SliderVelocityMultiplier { get; set; }
 
-        BindableNumber<double> SliderVelocityBindable { get; }
+        BindableNumber<double> SliderVelocityMultiplierBindable { get; }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
index 7beaf7d086..ac339dc9d9 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.SliderMultiplier:#,0.00}x)");
+                        AddValue($"{sliderVelocity.SliderVelocityMultiplier:#,0.00}x ({sliderVelocity.SliderVelocityMultiplier * 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 99fb2ab874..ca1e9a5d9b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             HitObject = hitObject;
 
-            speedMultiplier = (hitObject as IHasSliderVelocity)?.SliderVelocityBindable.GetBoundCopy();
+            speedMultiplier = (hitObject as IHasSliderVelocity)?.SliderVelocityMultiplierBindable.GetBoundCopy();
         }
 
         protected override Color4 GetRepresentingColour(OsuColour colours) => colours.Lime1;
@@ -106,8 +106,8 @@ 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
+                var selectedPointBindable = relevantObjects.Select(point => ((IHasSliderVelocity)point).SliderVelocityMultiplier).Distinct().Count() == 1
+                    ? ((IHasSliderVelocity)relevantObjects.First()).SliderVelocityMultiplierBindable
                     : null;
 
                 if (selectedPointBindable != null)
@@ -127,7 +127,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                     foreach (var h in relevantObjects)
                     {
-                        ((IHasSliderVelocity)h).SliderVelocity = val.NewValue.Value;
+                        ((IHasSliderVelocity)h).SliderVelocityMultiplier = val.NewValue.Value;
                         beatmap.Update(h);
                     }
 
@@ -169,7 +169,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             InspectorText.Clear();
 
-            double[] sliderVelocities = EditorBeatmap.HitObjects.OfType<IHasSliderVelocity>().Select(sv => sv.SliderVelocity).OrderBy(v => v).ToArray();
+            double[] sliderVelocities = EditorBeatmap.HitObjects.OfType<IHasSliderVelocity>().Select(sv => sv.SliderVelocityMultiplier).OrderBy(v => v).ToArray();
 
             AddHeader("Base velocity (from beatmap setup)");
             AddValue($"{beatmapVelocity:#,0.00}x");
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 55f122669d..77afad2d4f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -395,12 +395,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                                 if (e.CurrentState.Keyboard.ShiftPressed && hitObject is IHasSliderVelocity hasSliderVelocity)
                                 {
-                                    double newVelocity = hasSliderVelocity.SliderVelocity * (repeatHitObject.Duration / proposedDuration);
+                                    double newVelocity = hasSliderVelocity.SliderVelocityMultiplier * (repeatHitObject.Duration / proposedDuration);
 
-                                    if (Precision.AlmostEquals(newVelocity, hasSliderVelocity.SliderVelocity))
+                                    if (Precision.AlmostEquals(newVelocity, hasSliderVelocity.SliderVelocityMultiplier))
                                         return;
 
-                                    hasSliderVelocity.SliderVelocity = newVelocity;
+                                    hasSliderVelocity.SliderVelocityMultiplier = newVelocity;
                                     beatmap.Update(hitObject);
                                 }
                                 else
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index 565379f391..fe0d4a7822 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Edit
                     continue;
 
                 if (oldObject is IHasSliderVelocity oldWithVelocity && newObject is IHasSliderVelocity newWithVelocity)
-                    oldWithVelocity.SliderVelocity = newWithVelocity.SliderVelocity;
+                    oldWithVelocity.SliderVelocityMultiplier = newWithVelocity.SliderVelocityMultiplier;
 
                 oldObject.Samples = newObject.Samples;
 

From 68752f95e516459ea1ab814812919b381d78c45d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 6 Sep 2023 22:49:13 +0900
Subject: [PATCH 1311/2100] color friend score to pink

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  | 31 +++++++++++++++++++
 .../Play/HUD/GameplayLeaderboardScore.cs      | 15 ++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index d4000c07e7..418e0ad981 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -6,11 +6,14 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.PolygonExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -139,6 +142,29 @@ namespace osu.Game.Tests.Visual.Gameplay
                 => AddAssert($"leaderboard height is {panelCount} panels high", () => leaderboard.DrawHeight == (GameplayLeaderboardScore.PANEL_HEIGHT + leaderboard.Spacing) * panelCount);
         }
 
+        [Test]
+        public void TestFriendScore()
+        {
+            APIUser friend = new APIUser { Username = "my friend", Id = 10000 };
+
+            createLeaderboard();
+            addLocalPlayer();
+
+            AddStep("initialize api", () =>
+            {
+                var api = (DummyAPIAccess)API;
+
+                api.Friends.Add(friend);
+            });
+
+            int playerNumber = 1;
+            AddRepeatStep("add 3 other players", () => createRandomScore(new APIUser { Username = $"Player {playerNumber++}" }), 3);
+            AddUntilStep("there are no pink color score", () => leaderboard.ChildrenOfType<Box>().All(b => b.Colour != Color4Extensions.FromHex("ff549a")));
+
+            AddRepeatStep("add 3 friend score", () => createRandomScore(friend), 3);
+            AddUntilStep("there are pink color for friend score", () => leaderboard.GetScoreByUsername("my friend").ChildrenOfType<Box>().Any(b => b.Colour == Color4Extensions.FromHex("ff549a")));
+        }
+
         private void addLocalPlayer()
         {
             AddStep("add local player", () =>
@@ -179,6 +205,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }
+
+            public GameplayLeaderboardScore GetScoreByUsername(string username)
+            {
+                return Flow.FirstOrDefault(i => i.User?.Username == username);
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index dcb2c1071e..502303e80c 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.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.Extensions.Color4Extensions;
@@ -11,6 +12,8 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
@@ -107,6 +110,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private IBindable<ScoringMode> scoreDisplayMode = null!;
 
+        private readonly IBindableList<APIUser> apiFriends = new BindableList<APIUser>();
+
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
         /// </summary>
@@ -124,7 +129,7 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OsuConfigManager osuConfigManager)
+        private void load(OsuColour colours, OsuConfigManager osuConfigManager, IAPIProvider api)
         {
             Container avatarContainer;
 
@@ -311,6 +316,9 @@ namespace osu.Game.Screens.Play.HUD
             }, true);
 
             HasQuit.BindValueChanged(_ => updateState());
+
+            apiFriends.BindTo(api.Friends);
+            apiFriends.BindCollectionChanged((_, _) => updateState());
         }
 
         protected override void LoadComplete()
@@ -389,6 +397,11 @@ namespace osu.Game.Screens.Play.HUD
                 panelColour = BackgroundColour ?? Color4Extensions.FromHex("ffd966");
                 textColour = TextColour ?? Color4Extensions.FromHex("2e576b");
             }
+            else if (apiFriends.Any(f => User?.Equals(f) == true))
+            {
+                panelColour = BackgroundColour ?? Color4Extensions.FromHex("ff549a");
+                textColour = TextColour ?? Color4.White;
+            }
             else
             {
                 panelColour = BackgroundColour ?? Color4Extensions.FromHex("3399cc");

From dce6adb8955e4f660e96b3687e9a6dfdf08ca752 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 01:23:56 +0900
Subject: [PATCH 1312/2100] Add text explanation of icons
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/Skin.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index d979cab72b..5bc5549889 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -260,11 +260,11 @@ namespace osu.Game.Skinning
             switch (type)
             {
                 case LookupDebugType.Hit:
-                    icon = "🟢";
+                    icon = "🟢 hit";
                     break;
 
                 case LookupDebugType.Miss:
-                    icon = "🔴";
+                    icon = "🔴 miss";
                     break;
 
                 case LookupDebugType.Enter:

From f9db0fad8871b9f052544d682579b101d158a26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Sep 2023 17:57:26 +0200
Subject: [PATCH 1313/2100] Ignore unused thing inspection harder

---
 osu.Game/Skinning/LegacySkin.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index f286dfb776..98e2d3e862 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
@@ -82,9 +83,9 @@ namespace osu.Game.Skinning
             }
         }
 
+        [SuppressMessage("ReSharper", "RedundantAssignment")] // for `wasHit` assignments used in `finally` debug logic
         public override IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
         {
-            // ReSharper disable once RedundantAssignment (used in `finally` debug logic)
             bool wasHit = true;
 
             try

From fe3683ed5b2d977fd14d49697cdef3b0df33f0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Sep 2023 17:46:42 +0200
Subject: [PATCH 1314/2100] Adjust formatting slightly

The uneven spacing was bothering me...
---
 osu.Game/Skinning/Skin.cs                   | 2 +-
 osu.Game/Skinning/SkinProvidingContainer.cs | 2 +-
 osu.Game/Skinning/SkinTransformer.cs        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 5bc5549889..659edc6f5f 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Skinning
 
         #endregion
 
-        public override string ToString() => $"{GetType().ReadableName()}{{ Name: {Name} }}";
+        public override string ToString() => $"{GetType().ReadableName()} {{ Name: {Name} }}";
 
         private static readonly ThreadLocal<int> nested_level = new ThreadLocal<int>(() => 0);
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 2d2a2e48f6..acb15da80e 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -310,7 +310,7 @@ namespace osu.Game.Skinning
                 }
             }
 
-            public override string ToString() => $"{GetType().ReadableName()}{{ skin: {skin} }}";
+            public override string ToString() => $"{GetType().ReadableName()} {{ Skin: {skin} }}";
         }
     }
 }
diff --git a/osu.Game/Skinning/SkinTransformer.cs b/osu.Game/Skinning/SkinTransformer.cs
index 4e7dd4f222..95572aa7b1 100644
--- a/osu.Game/Skinning/SkinTransformer.cs
+++ b/osu.Game/Skinning/SkinTransformer.cs
@@ -47,6 +47,6 @@ namespace osu.Game.Skinning
             }
         }
 
-        public override string ToString() => $"{nameof(SkinTransformer)}{{ Skin: {Skin} }}";
+        public override string ToString() => $"{nameof(SkinTransformer)} {{ Skin: {Skin} }}";
     }
 }

From 3db0d0d3415b423c28e46f20ea9f8b7501c64fea Mon Sep 17 00:00:00 2001
From: isakvik <hjeisa14@gmail.com>
Date: Wed, 6 Sep 2023 23:26:34 +0200
Subject: [PATCH 1315/2100] extendable minimum AR value for osu!std diff adjust
 mod, set to -10

---
 .../Mods/OsuModDifficultyAdjust.cs            |  1 +
 osu.Game/Rulesets/Mods/DifficultyBindable.cs  | 34 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 3a6b232f9f..5eb41ff189 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             Precision = 0.1f,
             MinValue = 0,
             MaxValue = 10,
+            ExtendedMinValue = -10,
             ExtendedMaxValue = 11,
             ReadCurrentFromDifficulty = diff => diff.ApproachRate,
         };
diff --git a/osu.Game/Rulesets/Mods/DifficultyBindable.cs b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
index c21ce756c9..4afeb6c8b2 100644
--- a/osu.Game/Rulesets/Mods/DifficultyBindable.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
@@ -34,9 +34,18 @@ namespace osu.Game.Rulesets.Mods
             set => CurrentNumber.Precision = value;
         }
 
+        private float minValue;
+
         public float MinValue
         {
-            set => CurrentNumber.MinValue = value;
+            set
+            {
+                if (value == minValue)
+                    return;
+
+                minValue = value;
+                updateMinValue();
+            }
         }
 
         private float maxValue;
@@ -53,6 +62,23 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
+        private float? extendedMinValue;
+
+        /// <summary>
+        /// The minimum value to be used when extended limits are applied.
+        /// </summary>
+        public float? ExtendedMinValue
+        {
+            set
+            {
+                if (value == extendedMinValue)
+                    return;
+
+                extendedMinValue = value;
+                updateMinValue();
+            }
+        }
+
         private float? extendedMaxValue;
 
         /// <summary>
@@ -78,6 +104,7 @@ namespace osu.Game.Rulesets.Mods
         public DifficultyBindable(float? defaultValue = null)
             : base(defaultValue)
         {
+            ExtendedLimits.BindValueChanged(_ => updateMinValue());
             ExtendedLimits.BindValueChanged(_ => updateMaxValue());
         }
 
@@ -94,6 +121,11 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
+        private void updateMinValue()
+        {
+            CurrentNumber.MinValue = ExtendedLimits.Value && extendedMinValue != null ? extendedMinValue.Value : minValue;
+        }
+
         private void updateMaxValue()
         {
             CurrentNumber.MaxValue = ExtendedLimits.Value && extendedMaxValue != null ? extendedMaxValue.Value : maxValue;

From 97bd90c0ffa9f090bc8ba323aaf3dbb993ac614f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 6 Sep 2023 14:08:16 -0700
Subject: [PATCH 1316/2100] Link new song select wedge title and artist to
 search text box

---
 osu.Game/Screens/Select/BeatmapDetails.cs     | 12 ++---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 50 +++++++++++++------
 osu.Game/Screens/Select/SongSelect.cs         |  9 ++++
 3 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 712b610515..179323176a 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -141,9 +141,9 @@ namespace osu.Game.Screens.Select
                                                     LayoutEasing = Easing.OutQuad,
                                                     Children = new[]
                                                     {
-                                                        description = new MetadataSectionDescription(searchOnSongSelect),
-                                                        source = new MetadataSectionSource(searchOnSongSelect),
-                                                        tags = new MetadataSectionTags(searchOnSongSelect),
+                                                        description = new MetadataSectionDescription(query => songSelect?.Search(query)),
+                                                        source = new MetadataSectionSource(query => songSelect?.Search(query)),
+                                                        tags = new MetadataSectionTags(query => songSelect?.Search(query)),
                                                     },
                                                 },
                                             },
@@ -176,12 +176,6 @@ namespace osu.Game.Screens.Select
                 },
                 loading = new LoadingLayer(true)
             };
-
-            void searchOnSongSelect(string text)
-            {
-                if (songSelect != null)
-                    songSelect.FilterControl.CurrentTextSearch.Value = text;
-            }
         }
 
         private void updateStatistics()
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index a7bfbc8214..1c1a20b596 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -15,6 +15,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 
@@ -270,38 +271,57 @@ namespace osu.Game.Screens.Select
             }
 
             [BackgroundDependencyLoader]
-            private void load()
+            private void load(SongSelect? songSelect, LocalisationManager localisation)
             {
                 var metadata = working.Metadata;
 
+                var titleText = new RomanisableString(metadata.TitleUnicode, metadata.Title);
+                var artistText = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
+
                 Child = new FillFlowContainer
                 {
                     Name = "Top-left aligned metadata",
                     Direction = FillDirection.Vertical,
-                    Padding = new MarginPadding { Left = text_margin, Right = text_margin + shear_width, Top = 12 },
+                    Padding = new MarginPadding { Left = text_margin, Top = 12 },
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        TitleLabel = new TruncatingSpriteText
+                        new OsuHoverContainer
                         {
-                            Shadow = true,
-                            Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
-                            Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
-                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Both,
+                            Action = () => songSelect?.Search(titleText.GetPreferred(localisation.CurrentParameters.Value.PreferOriginalScript)),
+                            Child = TitleLabel = new TruncatingSpriteText
+                            {
+                                Shadow = true,
+                                Text = titleText,
+                                Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
+                            },
                         },
-                        ArtistLabel = new TruncatingSpriteText
+                        new OsuHoverContainer
                         {
-                            // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
-                            Shadow = true,
-                            Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
-                            // Not sure if this should be semi bold or medium
-                            Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
-                            RelativeSizeAxes = Axes.X,
-                        }
+                            AutoSizeAxes = Axes.Both,
+                            Action = () => songSelect?.Search(artistText.GetPreferred(localisation.CurrentParameters.Value.PreferOriginalScript)),
+                            Child = ArtistLabel = new TruncatingSpriteText
+                            {
+                                // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
+                                Shadow = true,
+                                Text = artistText,
+                                // Not sure if this should be semi bold or medium
+                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
+                            },
+                        },
                     }
                 };
             }
+
+            protected override void UpdateAfterChildren()
+            {
+                base.UpdateAfterChildren();
+
+                TitleLabel.MaxWidth = DrawWidth - text_margin * 2 - shear_width;
+                ArtistLabel.MaxWidth = DrawWidth - text_margin - shear_width;
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index cca18b93af..809ffb307c 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -390,6 +390,15 @@ namespace osu.Game.Screens.Select
             this.Push(new EditorLoader());
         }
 
+        /// <summary>
+        /// Set the query to the search text box.
+        /// </summary>
+        /// <param name="query">The string to search.</param>
+        public void Search(string query)
+        {
+            FilterControl.CurrentTextSearch.Value = query;
+        }
+
         /// <summary>
         /// Call to make a selection and perform the default action for this SongSelect.
         /// </summary>

From d0780fb765d231f565d58058a8771e5c5dd3d3a4 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 6 Sep 2023 15:01:55 -0700
Subject: [PATCH 1317/2100] Add comment explaining the max width

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 1c1a20b596..3c76ae1f08 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -319,6 +319,8 @@ namespace osu.Game.Screens.Select
             {
                 base.UpdateAfterChildren();
 
+                // best effort to confine the auto-sized text to wedge bounds
+                // the artist label doesn't have an extra text_margin as it doesn't touch the right metadata
                 TitleLabel.MaxWidth = DrawWidth - text_margin * 2 - shear_width;
                 ArtistLabel.MaxWidth = DrawWidth - text_margin - shear_width;
             }

From 5ee412cc9a1975196d0fc0127875227f474410e5 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 6 Sep 2023 16:17:53 -0700
Subject: [PATCH 1318/2100] Use `@2x` variant of profile badges

---
 osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs | 6 ++++--
 osu.Game/Users/Badge.cs                                     | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index 4278c46d6a..b57b0b7312 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -134,14 +134,16 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     AwardedAt = DateTimeOffset.FromUnixTimeSeconds(1505741569),
                     Description = "Outstanding help by being a voluntary test subject.",
-                    ImageUrl = "https://assets.ppy.sh/profile-badges/contributor.jpg",
+                    ImageUrl = "https://assets.ppy.sh/profile-badges/contributor-new@2x.png",
+                    ImageUrlLowRes = "https://assets.ppy.sh/profile-badges/contributor-new.png",
                     Url = "https://osu.ppy.sh/wiki/en/People/Community_Contributors",
                 },
                 new Badge
                 {
                     AwardedAt = DateTimeOffset.FromUnixTimeSeconds(1505741569),
                     Description = "Badge without a url.",
-                    ImageUrl = "https://assets.ppy.sh/profile-badges/contributor.jpg",
+                    ImageUrl = "https://assets.ppy.sh/profile-badges/contributor@2x.png",
+                    ImageUrlLowRes = "https://assets.ppy.sh/profile-badges/contributor.png",
                 },
             },
             Title = "osu!volunteer",
diff --git a/osu.Game/Users/Badge.cs b/osu.Game/Users/Badge.cs
index b87e2ddecd..42f2234744 100644
--- a/osu.Game/Users/Badge.cs
+++ b/osu.Game/Users/Badge.cs
@@ -16,9 +16,12 @@ namespace osu.Game.Users
         [JsonProperty("description")]
         public string Description;
 
-        [JsonProperty("image_url")]
+        [JsonProperty("image@2x_url")]
         public string ImageUrl;
 
+        [JsonProperty("image_url")]
+        public string ImageUrlLowRes;
+
         [JsonProperty("url")]
         public string Url;
     }

From 2ab11ab568e3869526682e647e4b24ae5ed0b5b0 Mon Sep 17 00:00:00 2001
From: isakvik <hjeisa14@gmail.com>
Date: Thu, 7 Sep 2023 01:41:22 +0200
Subject: [PATCH 1319/2100] adds new diffsetting control that shows millisecond
 values for approach rate override

---
 .../Mods/OsuModDifficultyAdjust.cs            |  2 +-
 .../Graphics/UserInterface/OsuSliderBar.cs    |  2 +-
 ...oachRateDifficultyAdjustSettingsControl.cs | 36 +++++++++++++++++++
 .../Mods/DifficultyAdjustSettingsControl.cs   | 22 ++++++------
 4 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 5eb41ff189..c09e108b5a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             ReadCurrentFromDifficulty = diff => diff.CircleSize,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1, SettingControlType = typeof(DifficultyAdjustSettingsControl))]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1, SettingControlType = typeof(ApproachRateDifficultyAdjustSettingsControl))]
         public DifficultyBindable ApproachRate { get; } = new DifficultyBindable
         {
             Precision = 0.1f,
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index e5f5f97eb7..cf3cb3b734 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Graphics.UserInterface
             channel.Play();
         }
 
-        private LocalisableString getTooltipText(T value)
+        protected LocalisableString getTooltipText(T value)
         {
             if (CurrentNumber.IsInteger)
                 return value.ToInt32(NumberFormatInfo.InvariantInfo).ToString("N0");
diff --git a/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs
new file mode 100644
index 0000000000..21cde7d8e2
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.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;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public partial class ApproachRateDifficultyAdjustSettingsControl : DifficultyAdjustSettingsControl
+    {
+        protected override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent,
+            new ApproachRateSlider
+            {
+                RelativeSizeAxes = Axes.X,
+                Current = sliderDisplayCurrent,
+                KeyboardStep = 0.1f,
+            }
+        );
+
+        /// <summary>
+        /// A slider bar with more detailed approach rate info for its given value
+        /// </summary>
+        public partial class ApproachRateSlider : RoundedSliderBar<float>
+        {
+            public override LocalisableString TooltipText =>
+                $"{base.TooltipText} ({millisecondsFromApproachRate(Current.Value, 1.0f)} ms)";
+
+            private double millisecondsFromApproachRate(float value, float clockRate)
+            {
+                return Math.Round(1800 - Math.Min(value, 5) * 120 - (value >= 5 ? (value - 5) * 150 : 0) / clockRate);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
index a941c0a1db..62fc299c68 100644
--- a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
@@ -27,9 +27,16 @@ namespace osu.Game.Rulesets.Mods
         /// When the mod is overriding a default, this will match the value of <see cref="Current"/>.
         /// When there is no override (ie. <see cref="Current"/> is null), this value will match the beatmap provided default via <see cref="updateCurrentFromSlider"/>.
         /// </remarks>
-        private readonly BindableNumber<float> sliderDisplayCurrent = new BindableNumber<float>();
+        protected readonly BindableNumber<float> sliderDisplayCurrent = new BindableNumber<float>();
 
-        protected override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent);
+        protected override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent,
+            new RoundedSliderBar<float>
+            {
+                RelativeSizeAxes = Axes.X,
+                Current = sliderDisplayCurrent,
+                KeyboardStep = 0.1f,
+            }
+        );
 
         /// <summary>
         /// Guards against beatmap values displayed on slider bars being transferred to user override.
@@ -88,7 +95,7 @@ namespace osu.Game.Rulesets.Mods
             isInternalChange = false;
         }
 
-        private partial class SliderControl : CompositeDrawable, IHasCurrentValue<float?>
+        protected partial class SliderControl : CompositeDrawable, IHasCurrentValue<float?>
         {
             // This is required as SettingsItem relies heavily on this bindable for internal use.
             // The actual update flow is done via the bindable provided in the constructor.
@@ -100,16 +107,11 @@ namespace osu.Game.Rulesets.Mods
                 set => current.Current = value;
             }
 
-            public SliderControl(BindableNumber<float> currentNumber)
+            public SliderControl(BindableNumber<float> currentNumber, RoundedSliderBar<float> slider)
             {
                 InternalChildren = new Drawable[]
                 {
-                    new RoundedSliderBar<float>
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Current = currentNumber,
-                        KeyboardStep = 0.1f,
-                    }
+                    slider
                 };
 
                 AutoSizeAxes = Axes.Y;

From 0bbe28dcc9501c72b6b1f8f9babcd39ed2ab21b2 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 6 Sep 2023 16:43:32 -0700
Subject: [PATCH 1320/2100] Update badge header background color in line with
 web

---
 osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs | 4 ++--
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs
index 24be6ce2f5..af9ec32421 100644
--- a/osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Profile.Header
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background5,
+                    Colour = colourProvider.Background4,
                 },
                 new Container // artificial shadow
                 {
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Profile.Header
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Spacing = new Vector2(10, 10),
-                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING, Top = 10 },
+                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING, Vertical = 10 },
                 }
             };
         }
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index de678cb5d1..dc47ce6e30 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Overlays.Profile.Header
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background4,
+                    Colour = colourProvider.Background3,
                 },
                 new FillFlowContainer
                 {

From d2a62351350459d763f5fc43e60b6d2328c19613 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 14:19:15 +0900
Subject: [PATCH 1321/2100] Fix code quality issues

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs |  2 +-
 osu.Game/Rulesets/Mods/DifficultyBindable.cs    | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index cf3cb3b734..e5f5f97eb7 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Graphics.UserInterface
             channel.Play();
         }
 
-        protected LocalisableString getTooltipText(T value)
+        private LocalisableString getTooltipText(T value)
         {
             if (CurrentNumber.IsInteger)
                 return value.ToInt32(NumberFormatInfo.InvariantInfo).ToString("N0");
diff --git a/osu.Game/Rulesets/Mods/DifficultyBindable.cs b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
index 4afeb6c8b2..a207048882 100644
--- a/osu.Game/Rulesets/Mods/DifficultyBindable.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mods
                     return;
 
                 minValue = value;
-                updateMinValue();
+                updateExtents();
             }
         }
 
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Mods
                     return;
 
                 maxValue = value;
-                updateMaxValue();
+                updateExtents();
             }
         }
 
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Mods
                     return;
 
                 extendedMinValue = value;
-                updateMinValue();
+                updateExtents();
             }
         }
 
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Mods
                     return;
 
                 extendedMaxValue = value;
-                updateMaxValue();
+                updateExtents();
             }
         }
 
@@ -104,8 +104,7 @@ namespace osu.Game.Rulesets.Mods
         public DifficultyBindable(float? defaultValue = null)
             : base(defaultValue)
         {
-            ExtendedLimits.BindValueChanged(_ => updateMinValue());
-            ExtendedLimits.BindValueChanged(_ => updateMaxValue());
+            ExtendedLimits.BindValueChanged(_ => updateExtents());
         }
 
         public override float? Value
@@ -121,13 +120,9 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
-        private void updateMinValue()
+        private void updateExtents()
         {
             CurrentNumber.MinValue = ExtendedLimits.Value && extendedMinValue != null ? extendedMinValue.Value : minValue;
-        }
-
-        private void updateMaxValue()
-        {
             CurrentNumber.MaxValue = ExtendedLimits.Value && extendedMaxValue != null ? extendedMaxValue.Value : maxValue;
         }
 

From e05d7d5f8d3dbd29b861fbf4457ed3330be05935 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 14:20:19 +0900
Subject: [PATCH 1322/2100] Inline local control

---
 .../Mods/OsuModDifficultyAdjust.cs            | 34 ++++++++++++++++--
 ...oachRateDifficultyAdjustSettingsControl.cs | 36 -------------------
 .../Mods/DifficultyAdjustSettingsControl.cs   | 14 ++++----
 3 files changed, 39 insertions(+), 45 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index c09e108b5a..2b11546a4b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -1,14 +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 System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModDifficultyAdjust : ModDifficultyAdjust
+    public partial class OsuModDifficultyAdjust : ModDifficultyAdjust
     {
         [SettingSource("Circle Size", "Override a beatmap's set CS.", FIRST_SETTING_ORDER - 1, SettingControlType = typeof(DifficultyAdjustSettingsControl))]
         public DifficultyBindable CircleSize { get; } = new DifficultyBindable
@@ -20,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             ReadCurrentFromDifficulty = diff => diff.CircleSize,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1, SettingControlType = typeof(ApproachRateDifficultyAdjustSettingsControl))]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1, SettingControlType = typeof(ApproachRateSettingsControl))]
         public DifficultyBindable ApproachRate { get; } = new DifficultyBindable
         {
             Precision = 0.1f,
@@ -54,5 +58,31 @@ namespace osu.Game.Rulesets.Osu.Mods
             if (CircleSize.Value != null) difficulty.CircleSize = CircleSize.Value.Value;
             if (ApproachRate.Value != null) difficulty.ApproachRate = ApproachRate.Value.Value;
         }
+
+        private partial class ApproachRateSettingsControl : DifficultyAdjustSettingsControl
+        {
+            protected override Drawable CreateControl() => new SliderControl(SliderDisplayCurrent,
+                new ApproachRateSlider
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Current = SliderDisplayCurrent,
+                    KeyboardStep = 0.1f,
+                }
+            );
+
+            /// <summary>
+            /// A slider bar with more detailed approach rate info for its given value
+            /// </summary>
+            public partial class ApproachRateSlider : RoundedSliderBar<float>
+            {
+                public override LocalisableString TooltipText =>
+                    $"{base.TooltipText} ({millisecondsFromApproachRate(Current.Value, 1.0f)} ms)";
+
+                private double millisecondsFromApproachRate(float value, float clockRate)
+                {
+                    return Math.Round(1800 - Math.Min(value, 5) * 120 - (value >= 5 ? (value - 5) * 150 : 0) / clockRate);
+                }
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs
deleted file mode 100644
index 21cde7d8e2..0000000000
--- a/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs
+++ /dev/null
@@ -1,36 +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.Graphics;
-using osu.Framework.Localisation;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Rulesets.Mods
-{
-    public partial class ApproachRateDifficultyAdjustSettingsControl : DifficultyAdjustSettingsControl
-    {
-        protected override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent,
-            new ApproachRateSlider
-            {
-                RelativeSizeAxes = Axes.X,
-                Current = sliderDisplayCurrent,
-                KeyboardStep = 0.1f,
-            }
-        );
-
-        /// <summary>
-        /// A slider bar with more detailed approach rate info for its given value
-        /// </summary>
-        public partial class ApproachRateSlider : RoundedSliderBar<float>
-        {
-            public override LocalisableString TooltipText =>
-                $"{base.TooltipText} ({millisecondsFromApproachRate(Current.Value, 1.0f)} ms)";
-
-            private double millisecondsFromApproachRate(float value, float clockRate)
-            {
-                return Math.Round(1800 - Math.Min(value, 5) * 120 - (value >= 5 ? (value - 5) * 150 : 0) / clockRate);
-            }
-        }
-    }
-}
diff --git a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
index 62fc299c68..1e66b1966f 100644
--- a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
@@ -27,13 +27,13 @@ namespace osu.Game.Rulesets.Mods
         /// When the mod is overriding a default, this will match the value of <see cref="Current"/>.
         /// When there is no override (ie. <see cref="Current"/> is null), this value will match the beatmap provided default via <see cref="updateCurrentFromSlider"/>.
         /// </remarks>
-        protected readonly BindableNumber<float> sliderDisplayCurrent = new BindableNumber<float>();
+        protected readonly BindableNumber<float> SliderDisplayCurrent = new BindableNumber<float>();
 
-        protected override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent,
+        protected override Drawable CreateControl() => new SliderControl(SliderDisplayCurrent,
             new RoundedSliderBar<float>
             {
                 RelativeSizeAxes = Axes.X,
-                Current = sliderDisplayCurrent,
+                Current = SliderDisplayCurrent,
                 KeyboardStep = 0.1f,
             }
         );
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mods
                 // Intercept and extract the internal number bindable from DifficultyBindable.
                 // This will provide bounds and precision specifications for the slider bar.
                 difficultyBindable = (DifficultyBindable)value.GetBoundCopy();
-                sliderDisplayCurrent.BindTo(difficultyBindable.CurrentNumber);
+                SliderDisplayCurrent.BindTo(difficultyBindable.CurrentNumber);
 
                 base.Current = difficultyBindable;
             }
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Mods
             Current.BindValueChanged(_ => updateCurrentFromSlider());
             beatmap.BindValueChanged(_ => updateCurrentFromSlider(), true);
 
-            sliderDisplayCurrent.BindValueChanged(number =>
+            SliderDisplayCurrent.BindValueChanged(number =>
             {
                 // this handles the transfer of the slider value to the main bindable.
                 // as such, should be skipped if the slider is being updated via updateFromDifficulty().
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mods
             if (Current.Value != null)
             {
                 // a user override has been added or updated.
-                sliderDisplayCurrent.Value = Current.Value.Value;
+                SliderDisplayCurrent.Value = Current.Value.Value;
                 return;
             }
 
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Mods
                 return;
 
             isInternalChange = true;
-            sliderDisplayCurrent.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
+            SliderDisplayCurrent.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
             isInternalChange = false;
         }
 

From 87ec33bb66bd35e15b67ce86ddced6d62adfe80b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 14:50:22 +0900
Subject: [PATCH 1323/2100] Tidy up test

---
 .../Visual/Gameplay/TestSceneGameplayLeaderboard.cs           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 418e0ad981..65f943d36b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -150,14 +150,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             createLeaderboard();
             addLocalPlayer();
 
-            AddStep("initialize api", () =>
+            AddStep("Add friend to API", () =>
             {
                 var api = (DummyAPIAccess)API;
 
+                api.Friends.Clear();
                 api.Friends.Add(friend);
             });
 
             int playerNumber = 1;
+
             AddRepeatStep("add 3 other players", () => createRandomScore(new APIUser { Username = $"Player {playerNumber++}" }), 3);
             AddUntilStep("there are no pink color score", () => leaderboard.ChildrenOfType<Box>().All(b => b.Colour != Color4Extensions.FromHex("ff549a")));
 

From 9c6f77b26eb7242c02fbc62c9b3a930035e2821f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 08:11:04 +0200
Subject: [PATCH 1324/2100] Fix too many things being exposed

---
 .../Mods/OsuModDifficultyAdjust.cs            |  8 ++---
 .../Mods/DifficultyAdjustSettingsControl.cs   | 32 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 2b11546a4b..933771321c 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
@@ -61,14 +62,13 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private partial class ApproachRateSettingsControl : DifficultyAdjustSettingsControl
         {
-            protected override Drawable CreateControl() => new SliderControl(SliderDisplayCurrent,
+            protected override RoundedSliderBar<float> CreateSlider(BindableNumber<float> current) =>
                 new ApproachRateSlider
                 {
                     RelativeSizeAxes = Axes.X,
-                    Current = SliderDisplayCurrent,
+                    Current = current,
                     KeyboardStep = 0.1f,
-                }
-            );
+                };
 
             /// <summary>
             /// A slider bar with more detailed approach rate info for its given value
diff --git a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
index 1e66b1966f..d04d7636ec 100644
--- a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
@@ -27,16 +27,16 @@ namespace osu.Game.Rulesets.Mods
         /// When the mod is overriding a default, this will match the value of <see cref="Current"/>.
         /// When there is no override (ie. <see cref="Current"/> is null), this value will match the beatmap provided default via <see cref="updateCurrentFromSlider"/>.
         /// </remarks>
-        protected readonly BindableNumber<float> SliderDisplayCurrent = new BindableNumber<float>();
+        private readonly BindableNumber<float> sliderDisplayCurrent = new BindableNumber<float>();
 
-        protected override Drawable CreateControl() => new SliderControl(SliderDisplayCurrent,
-            new RoundedSliderBar<float>
-            {
-                RelativeSizeAxes = Axes.X,
-                Current = SliderDisplayCurrent,
-                KeyboardStep = 0.1f,
-            }
-        );
+        protected sealed override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent, CreateSlider);
+
+        protected virtual RoundedSliderBar<float> CreateSlider(BindableNumber<float> current) => new RoundedSliderBar<float>
+        {
+            RelativeSizeAxes = Axes.X,
+            Current = current,
+            KeyboardStep = 0.1f,
+        };
 
         /// <summary>
         /// Guards against beatmap values displayed on slider bars being transferred to user override.
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mods
                 // Intercept and extract the internal number bindable from DifficultyBindable.
                 // This will provide bounds and precision specifications for the slider bar.
                 difficultyBindable = (DifficultyBindable)value.GetBoundCopy();
-                SliderDisplayCurrent.BindTo(difficultyBindable.CurrentNumber);
+                sliderDisplayCurrent.BindTo(difficultyBindable.CurrentNumber);
 
                 base.Current = difficultyBindable;
             }
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Mods
             Current.BindValueChanged(_ => updateCurrentFromSlider());
             beatmap.BindValueChanged(_ => updateCurrentFromSlider(), true);
 
-            SliderDisplayCurrent.BindValueChanged(number =>
+            sliderDisplayCurrent.BindValueChanged(number =>
             {
                 // this handles the transfer of the slider value to the main bindable.
                 // as such, should be skipped if the slider is being updated via updateFromDifficulty().
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mods
             if (Current.Value != null)
             {
                 // a user override has been added or updated.
-                SliderDisplayCurrent.Value = Current.Value.Value;
+                sliderDisplayCurrent.Value = Current.Value.Value;
                 return;
             }
 
@@ -91,11 +91,11 @@ namespace osu.Game.Rulesets.Mods
                 return;
 
             isInternalChange = true;
-            SliderDisplayCurrent.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
+            sliderDisplayCurrent.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
             isInternalChange = false;
         }
 
-        protected partial class SliderControl : CompositeDrawable, IHasCurrentValue<float?>
+        private partial class SliderControl : CompositeDrawable, IHasCurrentValue<float?>
         {
             // This is required as SettingsItem relies heavily on this bindable for internal use.
             // The actual update flow is done via the bindable provided in the constructor.
@@ -107,11 +107,11 @@ namespace osu.Game.Rulesets.Mods
                 set => current.Current = value;
             }
 
-            public SliderControl(BindableNumber<float> currentNumber, RoundedSliderBar<float> slider)
+            public SliderControl(BindableNumber<float> currentNumber, Func<BindableNumber<float>, RoundedSliderBar<float>> createSlider)
             {
                 InternalChildren = new Drawable[]
                 {
-                    slider
+                    createSlider(currentNumber)
                 };
 
                 AutoSizeAxes = Axes.Y;

From bd633889e79da9db86f1163cc24463f19a682602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 08:23:39 +0200
Subject: [PATCH 1325/2100] Remove local preempt time calculation

And just use a hitcircle, and read the actual value. Comes with 100%
less chance of forgetting to update either place in the future.
---
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 933771321c..be41355846 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -1,15 +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;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -76,11 +77,13 @@ namespace osu.Game.Rulesets.Osu.Mods
             public partial class ApproachRateSlider : RoundedSliderBar<float>
             {
                 public override LocalisableString TooltipText =>
-                    $"{base.TooltipText} ({millisecondsFromApproachRate(Current.Value, 1.0f)} ms)";
+                    $"{base.TooltipText} ({getPreemptTime(Current.Value):0} ms)";
 
-                private double millisecondsFromApproachRate(float value, float clockRate)
+                private double getPreemptTime(float approachRate)
                 {
-                    return Math.Round(1800 - Math.Min(value, 5) * 120 - (value >= 5 ? (value - 5) * 150 : 0) / clockRate);
+                    var hitCircle = new HitCircle();
+                    hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { ApproachRate = approachRate });
+                    return hitCircle.TimePreempt;
                 }
             }
         }

From 323a4f4522040f92dc8023b65b5add32198a01ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 08:30:02 +0200
Subject: [PATCH 1326/2100] Only show preempt time when limits are extended

---
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index be41355846..f35b1abc42 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -77,7 +77,9 @@ namespace osu.Game.Rulesets.Osu.Mods
             public partial class ApproachRateSlider : RoundedSliderBar<float>
             {
                 public override LocalisableString TooltipText =>
-                    $"{base.TooltipText} ({getPreemptTime(Current.Value):0} ms)";
+                    (Current as BindableNumber<float>)?.MinValue < 0
+                        ? $"{base.TooltipText} ({getPreemptTime(Current.Value):0} ms)"
+                        : base.TooltipText;
 
                 private double getPreemptTime(float approachRate)
                 {

From b34a36f6cec639d1ac8d987002dd0a893214c9cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 17:41:28 +0900
Subject: [PATCH 1327/2100] Remove all usage of `LegacyDifficultyControlPoint`

---
 .../Legacy/DistanceObjectPatternGenerator.cs  | 13 +++--
 .../Beatmaps/TaikoBeatmapConverter.cs         |  7 +--
 .../Formats/LegacyBeatmapDecoderTest.cs       |  4 +-
 .../ControlPoints/DifficultyControlPoint.cs   | 12 +++-
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 11 ++--
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    | 57 -------------------
 osu.Game/Rulesets/Objects/HitObject.cs        |  6 --
 .../Objects/Types/IHasSliderVelocity.cs       | 19 +++++++
 8 files changed, 46 insertions(+), 83 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 49c1a055a6..fec4dbf285 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -10,10 +10,10 @@ using System.Linq;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Objects;
 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.Utils;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
@@ -50,10 +50,11 @@ 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;
-            else if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocityMultiplier;
+
+            if (hitObject is IHasSliderVelocity hasSliderVelocity)
+            {
+                beatLength = timingPoint.BeatLength / hasSliderVelocity.GetPrecisionAdjustedSliderVelocityMultiplier(ManiaRuleset.SHORT_NAME);
+            }
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 3e9252e1fd..339c671943 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -186,10 +186,9 @@ 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;
-            else if (obj is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocityMultiplier;
+
+            if (obj is IHasSliderVelocity hasSliderVelocity)
+                beatLength = timingPoint.BeatLength / hasSliderVelocity.GetPrecisionAdjustedSliderVelocityMultiplier(TaikoRuleset.SHORT_NAME);
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 970b6aaf60..65ea228996 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -1025,8 +1025,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(controlPoints.DifficultyPointAt(3000).SliderVelocity, Is.EqualTo(1));
 
 #pragma warning disable 618
-                Assert.That(((LegacyBeatmapDecoder.LegacyDifficultyControlPoint)controlPoints.DifficultyPointAt(2000)).GenerateTicks, Is.False);
-                Assert.That(((LegacyBeatmapDecoder.LegacyDifficultyControlPoint)controlPoints.DifficultyPointAt(3000)).GenerateTicks, Is.True);
+                Assert.That(controlPoints.DifficultyPointAt(2000).GenerateTicks, Is.False);
+                Assert.That(controlPoints.DifficultyPointAt(3000).GenerateTicks, Is.True);
 #pragma warning restore 618
             }
         }
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index e6f1609d7f..2827ea6513 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -28,6 +28,12 @@ namespace osu.Game.Beatmaps.ControlPoints
             MaxValue = 10
         };
 
+        /// <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; } = true;
+
         public override Color4 GetRepresentingColour(OsuColour colours) => colours.Lime1;
 
         /// <summary>
@@ -41,11 +47,13 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool IsRedundant(ControlPoint? existing)
             => existing is DifficultyControlPoint existingDifficulty
+               && GenerateTicks == existingDifficulty.GenerateTicks
                && SliderVelocity == existingDifficulty.SliderVelocity;
 
         public override void CopyFrom(ControlPoint other)
         {
             SliderVelocity = ((DifficultyControlPoint)other).SliderVelocity;
+            GenerateTicks = ((DifficultyControlPoint)other).GenerateTicks;
 
             base.CopyFrom(other);
         }
@@ -56,8 +64,10 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public bool Equals(DifficultyControlPoint? other)
             => base.Equals(other)
+               && GenerateTicks == other.GenerateTicks
                && SliderVelocity == other.SliderVelocity;
 
-        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), SliderVelocity);
+        // ReSharper disable once NonReadonlyMemberInGetHashCode
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), SliderVelocity, GenerateTicks);
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 7c375b7604..f47a555847 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -103,12 +103,8 @@ namespace osu.Game.Beatmaps.Formats
         {
             DifficultyControlPoint difficultyControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.DifficultyPointAt(hitObject.StartTime) ?? DifficultyControlPoint.DEFAULT;
 
-            if (difficultyControlPoint is LegacyDifficultyControlPoint legacyDifficultyControlPoint)
-            {
-                hitObject.LegacyBpmMultiplier = legacyDifficultyControlPoint.BpmMultiplier;
-                if (hitObject is IHasGenerateTicks hasGenerateTicks)
-                    hasGenerateTicks.GenerateTicks = legacyDifficultyControlPoint.GenerateTicks;
-            }
+            if (hitObject is IHasGenerateTicks hasGenerateTicks)
+                hasGenerateTicks.GenerateTicks = difficultyControlPoint.GenerateTicks;
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
                 hasSliderVelocity.SliderVelocityMultiplier = difficultyControlPoint.SliderVelocity;
@@ -497,8 +493,9 @@ namespace osu.Game.Beatmaps.Formats
 
             int onlineRulesetID = beatmap.BeatmapInfo.Ruleset.OnlineID;
 
-            addControlPoint(time, new LegacyDifficultyControlPoint(onlineRulesetID, beatLength)
+            addControlPoint(time, new DifficultyControlPoint
             {
+                GenerateTicks = !double.IsNaN(beatLength),
                 SliderVelocity = speedMultiplier,
             }, timingChange);
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 23440b8a1d..93af9cf41c 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -163,63 +163,6 @@ namespace osu.Game.Beatmaps.Formats
             Mania,
         }
 
-        [Obsolete("Do not use unless you're a legacy ruleset and 100% sure.")]
-        public class LegacyDifficultyControlPoint : DifficultyControlPoint, IEquatable<LegacyDifficultyControlPoint>
-        {
-            /// <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; private set; }
-
-            /// <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; private set; } = true;
-
-            public LegacyDifficultyControlPoint(int rulesetId, double beatLength)
-                : this()
-            {
-                // Note: In stable, the division occurs on floats, but with compiler optimisations turned on actually seems to occur on doubles via some .NET black magic (possibly inlining?).
-                if (rulesetId == 1 || rulesetId == 3)
-                    BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100.0 : 1;
-                else
-                    BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 1000) / 100.0 : 1;
-
-                GenerateTicks = !double.IsNaN(beatLength);
-            }
-
-            public LegacyDifficultyControlPoint()
-            {
-                SliderVelocityBindable.Precision = double.Epsilon;
-            }
-
-            public override bool IsRedundant(ControlPoint? existing)
-                => base.IsRedundant(existing)
-                   && GenerateTicks == ((existing as LegacyDifficultyControlPoint)?.GenerateTicks ?? true);
-
-            public override void CopyFrom(ControlPoint other)
-            {
-                base.CopyFrom(other);
-
-                BpmMultiplier = ((LegacyDifficultyControlPoint)other).BpmMultiplier;
-                GenerateTicks = ((LegacyDifficultyControlPoint)other).GenerateTicks;
-            }
-
-            public override bool Equals(ControlPoint? other)
-                => other is LegacyDifficultyControlPoint otherLegacyDifficultyControlPoint
-                   && Equals(otherLegacyDifficultyControlPoint);
-
-            public bool Equals(LegacyDifficultyControlPoint? other)
-                => base.Equals(other)
-                   && BpmMultiplier == other.BpmMultiplier
-                   && GenerateTicks == other.GenerateTicks;
-
-            // ReSharper disable twice NonReadonlyMemberInGetHashCode
-            public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), BpmMultiplier, GenerateTicks);
-        }
-
         internal class LegacySampleControlPoint : SampleControlPoint, IEquatable<LegacySampleControlPoint>
         {
             public int CustomSampleBank;
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index ed3d3a6eb2..ec2a4a31f6 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -76,12 +76,6 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public virtual IList<HitSampleInfo> AuxiliarySamples => ImmutableList<HitSampleInfo>.Empty;
 
-        /// <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/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
index e665dcc752..34c2bda05c 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.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.Bindables;
 
 namespace osu.Game.Rulesets.Objects.Types
@@ -16,5 +17,23 @@ namespace osu.Game.Rulesets.Objects.Types
         double SliderVelocityMultiplier { get; set; }
 
         BindableNumber<double> SliderVelocityMultiplierBindable { get; }
+
+        /// <summary>
+        /// Introduces floating-point errors for rulesets that depend on it.
+        /// </summary>
+        public double GetPrecisionAdjustedSliderVelocityMultiplier(string rulesetShortName)
+        {
+            double beatLength = -100 / SliderVelocityMultiplier;
+
+            switch (rulesetShortName)
+            {
+                case "taiko":
+                case "mania":
+                    return 1 / (beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100.0 : 1);
+
+                default:
+                    return 1 / (beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 1000) / 100.0 : 1);
+            }
+        }
     }
 }

From dcbdc114ce9669146544f37c6b1d3cac0e44537e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 17:41:50 +0900
Subject: [PATCH 1328/2100] Remove precision limitations of `SliderVelocity`

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs                   | 1 -
 osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 1e7e8e2981..8bf19f030f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -136,7 +136,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public BindableNumber<double> SliderVelocityMultiplierBindable { get; } = new BindableDouble(1)
         {
-            Precision = 0.01,
             MinValue = 0.1,
             MaxValue = 10
         };
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 2827ea6513..05230c85f4 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         public readonly BindableDouble SliderVelocityBindable = new BindableDouble(1)
         {
-            Precision = 0.01,
             MinValue = 0.1,
             MaxValue = 10
         };

From 64baa4d01ae7bb9a2659a83c3e3238d2fbb07ef2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 18:20:07 +0900
Subject: [PATCH 1329/2100] Add test coverage of failing slider tick generation
 edge case

---
 .../OsuBeatmapConversionTest.cs               |  1 +
 ...r-ticks-edge-case-expected-conversion.json | 39 +++++++++++++++++++
 .../Beatmaps/slider-ticks-edge-case.osu       | 31 +++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index b94e9f38c6..08eea35425 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase("basic")]
         [TestCase("colinear-perfect-curve")]
         [TestCase("slider-ticks")]
+        [TestCase("slider-ticks-edge-case")]
         [TestCase("repeat-slider")]
         [TestCase("uneven-repeat-slider")]
         [TestCase("old-stacking")]
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
new file mode 100644
index 0000000000..657121d812
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
@@ -0,0 +1,39 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 7493.0,
+      "Objects": [
+        {
+          "StartTime": 7493.0,
+          "EndTime": 7493.0,
+          "X": 130.0,
+          "Y": 232.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 7843.0,
+          "EndTime": 7843.0,
+          "X": 33.7820168,
+          "Y": 208.9957,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 7817.0,
+          "EndTime": 7817.0,
+          "X": 30.9946651,
+          "Y": 208.5157,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu
new file mode 100644
index 0000000000..daf35e1d2b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu
@@ -0,0 +1,31 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:3.4
+OverallDifficulty:4
+ApproachRate:5.5
+SliderMultiplier:1.1
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+0,0,"aa.jpg",0,0
+//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]
+6967,350.877192982456,6,2,1,55,1,0
+6967,-100,3,2,1,55,0,0
+7493,-111.111111111111,3,2,1,55,0,0
+
+[HitObjects]
+130,232,7493,6,0,P|78:218|28:208,1,101.82149697876,0|0,3:2|2:0,2:0:0:0:

From 22ee64cfdad8af87baf37cf9a925b59f9ca6837c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 18:19:54 +0900
Subject: [PATCH 1330/2100] Fix sliders not always being the correct length

This is another similar case where stable floating point precision comes
into play due to use of `hitObjectManager.Beatmap.BpmMultiplierAt` (see
https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/GameplayElements/HitObjects/Osu/SliderOsu.cs#L680)

Closes #24708.
---
 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 8bf19f030f..f40c301220 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * SliderVelocityMultiplier;
+            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * ((IHasSliderVelocity)this).GetPrecisionAdjustedSliderVelocityMultiplier(OsuRuleset.SHORT_NAME);
 
             Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;

From 2334be1987deb34344bca65445e08788fd2acef7 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Sep 2023 17:43:23 +0900
Subject: [PATCH 1331/2100] Split legacy scoring attributes into a separate
 object

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  1 +
 .../Difficulty/CatchDifficultyCalculator.cs   | 12 -----
 .../Difficulty/CatchLegacyScoreSimulator.cs   | 35 +++++++------
 .../Difficulty/ManiaDifficultyCalculator.cs   | 13 -----
 .../Difficulty/ManiaLegacyScoreSimulator.cs   | 18 ++-----
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  1 +
 .../Difficulty/OsuDifficultyCalculator.cs     | 12 -----
 .../Difficulty/OsuLegacyScoreSimulator.cs     | 37 +++++++-------
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  1 +
 .../Difficulty/TaikoDifficultyCalculator.cs   | 12 -----
 .../Difficulty/TaikoLegacyScoreSimulator.cs   | 50 +++++++++----------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  1 +
 .../StandardisedScoreMigrationTools.cs        | 20 +++-----
 .../Difficulty/DifficultyAttributes.cs        | 11 ----
 .../Difficulty/DifficultyCalculator.cs        |  7 ---
 osu.Game/Rulesets/ILegacyRuleset.cs           |  2 +-
 .../Rulesets/Scoring/ILegacyScoreSimulator.cs | 40 ---------------
 .../Scoring/Legacy/ILegacyScoreSimulator.cs   | 20 ++++++++
 .../Scoring/Legacy/LegacyScoreAttributes.cs   | 23 +++++++++
 19 files changed, 117 insertions(+), 199 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
 create mode 100644 osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
 create mode 100644 osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index bd6b857fe8..efd4b46782 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -25,6 +25,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking.Statistics;
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 0b56405299..b826c1f546 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -25,12 +25,9 @@ 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)
@@ -49,15 +46,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                 MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet)),
             };
 
-            if (ComputeLegacyScoringValues)
-            {
-                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/CatchLegacyScoreSimulator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index c79fd36d96..0183d723b2 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -2,33 +2,26 @@
 // 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.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.Scoring.Legacy;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
 {
     internal class CatchLegacyScoreSimulator : ILegacyScoreSimulator
     {
-        public int AccuracyScore { get; private set; }
-
-        public int ComboScore { get; private set; }
-
-        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
-
         private int legacyBonusScore;
-        private int modernBonusScore;
+        private int standardisedBonusScore;
         private int combo;
 
         private double scoreMultiplier;
 
-        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
             IBeatmap baseBeatmap = workingBeatmap.Beatmap;
 
@@ -70,13 +63,19 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                  + baseBeatmap.Difficulty.CircleSize
                  + Math.Clamp((float)objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
-            scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+            scoreMultiplier = difficultyPeppyStars;
+
+            LegacyScoreAttributes attributes = new LegacyScoreAttributes();
 
             foreach (var obj in playableBeatmap.HitObjects)
-                simulateHit(obj);
+                simulateHit(obj, ref attributes);
+
+            attributes.BonusScoreRatio = legacyBonusScore == 0 ? 0 : (double)standardisedBonusScore / legacyBonusScore;
+
+            return attributes;
         }
 
-        private void simulateHit(HitObject hitObject)
+        private void simulateHit(HitObject hitObject, ref LegacyScoreAttributes attributes)
         {
             bool increaseCombo = true;
             bool addScoreComboMultiplier = false;
@@ -112,28 +111,28 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
                 case JuiceStream:
                     foreach (var nested in hitObject.NestedHitObjects)
-                        simulateHit(nested);
+                        simulateHit(nested, ref attributes);
                     return;
 
                 case BananaShower:
                     foreach (var nested in hitObject.NestedHitObjects)
-                        simulateHit(nested);
+                        simulateHit(nested, ref attributes);
                     return;
             }
 
             if (addScoreComboMultiplier)
             {
                 // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
-                ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * scoreMultiplier));
+                attributes.ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * scoreMultiplier));
             }
 
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                modernBonusScore += Judgement.ToNumericResult(bonusResult);
+                standardisedBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else
-                AccuracyScore += scoreIncrease;
+                attributes.AccuracyScore += scoreIncrease;
 
             if (increaseCombo)
                 combo++;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index de9f0d91ae..6bb6879052 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -31,13 +31,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;
         }
@@ -60,15 +56,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 MaxCombo = beatmap.HitObjects.Sum(maxComboForObject),
             };
 
-            if (ComputeLegacyScoringValues)
-            {
-                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/ManiaLegacyScoreSimulator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
index e544428979..098ccdf21d 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
@@ -1,28 +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.Game.Beatmaps;
-using osu.Game.Rulesets.Mania.Mods;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets.Mania.Difficulty
 {
     internal class ManiaLegacyScoreSimulator : ILegacyScoreSimulator
     {
-        public int AccuracyScore => 0;
-        public int ComboScore { get; private set; }
-        public double BonusScoreRatio => 0;
-
-        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
-            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);
-
-            ComboScore = (int)(1000000 * multiplier);
+            return new LegacyScoreAttributes { ComboScore = 1000000 };
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 4507015169..b977c07dfb 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -33,6 +33,7 @@ using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Edit.Setup;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index b92092c674..3b580a5b59 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -26,12 +26,9 @@ 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)
@@ -109,15 +106,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 SpinnerCount = spinnerCount,
             };
 
-            if (ComputeLegacyScoringValues)
-            {
-                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/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 980d86e4ad..3448a7b033 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -2,34 +2,27 @@
 // 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.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets.Osu.Difficulty
 {
     internal class OsuLegacyScoreSimulator : ILegacyScoreSimulator
     {
-        public int AccuracyScore { get; private set; }
-
-        public int ComboScore { get; private set; }
-
-        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
-
         private int legacyBonusScore;
-        private int modernBonusScore;
+        private int standardisedBonusScore;
         private int combo;
 
         private double scoreMultiplier;
         private IBeatmap playableBeatmap = null!;
 
-        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
             this.playableBeatmap = playableBeatmap;
 
@@ -73,13 +66,19 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                  + baseBeatmap.Difficulty.CircleSize
                  + Math.Clamp((float)objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
-            scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+            scoreMultiplier = difficultyPeppyStars;
+
+            LegacyScoreAttributes attributes = new LegacyScoreAttributes();
 
             foreach (var obj in playableBeatmap.HitObjects)
-                simulateHit(obj);
+                simulateHit(obj, ref attributes);
+
+            attributes.BonusScoreRatio = legacyBonusScore == 0 ? 0 : (double)standardisedBonusScore / legacyBonusScore;
+
+            return attributes;
         }
 
-        private void simulateHit(HitObject hitObject)
+        private void simulateHit(HitObject hitObject, ref LegacyScoreAttributes attributes)
         {
             bool increaseCombo = true;
             bool addScoreComboMultiplier = false;
@@ -122,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
                 case Slider:
                     foreach (var nested in hitObject.NestedHitObjects)
-                        simulateHit(nested);
+                        simulateHit(nested, ref attributes);
 
                     scoreIncrease = 300;
                     increaseCombo = false;
@@ -146,9 +145,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     for (int i = 0; i <= totalHalfSpinsPossible; i++)
                     {
                         if (i > halfSpinsRequiredBeforeBonus && (i - halfSpinsRequiredBeforeBonus) % 2 == 0)
-                            simulateHit(new SpinnerBonusTick());
+                            simulateHit(new SpinnerBonusTick(), ref attributes);
                         else if (i > 1 && i % 2 == 0)
-                            simulateHit(new SpinnerTick());
+                            simulateHit(new SpinnerTick(), ref attributes);
                     }
 
                     scoreIncrease = 300;
@@ -159,16 +158,16 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (addScoreComboMultiplier)
             {
                 // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
-                ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * scoreMultiplier));
+                attributes.ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * scoreMultiplier));
             }
 
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                modernBonusScore += Judgement.ToNumericResult(bonusResult);
+                standardisedBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else
-                AccuracyScore += scoreIncrease;
+                attributes.AccuracyScore += scoreIncrease;
 
             if (increaseCombo)
                 combo++;
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 220dc53705..607b83d379 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -33,6 +33,7 @@ using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Edit.Setup;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 25adba5ab6..ab193caaa3 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -25,12 +25,9 @@ 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)
@@ -99,15 +96,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 MaxCombo = beatmap.HitObjects.Count(h => h is Hit),
             };
 
-            if (ComputeLegacyScoringValues)
-            {
-                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/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index e77327d622..149552604f 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -2,39 +2,29 @@
 // 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.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
 {
     internal class TaikoLegacyScoreSimulator : ILegacyScoreSimulator
     {
-        public int AccuracyScore { get; private set; }
-
-        public int ComboScore { get; private set; }
-
-        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
-
         private int legacyBonusScore;
-        private int modernBonusScore;
+        private int standardisedBonusScore;
         private int combo;
 
-        private double modMultiplier;
         private int difficultyPeppyStars;
         private IBeatmap playableBeatmap = null!;
-        private IReadOnlyList<Mod> mods = null!;
 
-        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
             this.playableBeatmap = playableBeatmap;
-            this.mods = mods;
 
             IBeatmap baseBeatmap = workingBeatmap.Beatmap;
 
@@ -76,13 +66,17 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                  + baseBeatmap.Difficulty.CircleSize
                  + Math.Clamp((float)objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
-            modMultiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+            LegacyScoreAttributes attributes = new LegacyScoreAttributes();
 
             foreach (var obj in playableBeatmap.HitObjects)
-                simulateHit(obj);
+                simulateHit(obj, ref attributes);
+
+            attributes.BonusScoreRatio = legacyBonusScore == 0 ? 0 : (double)standardisedBonusScore / legacyBonusScore;
+
+            return attributes;
         }
 
-        private void simulateHit(HitObject hitObject)
+        private void simulateHit(HitObject hitObject, ref LegacyScoreAttributes attributes)
         {
             bool increaseCombo = true;
             bool addScoreComboMultiplier = false;
@@ -117,13 +111,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
                     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));
+                    //
+                    // Normally, this multiplier depends on the active mods (DT = 0.75, HT = 1.5). For simplicity, however, we'll only consider the worst case.
+                    // This way, scores remain beatable at the cost of the conversion being slightly inaccurate.
+                    //   - A perfect DT/NM score will have less than 1M total score (excluding bonus).
+                    //   - A perfect HT score will have 1M total score (excluding bonus).
+                    //
+                    halfSpinsRequiredForCompletion = Math.Max(1, (int)(halfSpinsRequiredForCompletion * 1.5f));
 
                     for (int i = 0; i <= halfSpinsRequiredForCompletion; i++)
-                        simulateHit(new SwellTick());
+                        simulateHit(new SwellTick(), ref attributes);
 
                     scoreIncrease = 300;
                     addScoreComboMultiplier = true;
@@ -139,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
                 case DrumRoll:
                     foreach (var nested in hitObject.NestedHitObjects)
-                        simulateHit(nested);
+                        simulateHit(nested, ref attributes);
                     return;
             }
 
@@ -159,8 +156,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             {
                 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);
+                scoreIncrease += (int)(scoreIncrease / 35f * 2 * (difficultyPeppyStars + 1)) * (Math.Min(100, combo) / 10);
 
                 if (hitObject is Swell)
                 {
@@ -185,15 +181,15 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             scoreIncrease -= comboScoreIncrease;
 
             if (addScoreComboMultiplier)
-                ComboScore += comboScoreIncrease;
+                attributes.ComboScore += comboScoreIncrease;
 
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                modernBonusScore += Judgement.ToNumericResult(bonusResult);
+                standardisedBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else
-                AccuracyScore += scoreIncrease;
+                attributes.AccuracyScore += scoreIncrease;
 
             if (increaseCombo)
                 combo++;
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 584a91bfdc..072653dcbf 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -34,6 +34,7 @@ using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.Taiko.Configuration;
 
 namespace osu.Game.Rulesets.Taiko
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 11a5e252a3..d1020aea3b 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Scoring;
 
 namespace osu.Game.Database
@@ -222,15 +223,9 @@ namespace osu.Game.Database
                 throw new InvalidOperationException("Beatmap contains no hit objects!");
 
             ILegacyScoreSimulator sv1Simulator = legacyRuleset.CreateLegacyScoreSimulator();
+            LegacyScoreAttributes attributes = sv1Simulator.Simulate(beatmap, playableBeatmap);
 
-            sv1Simulator.Simulate(beatmap, playableBeatmap, mods);
-
-            return ConvertFromLegacyTotalScore(score, new DifficultyAttributes
-            {
-                LegacyAccuracyScore = sv1Simulator.AccuracyScore,
-                LegacyComboScore = sv1Simulator.ComboScore,
-                LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio
-            });
+            return ConvertFromLegacyTotalScore(score, attributes);
         }
 
         /// <summary>
@@ -241,18 +236,19 @@ namespace osu.Game.Database
         /// (<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)
+        public static long ConvertFromLegacyTotalScore(ScoreInfo score, LegacyScoreAttributes attributes)
         {
             if (!score.IsLegacyScore)
                 return score.TotalScore;
 
             Debug.Assert(score.LegacyTotalScore != null);
 
-            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);
 
+            int maximumLegacyAccuracyScore = attributes.AccuracyScore;
+            int maximumLegacyComboScore = (int)Math.Round(attributes.ComboScore * modMultiplier);
+            double maximumLegacyBonusRatio = attributes.BonusScoreRatio;
+
             // The part of total score that doesn't include bonus.
             int maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
 
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index f62eeab5d7..6043731e6e 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -27,9 +27,6 @@ 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_ACCURACY_SCORE = 23;
-        protected const int ATTRIB_ID_LEGACY_COMBO_SCORE = 25;
-        protected const int ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO = 27;
 
         /// <summary>
         /// The mods which were applied to the beatmap.
@@ -91,9 +88,6 @@ 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_ACCURACY_SCORE, LegacyAccuracyScore);
-            yield return (ATTRIB_ID_LEGACY_COMBO_SCORE, LegacyComboScore);
-            yield return (ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO, LegacyBonusScoreRatio);
         }
 
         /// <summary>
@@ -104,11 +98,6 @@ namespace osu.Game.Rulesets.Difficulty
         public virtual void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
             MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
-
-            // Temporarily allow these attributes to not exist so as to not block releases of server-side components while these attributes aren't populated/used yet.
-            LegacyAccuracyScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_ACCURACY_SCORE);
-            LegacyComboScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_COMBO_SCORE);
-            LegacyBonusScoreRatio = values.GetValueOrDefault(ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index d005bbfc7a..00c90bd317 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -23,13 +23,6 @@ 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>
diff --git a/osu.Game/Rulesets/ILegacyRuleset.cs b/osu.Game/Rulesets/ILegacyRuleset.cs
index 24aa672219..6900afa243 100644
--- a/osu.Game/Rulesets/ILegacyRuleset.cs
+++ b/osu.Game/Rulesets/ILegacyRuleset.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 osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets
 {
diff --git a/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs b/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
deleted file mode 100644
index 7240f0d73e..0000000000
--- a/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
+++ /dev/null
@@ -1,40 +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.Collections.Generic;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mods;
-
-namespace osu.Game.Rulesets.Scoring
-{
-    /// <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.
-        /// </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; }
-
-        /// <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/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
new file mode 100644
index 0000000000..3cea58b2b7
--- /dev/null
+++ b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.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.Beatmaps;
+
+namespace osu.Game.Rulesets.Scoring.Legacy
+{
+    /// <summary>
+    /// Generates attributes which are required to calculate old-style Score V1 scores.
+    /// </summary>
+    public interface ILegacyScoreSimulator
+    {
+        /// <summary>
+        /// Performs the simulation, scoring values 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>
+        LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap);
+    }
+}
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs
new file mode 100644
index 0000000000..47ab68bf88
--- /dev/null
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs
@@ -0,0 +1,23 @@
+// Copyright (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.Scoring.Legacy
+{
+    public struct LegacyScoreAttributes
+    {
+        /// <summary>
+        /// The accuracy portion of the legacy (ScoreV1) total score.
+        /// </summary>
+        public int AccuracyScore;
+
+        /// <summary>
+        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
+        /// </summary>
+        public long ComboScore;
+
+        /// <summary>
+        /// A ratio of standardised score to legacy score for the bonus part of total score.
+        /// </summary>
+        public double BonusScoreRatio;
+    }
+}

From 4198e025fae71703ad546695c980222d69924bee Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 8 Sep 2023 00:27:01 +0900
Subject: [PATCH 1332/2100] Fix overflow

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

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index d1020aea3b..dd7d7c7b1b 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -246,11 +246,11 @@ namespace osu.Game.Database
             double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
 
             int maximumLegacyAccuracyScore = attributes.AccuracyScore;
-            int maximumLegacyComboScore = (int)Math.Round(attributes.ComboScore * modMultiplier);
+            long maximumLegacyComboScore = (long)Math.Round(attributes.ComboScore * modMultiplier);
             double maximumLegacyBonusRatio = attributes.BonusScoreRatio;
 
             // The part of total score that doesn't include bonus.
-            int maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
+            long maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
 
             // The combo proportion is calculated as a proportion of maximumLegacyBaseScore.
             double comboProportion = Math.Min(1, (double)score.LegacyTotalScore / maximumLegacyBaseScore);

From 2bb869732e1b64c0886b33b070a0c78b693cdc07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 18:41:40 +0200
Subject: [PATCH 1333/2100] Delete outdated warning disables

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs | 2 --
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs           | 2 --
 2 files changed, 4 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 65ea228996..be53a3e18a 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -1024,10 +1024,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(controlPoints.DifficultyPointAt(2000).SliderVelocity, Is.EqualTo(1));
                 Assert.That(controlPoints.DifficultyPointAt(3000).SliderVelocity, Is.EqualTo(1));
 
-#pragma warning disable 618
                 Assert.That(controlPoints.DifficultyPointAt(2000).GenerateTicks, Is.False);
                 Assert.That(controlPoints.DifficultyPointAt(3000).GenerateTicks, Is.True);
-#pragma warning restore 618
             }
         }
     }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index f47a555847..37aa7950d3 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#pragma warning disable 618
-
 using System;
 using System.Collections.Generic;
 using System.IO;

From e71fef4b6aa60812eae044916330071acd049758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 18:43:36 +0200
Subject: [PATCH 1334/2100] Remove braces

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

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index fec4dbf285..749ab78fa5 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -52,9 +52,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             double beatLength;
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
-            {
                 beatLength = timingPoint.BeatLength / hasSliderVelocity.GetPrecisionAdjustedSliderVelocityMultiplier(ManiaRuleset.SHORT_NAME);
-            }
             else
                 beatLength = timingPoint.BeatLength;
 

From 59bd6d827e9897ad9a166593ffca850f356cd793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Sep 2023 10:01:32 +0200
Subject: [PATCH 1335/2100] Add failing test case for overlapping objects
 blocking each other when not intended

---
 .../TestSceneLegacyHitPolicy.cs               | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 615044b642..c4413bf7ca 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -555,6 +555,54 @@ namespace osu.Game.Rulesets.Osu.Tests
             addClickActionAssert(0, ClickAction.Hit);
         }
 
+        [Test]
+        public void TestOverlappingObjectsDontBlockEachOtherWhenFullyFadedOut()
+        {
+            const double time_first_circle = 1000;
+            const double time_second_circle = 1200;
+            const double time_third_circle = 1400;
+            Vector2 positionFirstCircle = new Vector2(100);
+            Vector2 positionSecondCircle = new Vector2(200);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new HitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle,
+                },
+                new HitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle,
+                },
+                new HitCircle
+                {
+                    StartTime = time_third_circle,
+                    Position = positionFirstCircle,
+                },
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle + 50, Position = positionFirstCircle },
+                new OsuReplayFrame { Time = time_second_circle, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_second_circle + 50, Position = positionSecondCircle },
+                new OsuReplayFrame { Time = time_third_circle, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_third_circle + 50, Position = positionFirstCircle },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], 0);
+
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[1], 0);
+
+            addJudgementAssert(hitObjects[2], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[2], 0);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",

From 168a828f23407f036edf7b2105a83da2c92c3e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Sep 2023 10:10:03 +0200
Subject: [PATCH 1336/2100] Revert "Block input to objects lying under
 already-hit hitcircles when classic note lock is active"

This reverts commit 03c61a573ec9f8f1e83cd98193fd84bd18a75043.

The goal here was to handle an edge case discovered during work on note
lock, wherein it was determined that on stable hit circles would block
input from reaching objects underneath them. However, the change
mentioned above did that _too_ hard and caused overlaps to also be
blocked even long past a hit circle has been faded out.

Revert the change pending further (and more careful) investigation.
---
 .../TestSceneLegacyHitPolicy.cs               |  3 +--
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   | 23 -------------------
 .../Objects/Drawables/DrawableHitCircle.cs    |  2 +-
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index c4413bf7ca..8c311cce91 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -506,6 +506,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
+        [Ignore("Currently broken, first attempt at fixing broke even harder. See https://github.com/ppy/osu/issues/24743.")]
         public void TestInputDoesNotFallThroughOverlappingSliders()
         {
             const double time_first_slider = 1000;
@@ -549,8 +550,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // the slider head of the first slider prevents the second slider's head from being hit, so the judgement offset should be very late.
-            // this is not strictly done by the hit policy implementation itself (see `OsuModClassic.blockInputToUnderlyingObjects()`),
-            // but we're testing this here anyways to just keep everything related to input handling and note lock in one place.
             addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, referenceHitWindows.WindowFor(HitResult.Meh));
             addClickActionAssert(0, ClickAction.Hit);
         }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 1d95f833b0..5dbf23f7ea 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -74,10 +74,6 @@ namespace osu.Game.Rulesets.Osu.Mods
                     head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(head);
-
-                    if (ClassicNoteLock.Value)
-                        blockInputToUnderlyingObjects(head);
-
                     break;
 
                 case DrawableSliderTail tail:
@@ -87,29 +83,10 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableHitCircle circle:
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(circle);
-
-                    if (ClassicNoteLock.Value)
-                        blockInputToUnderlyingObjects(circle);
-
                     break;
             }
         }
 
-        /// <summary>
-        /// On stable, hitcircles that have already been hit block input from reaching objects that may be underneath them.
-        /// The purpose of this method is to restore that behaviour.
-        /// In order to avoid introducing yet another confusing config option, this behaviour is roped into the general notion of "note lock".
-        /// </summary>
-        private static void blockInputToUnderlyingObjects(DrawableHitCircle circle)
-        {
-            var oldHitAction = circle.HitArea.Hit;
-            circle.HitArea.Hit = () =>
-            {
-                oldHitAction?.Invoke();
-                return true;
-            };
-        }
-
         private void applyEarlyFading(DrawableHitCircle circle)
         {
             circle.ApplyCustomUpdateState += (dho, state) =>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 6beed0294d..932f6d3fff 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     case OsuAction.RightButton:
                         if (IsHovered && (Hit?.Invoke() ?? false))
                         {
-                            HitAction ??= e.Action;
+                            HitAction = e.Action;
                             return true;
                         }
 

From e9b08219e934ecebdfa66b92ffbfccf1589dc1c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Sep 2023 11:08:25 +0200
Subject: [PATCH 1337/2100] Block input to objects lying under already-hit
 slider heads before slider is fully judged when classic note lock is active

---
 .../TestSceneLegacyHitPolicy.cs               |  3 ++-
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   | 21 +++++++++++++++++++
 .../Objects/Drawables/DrawableHitCircle.cs    |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 8c311cce91..0a3639b9ab 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -506,7 +506,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
-        [Ignore("Currently broken, first attempt at fixing broke even harder. See https://github.com/ppy/osu/issues/24743.")]
         public void TestInputDoesNotFallThroughOverlappingSliders()
         {
             const double time_first_slider = 1000;
@@ -550,6 +549,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // the slider head of the first slider prevents the second slider's head from being hit, so the judgement offset should be very late.
+            // this is not strictly done by the hit policy implementation itself (see `OsuModClassic.blockInputToObjectsUnderSliderHead()`),
+            // but we're testing this here anyways to just keep everything related to input handling and note lock in one place.
             addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, referenceHitWindows.WindowFor(HitResult.Meh));
             addClickActionAssert(0, ClickAction.Hit);
         }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 5dbf23f7ea..0148ec1987 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -74,6 +74,10 @@ namespace osu.Game.Rulesets.Osu.Mods
                     head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(head);
+
+                    if (ClassicNoteLock.Value)
+                        blockInputToObjectsUnderSliderHead(head);
+
                     break;
 
                 case DrawableSliderTail tail:
@@ -83,10 +87,27 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableHitCircle circle:
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(circle);
+
                     break;
             }
         }
 
+        /// <summary>
+        /// On stable, slider heads that have already been hit block input from reaching objects that may be underneath them
+        /// until the sliders they're part of have been fully judged.
+        /// The purpose of this method is to restore that behaviour.
+        /// In order to avoid introducing yet another confusing config option, this behaviour is roped into the general notion of "note lock".
+        /// </summary>
+        private static void blockInputToObjectsUnderSliderHead(DrawableSliderHead slider)
+        {
+            var oldHitAction = slider.HitArea.Hit;
+            slider.HitArea.Hit = () =>
+            {
+                oldHitAction?.Invoke();
+                return !slider.DrawableSlider.AllJudged;
+            };
+        }
+
         private void applyEarlyFading(DrawableHitCircle circle)
         {
             circle.ApplyCustomUpdateState += (dho, state) =>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 932f6d3fff..6beed0294d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     case OsuAction.RightButton:
                         if (IsHovered && (Hit?.Invoke() ?? false))
                         {
-                            HitAction = e.Action;
+                            HitAction ??= e.Action;
                             return true;
                         }
 

From 628517569bb22a6223c801c570e666118b83ac9b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 8 Sep 2023 21:08:09 +0900
Subject: [PATCH 1338/2100] Fix another difficulty-specific value

---
 .../Difficulty/OsuLegacyScoreSimulator.cs              | 10 +++++-----
 .../Difficulty/TaikoLegacyScoreSimulator.cs            | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 3448a7b033..a8ac52714c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -20,12 +20,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         private int combo;
 
         private double scoreMultiplier;
-        private IBeatmap playableBeatmap = null!;
 
         public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
-            this.playableBeatmap = playableBeatmap;
-
             IBeatmap baseBeatmap = workingBeatmap.Beatmap;
 
             int countNormal = 0;
@@ -132,13 +129,16 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     // 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);
+
+                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that maximises rotations.
+                    const double minimum_rotations_per_second = 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);
+                    int halfSpinsRequiredForCompletion = (int)(secondsDuration * minimum_rotations_per_second);
                     // To be able to receive bonus points, the spinner must be rotated another 1.5 times.
                     int halfSpinsRequiredBeforeBonus = halfSpinsRequiredForCompletion + 3;
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index 149552604f..f3f318f2f2 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -103,16 +103,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 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;
+
+                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that maximises rotations.
+                    const double minimum_rotations_per_second = 7.5;
 
                     // The amount of half spins that are required to successfully complete the spinner (i.e. get a 300).
-                    int halfSpinsRequiredForCompletion = (int)(secondsDuration * minimumRotationsPerSecond);
-
+                    int halfSpinsRequiredForCompletion = (int)(swell.Duration / 1000 * minimum_rotations_per_second);
                     halfSpinsRequiredForCompletion = (int)Math.Max(1, halfSpinsRequiredForCompletion * 1.65f);
 
                     //
-                    // Normally, this multiplier depends on the active mods (DT = 0.75, HT = 1.5). For simplicity, however, we'll only consider the worst case.
+                    // Normally, this multiplier depends on the active mods (DT = 0.75, HT = 1.5). For simplicity, we'll only consider the worst case that maximises rotations.
                     // This way, scores remain beatable at the cost of the conversion being slightly inaccurate.
                     //   - A perfect DT/NM score will have less than 1M total score (excluding bonus).
                     //   - A perfect HT score will have 1M total score (excluding bonus).

From c68b76d9f421be0a5476c723ccaf25eae1ef5969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Sep 2023 13:53:13 +0200
Subject: [PATCH 1339/2100] Add more test cases for input handling with
 overlapping objects

---
 .../TestSceneLegacyHitPolicy.cs               | 93 ++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 0a3639b9ab..a2ef72fe57 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -556,7 +556,96 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
-        public void TestOverlappingObjectsDontBlockEachOtherWhenFullyFadedOut()
+        public void TestOverlappingSlidersDontBlockEachOtherWhenFullyJudged()
+        {
+            const double time_first_slider = 1000;
+            const double time_second_slider = 1600;
+            Vector2 positionFirstSlider = new Vector2(100, 50);
+            Vector2 positionSecondSlider = new Vector2(100, 80);
+            var midpoint = (positionFirstSlider + positionSecondSlider) / 2;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new Slider
+                {
+                    StartTime = time_first_slider,
+                    Position = positionFirstSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                },
+                new Slider
+                {
+                    StartTime = time_second_slider,
+                    Position = positionSecondSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_slider, Position = midpoint, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_first_slider + 25, Position = midpoint },
+                // this frame doesn't do anything on lazer, but is REQUIRED for correct playback on stable,
+                // because stable during replay playback only updates game state _when it encounters a replay frame_
+                new OsuReplayFrame { Time = 1250, Position = midpoint },
+                new OsuReplayFrame { Time = time_second_slider + 50, Position = midpoint, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_second_slider + 75, Position = midpoint },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Ok);
+            addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
+            addJudgementAssert(hitObjects[1], HitResult.Ok);
+            addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, 50);
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
+        }
+
+        [Test]
+        public void TestOverlappingHitCirclesDontBlockEachOtherWhenBothVisible()
+        {
+            const double time_first_circle = 1000;
+            const double time_second_circle = 1200;
+            Vector2 positionFirstCircle = new Vector2(100);
+            Vector2 positionSecondCircle = new Vector2(120);
+            var midpoint = (positionFirstCircle + positionSecondCircle) / 2;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new HitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle,
+                },
+                new HitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle,
+                },
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle, Position = midpoint, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle + 25, Position = midpoint },
+                new OsuReplayFrame { Time = time_first_circle + 50, Position = midpoint, Actions = { OsuAction.RightButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], 0);
+
+            addJudgementAssert(hitObjects[1], HitResult.Meh);
+            addJudgementOffsetAssert(hitObjects[1], -150);
+        }
+
+        [Test]
+        public void TestOverlappingHitCirclesDontBlockEachOtherWhenFullyFadedOut()
         {
             const double time_first_circle = 1000;
             const double time_second_circle = 1200;
@@ -587,8 +676,10 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 new OsuReplayFrame { Time = time_first_circle, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_first_circle + 50, Position = positionFirstCircle },
+                new OsuReplayFrame { Time = time_second_circle - 50, Position = positionSecondCircle },
                 new OsuReplayFrame { Time = time_second_circle, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_second_circle + 50, Position = positionSecondCircle },
+                new OsuReplayFrame { Time = time_third_circle - 50, Position = positionFirstCircle },
                 new OsuReplayFrame { Time = time_third_circle, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_third_circle + 50, Position = positionFirstCircle },
             });

From 02e2b8546c4089598a60fe99e18a813b59e7ea1b Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 8 Sep 2023 20:32:55 +0300
Subject: [PATCH 1340/2100] fixed all stated problems

---
 osu.Game/Beatmaps/BeatmapShortInfo.cs         | 29 -------
 ...oContainer.cs => ModEffectPreviewPanel.cs} | 82 +++++++++++++++----
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 38 +++++----
 osu.Game/Screens/Select/BeatmapDetails.cs     |  1 -
 .../Screens/Select/Details/AdvancedStats.cs   | 33 --------
 osu.Game/Screens/Select/SongSelect.cs         |  5 +-
 6 files changed, 90 insertions(+), 98 deletions(-)
 delete mode 100644 osu.Game/Beatmaps/BeatmapShortInfo.cs
 rename osu.Game/Overlays/Mods/{ModMapInfoContainer.cs => ModEffectPreviewPanel.cs} (75%)

diff --git a/osu.Game/Beatmaps/BeatmapShortInfo.cs b/osu.Game/Beatmaps/BeatmapShortInfo.cs
deleted file mode 100644
index 633e12d1b2..0000000000
--- a/osu.Game/Beatmaps/BeatmapShortInfo.cs
+++ /dev/null
@@ -1,29 +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;
-
-namespace osu.Game.Beatmaps
-{
-    public class BeatmapShortInfo : IEquatable<BeatmapShortInfo>
-    {
-        public StarDifficulty StarDifficulty;
-        public float CircleSize;
-        public float DrainRate;
-        public float ApproachRate;
-        public float OverallDifficulty;
-        public double BPM;
-        public bool Equals(BeatmapShortInfo? other)
-        {
-            if (ReferenceEquals(null, other)) return false;
-            if (ReferenceEquals(this, other)) return true;
-
-            return StarDifficulty.Stars == other.StarDifficulty.Stars &&
-                   CircleSize.Equals(other.CircleSize) &&
-                   DrainRate.Equals(other.DrainRate) &&
-                   ApproachRate.Equals(other.ApproachRate) &&
-                   OverallDifficulty.Equals(other.OverallDifficulty) &&
-                   BPM.Equals(other.BPM);
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
similarity index 75%
rename from osu.Game/Overlays/Mods/ModMapInfoContainer.cs
rename to osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 281fe8abe5..b6a8dfe827 100644
--- a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -1,8 +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.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
@@ -16,12 +16,14 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
+using System.Threading;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModMapInfoContainer : Container
+    public partial class ModEffectPreviewPanel : CompositeDrawable
     {
         private Container content;
         private Container innerContent;
@@ -37,13 +39,37 @@ namespace osu.Game.Overlays.Mods
         private VerticalAttributeDisplay approachRateDisplay;
         private VerticalAttributeDisplay overallDifficultyDisplay;
 
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        public const float HEIGHT = 50; // as ModSelectOverlay footer buttons
+        private const float transition_duration = 250;
+
+        private IBeatmapInfo beatmapInfo = null!;
+
+        public IBeatmapInfo BeatmapInfo
+        {
+            get => beatmapInfo;
+            set
+            {
+                if (value == beatmapInfo) return;
+
+                beatmapInfo = value;
+                updateStarDifficultyBind();
+                UpdateValues();
+            }
+        }
 
         [Resolved]
-        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; }
+        private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
-        public ModMapInfoContainer()
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        [Resolved]
+        private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
+
+        private CancellationTokenSource cancellationSource = null!;
+        private IBindable<StarDifficulty?> starDifficulty = null!;
+
+        public ModEffectPreviewPanel()
         {
             // values as ModSelectOverlay footer buttons
             const float shear = ShearedOverlayContainer.SHEAR;
@@ -56,7 +82,7 @@ namespace osu.Game.Overlays.Mods
                 Origin = Anchor.BottomRight,
                 Anchor = Anchor.BottomRight,
                 AutoSizeAxes = Axes.X,
-                Height = 50, // as ModSelectOverlay footer buttons
+                Height = HEIGHT,
                 Shear = new Vector2(shear, 0),
                 CornerRadius = corner_radius,
                 BorderThickness = border_thickness,
@@ -146,27 +172,47 @@ namespace osu.Game.Overlays.Mods
         }
         protected override void LoadComplete()
         {
-            adjustedInfo.BindValueChanged(e => { UpdateValues(); }, true);
-
             background.Colour = colourProvider.Background4;
             innerBackground.Colour = colourProvider.Background3;
             Color4 glow_colour = colourProvider.Background1;
 
             content.BorderColour = ColourInfo.GradientVertical(background.Colour, glow_colour);
             innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glow_colour);
-        }
 
+            updateStarDifficultyBind();
+        }
+        private void updateStarDifficultyBind()
+        {
+            if (cancellationSource != null) cancellationSource.Cancel();
+            starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+            starDifficulty.BindValueChanged(s =>
+            {
+                starRatingDisplay.Current.Value = s.NewValue ?? default;
+
+                if (!starRatingDisplay.IsPresent)
+                    starRatingDisplay.FinishTransforms(true);
+
+                starRatingDisplay.FadeIn(transition_duration);
+            });
+        }
         public void UpdateValues()
         {
-            if (adjustedInfo.Value == null) return;
+            if (beatmapInfo == null) return;
 
-            starRatingDisplay.Current.Value = adjustedInfo.Value.StarDifficulty;
-            bpmDisplay.Current.Value = adjustedInfo.Value.BPM;
+            double rate = 1;
+            foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                rate = mod.ApplyToRate(0, rate);
 
-            circleSizeDisplay.Current.Value = adjustedInfo.Value.CircleSize;
-            drainRateDisplay.Current.Value = adjustedInfo.Value.DrainRate;
-            approachRateDisplay.Current.Value = adjustedInfo.Value.ApproachRate;
-            overallDifficultyDisplay.Current.Value = adjustedInfo.Value.OverallDifficulty;
+            bpmDisplay.Current.Value = beatmapInfo.BPM * rate;
+
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(BeatmapInfo.Difficulty);
+            foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
+                mod.ApplyToDifficulty(adjustedDifficulty);
+
+            circleSizeDisplay.Current.Value = adjustedDifficulty.CircleSize;
+            drainRateDisplay.Current.Value = adjustedDifficulty.DrainRate;
+            approachRateDisplay.Current.Value = adjustedDifficulty.ApproachRate;
+            overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
         }
 
         private partial class BPMDisplay : RollingCounter<double>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 8de4447b31..4989c55d49 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -17,6 +17,7 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -27,7 +28,6 @@ using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Utils;
 using osuTK;
-using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Overlays.Mods
@@ -125,7 +125,7 @@ namespace osu.Game.Overlays.Mods
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
 
-        private ModMapInfoContainer mapInfoContainer = null!;
+        private ModEffectPreviewPanel modEffectPreviewPanel = null!;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -133,6 +133,20 @@ namespace osu.Game.Overlays.Mods
 
         private Sample? columnAppearSample;
 
+        private WorkingBeatmap beatmap = null!;
+
+        public WorkingBeatmap Beatmap
+        {
+            get => beatmap;
+            set
+            {
+                if (beatmap == value) return;
+
+                beatmap = value;
+                modEffectPreviewPanel.BeatmapInfo = beatmap.BeatmapInfo;
+            }
+        }
+
         protected ModSelectOverlay(OverlayColourScheme colourScheme = OverlayColourScheme.Green)
             : base(colourScheme)
         {
@@ -224,11 +238,11 @@ namespace osu.Game.Overlays.Mods
 
             FooterContent.Children = new Drawable[]
             {
-                mapInfoContainer = new ModMapInfoContainer
+                modEffectPreviewPanel = new ModEffectPreviewPanel
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
-                    Padding = new MarginPadding
+                    Margin = new MarginPadding
                     {
                         Vertical = PADDING,
                         Horizontal = 70
@@ -286,7 +300,7 @@ namespace osu.Game.Overlays.Mods
 
             SelectedMods.BindValueChanged(_ =>
             {
-                updateMapInfo();
+                modEffectPreviewPanel.UpdateValues();
                 updateMultiplier();
                 updateFromExternalSelection();
                 updateCustomisation();
@@ -300,7 +314,11 @@ namespace osu.Game.Overlays.Mods
                     //
                     // See https://github.com/ppy/osu/pull/23284#issuecomment-1529056988
                     modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);
-                    modSettingChangeTracker.SettingChanged += _ => updateMultiplier();
+                    modSettingChangeTracker.SettingChanged += _ =>
+                    {
+                        modEffectPreviewPanel.UpdateValues();
+                        updateMultiplier();
+                    };
                 }
             }, true);
 
@@ -416,14 +434,6 @@ namespace osu.Game.Overlays.Mods
             multiplierDisplay.Current.Value = multiplier;
         }
 
-        private void updateMapInfo()
-        {
-            if (mapInfoContainer == null)
-                return;
-
-            mapInfoContainer.UpdateValues();
-        }
-
         private void updateCustomisation()
         {
             if (CustomisationButton == null)
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 6ebdca1b8d..712b610515 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -3,7 +3,6 @@
 
 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;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index a12323ab70..f77ed28dae 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -46,9 +46,6 @@ namespace osu.Game.Screens.Select.Details
 
         private IBeatmapInfo beatmapInfo;
 
-        [Resolved(canBeNull: true)]
-        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; } = null;
-
         public IBeatmapInfo BeatmapInfo
         {
             get => beatmapInfo;
@@ -101,33 +98,6 @@ namespace osu.Game.Screens.Select.Details
 
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedStatisticsUpdate;
-
-        private StarDifficulty latestStarDifficulty = new StarDifficulty();
-        private void updateBindedInfo()
-        {
-            if (adjustedInfo == null) return;
-
-            // sadly need to calculate this to prevent additional data transportation
-            double rate = 1;
-            foreach (var mod in mods.Value.OfType<IApplicableToRate>())
-                rate = mod.ApplyToRate(0, rate);
-
-            double bpm = 0;
-            if (beatmapInfo != null) bpm = beatmapInfo.BPM * rate;
-
-            BeatmapShortInfo adjusted = new BeatmapShortInfo()
-            {
-                CircleSize = FirstValue.Value.adjustedValue ?? FirstValue.Value.baseValue,
-                DrainRate = HpDrain.Value.adjustedValue ?? HpDrain.Value.baseValue,
-                ApproachRate = ApproachRate.Value.adjustedValue ?? ApproachRate.Value.baseValue,
-                OverallDifficulty = Accuracy.Value.adjustedValue ?? Accuracy.Value.baseValue,
-                BPM = bpm,
-                StarDifficulty = latestStarDifficulty
-            };
-
-            adjustedInfo.Value = adjusted;
-        }
-
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             modSettingChangeTracker?.Dispose();
@@ -174,7 +144,6 @@ namespace osu.Game.Screens.Select.Details
             Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty);
             ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
 
-            updateBindedInfo(); // to faster UI response (without SR calculation)
             updateStarDifficulty();
         }
 
@@ -208,8 +177,6 @@ namespace osu.Game.Screens.Select.Details
                     return;
 
                 starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
-                latestStarDifficulty = moddedDifficulty ?? default;
-                updateBindedInfo();
 
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         });
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 7749e3937a..f9d41f98ea 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -99,9 +99,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
 
-        [Cached]
-        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; } = new Bindable<BeatmapShortInfo>();
-
         protected BeatmapCarousel Carousel { get; private set; } = null!;
 
         private ParallaxContainer wedgeBackground = null!;
@@ -786,6 +783,8 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Beatmap = beatmap;
 
+            ModSelect.Beatmap = beatmap;
+
             bool beatmapSelected = beatmap is not DummyWorkingBeatmap;
 
             if (beatmapSelected)

From a01537c76301ff6de5c5d68080c7a90e68d23903 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 8 Sep 2023 20:37:07 +0300
Subject: [PATCH 1341/2100] minor format fix

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index f77ed28dae..23298c694b 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -98,6 +98,7 @@ namespace osu.Game.Screens.Select.Details
 
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedStatisticsUpdate;
+
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             modSettingChangeTracker?.Dispose();
@@ -175,7 +176,6 @@ namespace osu.Game.Screens.Select.Details
 
                 if (normalDifficulty == null || moddedDifficulty == null)
                     return;
-
                 starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
 
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);

From ed213dad6c369e66f9277869f3d41dd07135a8ce Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 8 Sep 2023 20:38:24 +0300
Subject: [PATCH 1342/2100] minor format fix (again)

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 23298c694b..a383298faa 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -176,8 +176,8 @@ namespace osu.Game.Screens.Select.Details
 
                 if (normalDifficulty == null || moddedDifficulty == null)
                     return;
-                starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
 
+                starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         });
 

From 507f9642cc7db892326e4ca8a813063def813bba Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 8 Sep 2023 22:15:30 +0300
Subject: [PATCH 1343/2100] Better counter formatization

Now CS and HP have 1 decimal point precision, while AR and OD is kept with 2 because of future support of rate-changed AR/OD
---
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs    | 8 ++++----
 osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index b6a8dfe827..6a101bd9f9 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -159,10 +159,10 @@ namespace osu.Game.Overlays.Mods
                                 Direction = FillDirection.Horizontal,
                                 Children = new[]
                                 {
-                                    circleSizeDisplay = new VerticalAttributeDisplay("CS"),
-                                    drainRateDisplay = new VerticalAttributeDisplay("HP"),
-                                    approachRateDisplay = new VerticalAttributeDisplay("AR"),
-                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD"),
+                                    circleSizeDisplay = new VerticalAttributeDisplay("CS", "0.#"),
+                                    drainRateDisplay = new VerticalAttributeDisplay("HP", "0.#"),
+                                    approachRateDisplay = new VerticalAttributeDisplay("AR", "0.##"),
+                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD", "0.##"),
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index 95d979ebd2..503b07f3b9 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         public LocalisableString Label { get; protected set; }
 
-        public VerticalAttributeDisplay(LocalisableString label)
+        public VerticalAttributeDisplay(LocalisableString label, string format = "0.#")
         {
             Label = label;
             AutoSizeAxes = Axes.X;
@@ -54,7 +54,8 @@ namespace osu.Game.Overlays.Mods
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
-                        Current = { BindTarget = Current }
+                        Current = { BindTarget = Current },
+                        Format = format
                     }
                 }
             };
@@ -64,7 +65,9 @@ namespace osu.Game.Overlays.Mods
         {
             protected override double RollingDuration => 500;
 
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.##");
+            public string Format = "0.#";
+
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(Format);
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {

From 23c4a038487c51fc654eba1a17a409d87856cb4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 08:26:05 +0200
Subject: [PATCH 1344/2100] Fix code inspections

---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 6a101bd9f9..79172a595c 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -25,26 +25,26 @@ namespace osu.Game.Overlays.Mods
 {
     public partial class ModEffectPreviewPanel : CompositeDrawable
     {
-        private Container content;
-        private Container innerContent;
+        private Container content = null!;
+        private Container innerContent = null!;
 
-        private Box background;
-        private Box innerBackground;
+        private Box background = null!;
+        private Box innerBackground = null!;
 
-        private StarRatingDisplay starRatingDisplay;
-        private BPMDisplay bpmDisplay;
+        private StarRatingDisplay starRatingDisplay = null!;
+        private BPMDisplay bpmDisplay = null!;
 
-        private VerticalAttributeDisplay circleSizeDisplay;
-        private VerticalAttributeDisplay drainRateDisplay;
-        private VerticalAttributeDisplay approachRateDisplay;
-        private VerticalAttributeDisplay overallDifficultyDisplay;
+        private VerticalAttributeDisplay circleSizeDisplay = null!;
+        private VerticalAttributeDisplay drainRateDisplay = null!;
+        private VerticalAttributeDisplay approachRateDisplay = null!;
+        private VerticalAttributeDisplay overallDifficultyDisplay = null!;
 
         public const float HEIGHT = 50; // as ModSelectOverlay footer buttons
         private const float transition_duration = 250;
 
-        private IBeatmapInfo beatmapInfo = null!;
+        private IBeatmapInfo? beatmapInfo;
 
-        public IBeatmapInfo BeatmapInfo
+        public IBeatmapInfo? BeatmapInfo
         {
             get => beatmapInfo;
             set
@@ -66,10 +66,11 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
-        private CancellationTokenSource cancellationSource = null!;
+        private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
-        public ModEffectPreviewPanel()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             // values as ModSelectOverlay footer buttons
             const float shear = ShearedOverlayContainer.SHEAR;
@@ -170,20 +171,25 @@ namespace osu.Game.Overlays.Mods
                 }
             };
         }
+
         protected override void LoadComplete()
         {
             background.Colour = colourProvider.Background4;
             innerBackground.Colour = colourProvider.Background3;
-            Color4 glow_colour = colourProvider.Background1;
+            Color4 glowColour = colourProvider.Background1;
 
-            content.BorderColour = ColourInfo.GradientVertical(background.Colour, glow_colour);
-            innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glow_colour);
+            content.BorderColour = ColourInfo.GradientVertical(background.Colour, glowColour);
+            innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glowColour);
 
             updateStarDifficultyBind();
         }
+
         private void updateStarDifficultyBind()
         {
-            if (cancellationSource != null) cancellationSource.Cancel();
+            if (beatmapInfo == null)
+                return;
+
+            cancellationSource?.Cancel();
             starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
             starDifficulty.BindValueChanged(s =>
             {
@@ -195,9 +201,11 @@ namespace osu.Game.Overlays.Mods
                 starRatingDisplay.FadeIn(transition_duration);
             });
         }
+
         public void UpdateValues()
         {
-            if (beatmapInfo == null) return;
+            if (beatmapInfo == null)
+                return;
 
             double rate = 1;
             foreach (var mod in mods.Value.OfType<IApplicableToRate>())
@@ -205,7 +213,7 @@ namespace osu.Game.Overlays.Mods
 
             bpmDisplay.Current.Value = beatmapInfo.BPM * rate;
 
-            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(BeatmapInfo.Difficulty);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(beatmapInfo.Difficulty);
             foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
                 mod.ApplyToDifficulty(adjustedDifficulty);
 

From c1a2b86f3f95142b5f0c73b2d2ae5acbd4006aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 08:29:37 +0200
Subject: [PATCH 1345/2100] Extract constants properly

---
 osu.Game/Graphics/UserInterface/ShearedButton.cs | 14 ++++++++------
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs  | 13 +++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ShearedButton.cs b/osu.Game/Graphics/UserInterface/ShearedButton.cs
index f1afacb2f4..b1e7066a01 100644
--- a/osu.Game/Graphics/UserInterface/ShearedButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedButton.cs
@@ -17,6 +17,10 @@ namespace osu.Game.Graphics.UserInterface
 {
     public partial class ShearedButton : OsuClickableContainer
     {
+        public const float HEIGHT = 50;
+        public const float CORNER_RADIUS = 7;
+        public const float BORDER_THICKNESS = 2;
+
         public LocalisableString Text
         {
             get => text.Text;
@@ -83,12 +87,10 @@ namespace osu.Game.Graphics.UserInterface
         /// </param>
         public ShearedButton(float? width = null)
         {
-            Height = 50;
+            Height = HEIGHT;
             Padding = new MarginPadding { Horizontal = shear * 50 };
 
-            const float corner_radius = 7;
-
-            Content.CornerRadius = corner_radius;
+            Content.CornerRadius = CORNER_RADIUS;
             Content.Shear = new Vector2(shear, 0);
             Content.Masking = true;
             Content.Anchor = Content.Origin = Anchor.Centre;
@@ -98,9 +100,9 @@ namespace osu.Game.Graphics.UserInterface
                 backgroundLayer = new Container
                 {
                     RelativeSizeAxes = Axes.Y,
-                    CornerRadius = corner_radius,
+                    CornerRadius = CORNER_RADIUS,
                     Masking = true,
-                    BorderThickness = 2,
+                    BorderThickness = BORDER_THICKNESS,
                     Children = new Drawable[]
                     {
                         background = new Box
diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 79172a595c..aa7ddc47bc 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Overlays.Mods
         private VerticalAttributeDisplay approachRateDisplay = null!;
         private VerticalAttributeDisplay overallDifficultyDisplay = null!;
 
-        public const float HEIGHT = 50; // as ModSelectOverlay footer buttons
         private const float transition_duration = 250;
 
         private IBeatmapInfo? beatmapInfo;
@@ -74,8 +73,6 @@ namespace osu.Game.Overlays.Mods
         {
             // values as ModSelectOverlay footer buttons
             const float shear = ShearedOverlayContainer.SHEAR;
-            const float corner_radius = 7;
-            const float border_thickness = 2;
 
             AutoSizeAxes = Axes.Both;
             InternalChild = content = new InputBlockingContainer
@@ -83,10 +80,10 @@ namespace osu.Game.Overlays.Mods
                 Origin = Anchor.BottomRight,
                 Anchor = Anchor.BottomRight,
                 AutoSizeAxes = Axes.X,
-                Height = HEIGHT,
+                Height = ShearedButton.HEIGHT,
                 Shear = new Vector2(shear, 0),
-                CornerRadius = corner_radius,
-                BorderThickness = border_thickness,
+                CornerRadius = ShearedButton.CORNER_RADIUS,
+                BorderThickness = ShearedButton.BORDER_THICKNESS,
                 Masking = true,
                 Children = new Drawable[]
                 {
@@ -107,8 +104,8 @@ namespace osu.Game.Overlays.Mods
                             {
                                 AutoSizeAxes = Axes.X,
                                 RelativeSizeAxes = Axes.Y,
-                                BorderThickness = border_thickness,
-                                CornerRadius = corner_radius,
+                                BorderThickness = ShearedButton.BORDER_THICKNESS,
+                                CornerRadius = ShearedButton.CORNER_RADIUS,
                                 Masking = true,
                                 Children = new Drawable[]
                                 {

From f591a30ea77eb11e0fb0a7a2a3c1f02f9871181a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 08:44:25 +0200
Subject: [PATCH 1346/2100] Refactor preview panel to be more self-contained

---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 47 ++++++++-----------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  9 +---
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index aa7ddc47bc..dde3761c4a 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
 using System.Threading;
+using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -41,24 +42,13 @@ namespace osu.Game.Overlays.Mods
 
         private const float transition_duration = 250;
 
-        private IBeatmapInfo? beatmapInfo;
-
-        public IBeatmapInfo? BeatmapInfo
-        {
-            get => beatmapInfo;
-            set
-            {
-                if (value == beatmapInfo) return;
-
-                beatmapInfo = value;
-                updateStarDifficultyBind();
-                UpdateValues();
-            }
-        }
+        public Bindable<IBeatmapInfo?> BeatmapInfo { get; } = new Bindable<IBeatmapInfo?>();
 
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
+        private ModSettingChangeTracker? modSettingChangeTracker;
+
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
@@ -178,16 +168,25 @@ namespace osu.Game.Overlays.Mods
             content.BorderColour = ColourInfo.GradientVertical(background.Colour, glowColour);
             innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glowColour);
 
-            updateStarDifficultyBind();
+            BeatmapInfo.BindValueChanged(_ => updateValues(), true);
+
+            mods.BindValueChanged(_ =>
+            {
+                modSettingChangeTracker?.Dispose();
+
+                modSettingChangeTracker = new ModSettingChangeTracker(mods.Value);
+                modSettingChangeTracker.SettingChanged += _ => updateValues();
+                updateValues();
+            });
         }
 
-        private void updateStarDifficultyBind()
+        private void updateValues() => Scheduler.AddOnce(() =>
         {
-            if (beatmapInfo == null)
+            if (BeatmapInfo.Value == null)
                 return;
 
             cancellationSource?.Cancel();
-            starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+            starDifficulty = difficultyCache.GetBindableDifficulty(BeatmapInfo.Value, (cancellationSource = new CancellationTokenSource()).Token);
             starDifficulty.BindValueChanged(s =>
             {
                 starRatingDisplay.Current.Value = s.NewValue ?? default;
@@ -197,20 +196,14 @@ namespace osu.Game.Overlays.Mods
 
                 starRatingDisplay.FadeIn(transition_duration);
             });
-        }
-
-        public void UpdateValues()
-        {
-            if (beatmapInfo == null)
-                return;
 
             double rate = 1;
             foreach (var mod in mods.Value.OfType<IApplicableToRate>())
                 rate = mod.ApplyToRate(0, rate);
 
-            bpmDisplay.Current.Value = beatmapInfo.BPM * rate;
+            bpmDisplay.Current.Value = BeatmapInfo.Value.BPM * rate;
 
-            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(beatmapInfo.Difficulty);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
             foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
                 mod.ApplyToDifficulty(adjustedDifficulty);
 
@@ -218,7 +211,7 @@ namespace osu.Game.Overlays.Mods
             drainRateDisplay.Current.Value = adjustedDifficulty.DrainRate;
             approachRateDisplay.Current.Value = adjustedDifficulty.ApproachRate;
             overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
-        }
+        });
 
         private partial class BPMDisplay : RollingCounter<double>
         {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 4989c55d49..f2f2dc970c 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Overlays.Mods
                 if (beatmap == value) return;
 
                 beatmap = value;
-                modEffectPreviewPanel.BeatmapInfo = beatmap.BeatmapInfo;
+                modEffectPreviewPanel.BeatmapInfo.Value = beatmap.BeatmapInfo;
             }
         }
 
@@ -300,7 +300,6 @@ namespace osu.Game.Overlays.Mods
 
             SelectedMods.BindValueChanged(_ =>
             {
-                modEffectPreviewPanel.UpdateValues();
                 updateMultiplier();
                 updateFromExternalSelection();
                 updateCustomisation();
@@ -314,11 +313,7 @@ namespace osu.Game.Overlays.Mods
                     //
                     // See https://github.com/ppy/osu/pull/23284#issuecomment-1529056988
                     modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);
-                    modSettingChangeTracker.SettingChanged += _ =>
-                    {
-                        modEffectPreviewPanel.UpdateValues();
-                        updateMultiplier();
-                    };
+                    modSettingChangeTracker.SettingChanged += _ => updateMultiplier();
                 }
             }, true);
 

From a631fae6dfb2a0ab74ee8fd1e90a6224beb66f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 09:19:37 +0200
Subject: [PATCH 1347/2100] Add actual testing

---
 .../TestSceneModEffectPreviewPanel.cs         | 128 ++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
new file mode 100644
index 0000000000..e3afb874db
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
@@ -0,0 +1,128 @@
+// Copyright (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 System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Tests.Beatmaps;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    [TestFixture]
+    public partial class TestSceneModEffectPreviewPanel : OsuTestScene
+    {
+        [Cached(typeof(BeatmapDifficultyCache))]
+        private TestBeatmapDifficultyCache difficultyCache = new TestBeatmapDifficultyCache();
+
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
+        private Container content = null!;
+        private ModEffectPreviewPanel panel = null!;
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("set up cache", () => Children = new Drawable[]
+            {
+                difficultyCache,
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both
+                }
+            });
+        }
+
+        [Test]
+        public void TestDisplay()
+        {
+            OsuModDifficultyAdjust difficultyAdjust = new OsuModDifficultyAdjust();
+            OsuModDoubleTime doubleTime = new OsuModDoubleTime();
+
+            AddStep("create display", () => content.Child = panel = new ModEffectPreviewPanel
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            AddStep("set beatmap", () =>
+            {
+                var beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo)
+                {
+                    BeatmapInfo =
+                    {
+                        BPM = 120
+                    }
+                };
+
+                Ruleset.Value = beatmap.BeatmapInfo.Ruleset;
+                panel.BeatmapInfo.Value = beatmap.BeatmapInfo;
+            });
+
+            AddSliderStep("change star rating", 0, 10d, 5, stars =>
+            {
+                if (panel.IsNotNull())
+                    previewStarRating(stars);
+            });
+            AddStep("preview ridiculously high SR", () => previewStarRating(1234));
+
+            AddStep("add DA to mods", () => SelectedMods.Value = new[] { difficultyAdjust });
+
+            AddSliderStep("change AR", 0, 10f, 5, ar =>
+            {
+                if (panel.IsNotNull())
+                    difficultyAdjust.ApproachRate.Value = ar;
+            });
+            AddSliderStep("change CS", 0, 10f, 5, cs =>
+            {
+                if (panel.IsNotNull())
+                    difficultyAdjust.CircleSize.Value = cs;
+            });
+            AddSliderStep("change HP", 0, 10f, 5, hp =>
+            {
+                if (panel.IsNotNull())
+                    difficultyAdjust.DrainRate.Value = hp;
+            });
+            AddSliderStep("change OD", 0, 10f, 5, od =>
+            {
+                if (panel.IsNotNull())
+                    difficultyAdjust.OverallDifficulty.Value = od;
+            });
+
+            AddStep("add DT to mods", () => SelectedMods.Value = new Mod[] { difficultyAdjust, doubleTime });
+            AddSliderStep("change rate", 1.01d, 2d, 1.5d, rate =>
+            {
+                if (panel.IsNotNull())
+                    doubleTime.SpeedChange.Value = rate;
+            });
+        }
+
+        private void previewStarRating(double stars)
+        {
+            difficultyCache.Difficulty = new StarDifficulty(stars, 0);
+            panel.BeatmapInfo.TriggerChange();
+        }
+
+        private partial class TestBeatmapDifficultyCache : BeatmapDifficultyCache
+        {
+            public StarDifficulty? Difficulty { get; set; }
+
+            public override Task<StarDifficulty?> GetDifficultyAsync(IBeatmapInfo beatmapInfo, IRulesetInfo? rulesetInfo = null, IEnumerable<Mod>? mods = null,
+                                                                     CancellationToken cancellationToken = default)
+                => Task.FromResult(Difficulty);
+        }
+    }
+}

From 552230af9d23f53e83cc57a06a425c0486e36c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 09:37:25 +0200
Subject: [PATCH 1348/2100] Refactor layout of display

---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 48 ++++++++-----------
 .../Overlays/Mods/VerticalAttributeDisplay.cs | 10 ++--
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index dde3761c4a..1a5d1e98c7 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -61,7 +61,6 @@ namespace osu.Game.Overlays.Mods
         [BackgroundDependencyLoader]
         private void load()
         {
-            // values as ModSelectOverlay footer buttons
             const float shear = ShearedOverlayContainer.SHEAR;
 
             AutoSizeAxes = Axes.Both;
@@ -103,36 +102,26 @@ namespace osu.Game.Overlays.Mods
                                     {
                                         RelativeSizeAxes = Axes.Both
                                     },
-                                    new FillFlowContainer // actual inner content
+                                    new Container // actual inner content
                                     {
-                                        Origin = Anchor.CentreLeft,
-                                        Anchor = Anchor.CentreLeft,
-                                        AutoSizeAxes = Axes.X,
-                                        Direction = FillDirection.Horizontal,
+                                        Origin = Anchor.Centre,
+                                        Anchor = Anchor.Centre,
+                                        Width = 140,
+                                        RelativeSizeAxes = Axes.Y,
                                         Margin = new MarginPadding { Horizontal = 15 },
                                         Children = new Drawable[]
                                         {
-                                            new Container // wrap to reserve space for StarRatingDisplay
-                                            {
-                                                Width = 70, // can be up to 70px on extra high SR
-                                                Child = starRatingDisplay = new StarRatingDisplay(default, animated: true)
-                                                {
-                                                    Origin = Anchor.CentreLeft,
-                                                    Anchor = Anchor.CentreLeft,
-                                                    Shear = new Vector2(-shear, 0),
-                                                }
-                                            },
-                                            new Container // wrap to reserve space for BPM
+                                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
                                             {
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
-                                                Width = 70,
-                                                Child = bpmDisplay = new BPMDisplay
-                                                {
-                                                    Origin = Anchor.CentreLeft,
-                                                    Anchor = Anchor.CentreLeft,
-                                                    Shear = new Vector2(-shear, 0),
-                                                }
+                                                Shear = new Vector2(-shear, 0),
+                                            },
+                                            bpmDisplay = new BPMDisplay
+                                            {
+                                                Origin = Anchor.CentreRight,
+                                                Anchor = Anchor.CentreRight,
+                                                Shear = new Vector2(-shear, 0),
                                             }
                                         }
                                     }
@@ -147,10 +136,10 @@ namespace osu.Game.Overlays.Mods
                                 Direction = FillDirection.Horizontal,
                                 Children = new[]
                                 {
-                                    circleSizeDisplay = new VerticalAttributeDisplay("CS", "0.#"),
-                                    drainRateDisplay = new VerticalAttributeDisplay("HP", "0.#"),
-                                    approachRateDisplay = new VerticalAttributeDisplay("AR", "0.##"),
-                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD", "0.##"),
+                                    circleSizeDisplay = new VerticalAttributeDisplay("CS"),
+                                    drainRateDisplay = new VerticalAttributeDisplay("HP"),
+                                    approachRateDisplay = new VerticalAttributeDisplay("AR"),
+                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD"),
                                 }
                             }
                         }
@@ -221,7 +210,8 @@ namespace osu.Game.Overlays.Mods
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {
-                Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold)
+                Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold),
+                UseFullGlyphHeight = false,
             };
         }
     }
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index 503b07f3b9..ba8efd1c2b 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Overlays.Mods
             get => current.Current;
             set => current.Current = value;
         }
+
         private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
 
         /// <summary>
@@ -28,7 +29,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         public LocalisableString Label { get; protected set; }
 
-        public VerticalAttributeDisplay(LocalisableString label, string format = "0.#")
+        public VerticalAttributeDisplay(LocalisableString label)
         {
             Label = label;
             AutoSizeAxes = Axes.X;
@@ -50,12 +51,11 @@ namespace osu.Game.Overlays.Mods
                         Margin = new MarginPadding { Horizontal = 15 }, // to reserve space for 0.XX value
                         Font = OsuFont.Default.With(size: 20, weight: FontWeight.Bold)
                     },
-                    new EffectCounter()
+                    new EffectCounter
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         Current = { BindTarget = Current },
-                        Format = format
                     }
                 }
             };
@@ -65,9 +65,7 @@ namespace osu.Game.Overlays.Mods
         {
             protected override double RollingDuration => 500;
 
-            public string Format = "0.#";
-
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(Format);
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.0");
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {

From 53c30dca64e7e7eb44f882ffe5f26d44a2adec54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 09:52:43 +0200
Subject: [PATCH 1349/2100] Fix data flow being sometimes incorrect

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs  |  2 ++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs             | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index ad79865ad9..029a7f8b9e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("clear contents", Clear);
             AddStep("reset ruleset", () => Ruleset.Value = rulesetStore.GetRuleset(0));
             AddStep("reset mods", () => SelectedMods.SetDefault());
+            AddStep("set beatmap", () => Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo));
             AddStep("set up presets", () =>
             {
                 Realm.Write(r =>
@@ -92,6 +93,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             {
                 RelativeSizeAxes = Axes.Both,
                 State = { Value = Visibility.Visible },
+                Beatmap = Beatmap.Value,
                 SelectedMods = { BindTarget = SelectedMods }
             });
             waitForColumnLoad();
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index f2f2dc970c..1c5fc5abde 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -133,9 +133,9 @@ namespace osu.Game.Overlays.Mods
 
         private Sample? columnAppearSample;
 
-        private WorkingBeatmap beatmap = null!;
+        private WorkingBeatmap? beatmap;
 
-        public WorkingBeatmap Beatmap
+        public WorkingBeatmap? Beatmap
         {
             get => beatmap;
             set
@@ -143,7 +143,8 @@ namespace osu.Game.Overlays.Mods
                 if (beatmap == value) return;
 
                 beatmap = value;
-                modEffectPreviewPanel.BeatmapInfo.Value = beatmap.BeatmapInfo;
+                if (IsLoaded)
+                    modEffectPreviewPanel.BeatmapInfo.Value = beatmap?.BeatmapInfo;
             }
         }
 
@@ -246,7 +247,8 @@ namespace osu.Game.Overlays.Mods
                     {
                         Vertical = PADDING,
                         Horizontal = 70
-                    }
+                    },
+                    BeatmapInfo = { Value = beatmap?.BeatmapInfo }
                 },
                 footerButtonFlow = new FillFlowContainer<ShearedButton>
                 {

From 76bf82d900ccc46e1b89a1544f1748b25c74bbad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 09:55:45 +0200
Subject: [PATCH 1350/2100] Do not show mod effects on free mod select

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 56 +++++++++----------
 .../OnlinePlay/FreeModSelectOverlay.cs        |  2 +-
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1c5fc5abde..80340d2253 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -78,9 +78,9 @@ namespace osu.Game.Overlays.Mods
         public ShearedSearchTextBox SearchTextBox { get; private set; } = null!;
 
         /// <summary>
-        /// Whether the total score multiplier calculated from the current selected set of mods should be shown.
+        /// Whether the effects (on score multiplier, on or beatmap difficulty) of the current selected set of mods should be shown.
         /// </summary>
-        protected virtual bool ShowTotalMultiplier => true;
+        protected virtual bool ShowModEffects => true;
 
         /// <summary>
         /// Whether per-mod customisation controls are visible.
@@ -228,18 +228,15 @@ namespace osu.Game.Overlays.Mods
                 }
             });
 
-            if (ShowTotalMultiplier)
+            if (ShowModEffects)
             {
                 aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight
                 });
-            }
 
-            FooterContent.Children = new Drawable[]
-            {
-                modEffectPreviewPanel = new ModEffectPreviewPanel
+                FooterContent.Add(modEffectPreviewPanel = new ModEffectPreviewPanel
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -249,29 +246,30 @@ namespace osu.Game.Overlays.Mods
                         Horizontal = 70
                     },
                     BeatmapInfo = { Value = beatmap?.BeatmapInfo }
-                },
-                footerButtonFlow = new FillFlowContainer<ShearedButton>
+                });
+            }
+
+            FooterContent.Add(footerButtonFlow = new FillFlowContainer<ShearedButton>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Horizontal,
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
+                Padding = new MarginPadding
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Horizontal,
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    Padding = new MarginPadding
-                    {
-                        Vertical = PADDING,
-                        Horizontal = 70
-                    },
-                    Spacing = new Vector2(10),
-                    ChildrenEnumerable = CreateFooterButtons().Prepend(BackButton = new ShearedButton(BUTTON_WIDTH)
-                    {
-                        Text = CommonStrings.Back,
-                        Action = Hide,
-                        DarkerColour = colours.Pink2,
-                        LighterColour = colours.Pink1
-                    })
-                }
-            };
+                    Vertical = PADDING,
+                    Horizontal = 70
+                },
+                Spacing = new Vector2(10),
+                ChildrenEnumerable = CreateFooterButtons().Prepend(BackButton = new ShearedButton(BUTTON_WIDTH)
+                {
+                    Text = CommonStrings.Back,
+                    Action = Hide,
+                    DarkerColour = colours.Pink2,
+                    LighterColour = colours.Pink1
+                })
+            });
 
             globalAvailableMods.BindTo(game.AvailableMods);
         }
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 4d5d724089..7f090aca57 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay
 {
     public partial class FreeModSelectOverlay : ModSelectOverlay
     {
-        protected override bool ShowTotalMultiplier => false;
+        protected override bool ShowModEffects => false;
 
         protected override bool AllowCustomisation => false;
 

From 97665e029b8fbcf6f3a034a9d06592ff2859f755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:00:44 +0200
Subject: [PATCH 1351/2100] Remove weird fade

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

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 1a5d1e98c7..1b08b88740 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -182,8 +182,6 @@ namespace osu.Game.Overlays.Mods
 
                 if (!starRatingDisplay.IsPresent)
                     starRatingDisplay.FinishTransforms(true);
-
-                starRatingDisplay.FadeIn(transition_duration);
             });
 
             double rate = 1;

From ff6bf0bc2c3754a838be06d99937b2e6e917d51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:16:09 +0200
Subject: [PATCH 1352/2100] Fix slightly wrong binding setup

---
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 1b08b88740..7ace402a24 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -157,8 +157,7 @@ namespace osu.Game.Overlays.Mods
             content.BorderColour = ColourInfo.GradientVertical(background.Colour, glowColour);
             innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glowColour);
 
-            BeatmapInfo.BindValueChanged(_ => updateValues(), true);
-
+            BeatmapInfo.BindValueChanged(_ => updateValues());
             mods.BindValueChanged(_ =>
             {
                 modSettingChangeTracker?.Dispose();
@@ -166,7 +165,7 @@ namespace osu.Game.Overlays.Mods
                 modSettingChangeTracker = new ModSettingChangeTracker(mods.Value);
                 modSettingChangeTracker.SettingChanged += _ => updateValues();
                 updateValues();
-            });
+            }, true);
         }
 
         private void updateValues() => Scheduler.AddOnce(() =>

From f9d4fbee56eebed60cbbe6a273062beeee30903f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:16:24 +0200
Subject: [PATCH 1353/2100] Add collapsed state to effect preview panel

---
 .../UserInterface/TestSceneModEffectPreviewPanel.cs      | 2 ++
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs          | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
index e3afb874db..f958b231f9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
@@ -108,6 +108,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 if (panel.IsNotNull())
                     doubleTime.SpeedChange.Value = rate;
             });
+
+            AddToggleStep("toggle collapsed", collapsed => panel.Collapsed.Value = collapsed);
         }
 
         private void previewStarRating(double stars)
diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 7ace402a24..e03beb8649 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Overlays.Mods
         private StarRatingDisplay starRatingDisplay = null!;
         private BPMDisplay bpmDisplay = null!;
 
+        private FillFlowContainer<VerticalAttributeDisplay> outerContent = null!;
         private VerticalAttributeDisplay circleSizeDisplay = null!;
         private VerticalAttributeDisplay drainRateDisplay = null!;
         private VerticalAttributeDisplay approachRateDisplay = null!;
@@ -44,6 +45,8 @@ namespace osu.Game.Overlays.Mods
 
         public Bindable<IBeatmapInfo?> BeatmapInfo { get; } = new Bindable<IBeatmapInfo?>();
 
+        public BindableBool Collapsed { get; } = new BindableBool();
+
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
@@ -69,6 +72,8 @@ namespace osu.Game.Overlays.Mods
                 Origin = Anchor.BottomRight,
                 Anchor = Anchor.BottomRight,
                 AutoSizeAxes = Axes.X,
+                AutoSizeEasing = Easing.OutQuint,
+                AutoSizeDuration = transition_duration,
                 Height = ShearedButton.HEIGHT,
                 Shear = new Vector2(shear, 0),
                 CornerRadius = ShearedButton.CORNER_RADIUS,
@@ -127,7 +132,7 @@ namespace osu.Game.Overlays.Mods
                                     }
                                 }
                             },
-                            new FillFlowContainer<VerticalAttributeDisplay> // outer content
+                            outerContent = new FillFlowContainer<VerticalAttributeDisplay>
                             {
                                 Origin = Anchor.CentreLeft,
                                 Anchor = Anchor.CentreLeft,
@@ -166,6 +171,8 @@ namespace osu.Game.Overlays.Mods
                 modSettingChangeTracker.SettingChanged += _ => updateValues();
                 updateValues();
             }, true);
+
+            Collapsed.BindValueChanged(collapsed => outerContent.FadeTo(collapsed.NewValue ? 0 : 1, transition_duration, Easing.OutQuint), true);
         }
 
         private void updateValues() => Scheduler.AddOnce(() =>

From 0822e8b925b6bf9fd9d78c30fd71f740d96dd08a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:18:24 +0200
Subject: [PATCH 1354/2100] Fix preview panel not being marked nullable

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 80340d2253..1287c26c99 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -124,8 +124,7 @@ namespace osu.Game.Overlays.Mods
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
-
-        private ModEffectPreviewPanel modEffectPreviewPanel = null!;
+        private ModEffectPreviewPanel? modEffectPreviewPanel;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -143,7 +142,7 @@ namespace osu.Game.Overlays.Mods
                 if (beatmap == value) return;
 
                 beatmap = value;
-                if (IsLoaded)
+                if (IsLoaded && modEffectPreviewPanel != null)
                     modEffectPreviewPanel.BeatmapInfo.Value = beatmap?.BeatmapInfo;
             }
         }

From 3deb6cb4ec3eb13135bb93def1b8b9d38d49094c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:19:02 +0200
Subject: [PATCH 1355/2100] Fix z-order of mod preview panel

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1287c26c99..ca16b90852 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -227,27 +227,6 @@ namespace osu.Game.Overlays.Mods
                 }
             });
 
-            if (ShowModEffects)
-            {
-                aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight
-                });
-
-                FooterContent.Add(modEffectPreviewPanel = new ModEffectPreviewPanel
-                {
-                    Anchor = Anchor.BottomRight,
-                    Origin = Anchor.BottomRight,
-                    Margin = new MarginPadding
-                    {
-                        Vertical = PADDING,
-                        Horizontal = 70
-                    },
-                    BeatmapInfo = { Value = beatmap?.BeatmapInfo }
-                });
-            }
-
             FooterContent.Add(footerButtonFlow = new FillFlowContainer<ShearedButton>
             {
                 RelativeSizeAxes = Axes.X,
@@ -270,6 +249,27 @@ namespace osu.Game.Overlays.Mods
                 })
             });
 
+            if (ShowModEffects)
+            {
+                aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight
+                });
+
+                FooterContent.Add(modEffectPreviewPanel = new ModEffectPreviewPanel
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    Margin = new MarginPadding
+                    {
+                        Vertical = PADDING,
+                        Horizontal = 70
+                    },
+                    BeatmapInfo = { Value = beatmap?.BeatmapInfo }
+                });
+            }
+
             globalAvailableMods.BindTo(game.AvailableMods);
         }
 

From d51396fdaf3838addb8ad7c0d268c7661d25aa95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:46:07 +0200
Subject: [PATCH 1356/2100] Collapse mod effect preview when it's not wide
 enough to fit

---
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs | 3 ++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs      | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index e03beb8649..5eb1671570 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Mods
 
         public Bindable<IBeatmapInfo?> BeatmapInfo { get; } = new Bindable<IBeatmapInfo?>();
 
-        public BindableBool Collapsed { get; } = new BindableBool();
+        public BindableBool Collapsed { get; } = new BindableBool(true);
 
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
@@ -173,6 +173,7 @@ namespace osu.Game.Overlays.Mods
             }, true);
 
             Collapsed.BindValueChanged(collapsed => outerContent.FadeTo(collapsed.NewValue ? 0 : 1, transition_duration, Easing.OutQuint), true);
+            FinishTransforms(true);
         }
 
         private void updateValues() => Scheduler.AddOnce(() =>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ca16b90852..069fdf1af0 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -338,6 +338,15 @@ namespace osu.Game.Overlays.Mods
             base.Update();
 
             SearchTextBox.PlaceholderText = SearchTextBox.HasFocus ? Resources.Localisation.Web.CommonStrings.InputSearch : ModSelectOverlayStrings.TabToSearch;
+
+            if (modEffectPreviewPanel != null)
+            {
+                float rightEdgeOfLastButton = footerButtonFlow.Last().ScreenSpaceDrawQuad.TopRight.X;
+                // this is cheating a bit; the 375 value is hardcoded based on how wide the expanded panel _generally_ is.
+                // due to the transition applied, the raw screenspace quad of the panel cannot be used, as it will trigger an ugly feedback cycle of expanding and collapsing.
+                float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(375 + 70, 0)).X;
+                modEffectPreviewPanel.Collapsed.Value = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
+            }
         }
 
         /// <summary>

From eebacfb982be3e1d0eaf834c2c78f15ec81686be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:59:19 +0200
Subject: [PATCH 1357/2100] Make mod effect preview uncollapse on hover

---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 26 +++++++++++++++++--
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  3 +++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 5eb1671570..a6d7732cba 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
 using System.Threading;
+using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
@@ -67,7 +68,7 @@ namespace osu.Game.Overlays.Mods
             const float shear = ShearedOverlayContainer.SHEAR;
 
             AutoSizeAxes = Axes.Both;
-            InternalChild = content = new InputBlockingContainer
+            InternalChild = content = new Container
             {
                 Origin = Anchor.BottomRight,
                 Anchor = Anchor.BottomRight,
@@ -172,10 +173,26 @@ namespace osu.Game.Overlays.Mods
                 updateValues();
             }, true);
 
-            Collapsed.BindValueChanged(collapsed => outerContent.FadeTo(collapsed.NewValue ? 0 : 1, transition_duration, Easing.OutQuint), true);
+            Collapsed.BindValueChanged(_ => updateCollapsedState(), true);
             FinishTransforms(true);
         }
 
+        protected override bool OnHover(HoverEvent e)
+        {
+            updateCollapsedState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            updateCollapsedState();
+            base.OnHoverLost(e);
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
+
         private void updateValues() => Scheduler.AddOnce(() =>
         {
             if (BeatmapInfo.Value == null)
@@ -207,6 +224,11 @@ namespace osu.Game.Overlays.Mods
             overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
         });
 
+        private void updateCollapsedState()
+        {
+            outerContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
+        }
+
         private partial class BPMDisplay : RollingCounter<double>
         {
             protected override double RollingDuration => 500;
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 069fdf1af0..d52782cf11 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -924,6 +924,9 @@ namespace osu.Game.Overlays.Mods
                         OnClicked?.Invoke();
                         return true;
 
+                    case HoverEvent:
+                        return false;
+
                     case MouseEvent:
                         return true;
                 }

From 86330a7cc46b939e2b6c293f2cf492f569a1b03d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 11 Sep 2023 18:01:53 +0900
Subject: [PATCH 1358/2100] Adjust comment

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index a8ac52714c..03c6876bae 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     // We'll redo the calculations to match osu-stable here...
                     const double maximum_rotations_per_second = 477.0 / 60;
 
-                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that maximises rotations.
+                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that minimises bonus score.
                     const double minimum_rotations_per_second = 7.5;
 
                     double secondsDuration = spinner.Duration / 1000;

From 293b81106261b1a3aad47d9461a8b2a7f550c8b6 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 13:09:49 +0200
Subject: [PATCH 1359/2100] feat(OsuColours): add B6

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

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 1b21f79c0a..481015de85 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -383,6 +383,7 @@ namespace osu.Game.Graphics
 
         // Content Background
         public readonly Color4 B5 = Color4Extensions.FromHex(@"222a28");
+        public readonly Color4 B6 = Color4Extensions.FromHex(@"1c1719"); // hsl(333,10%,10%)
 
         public readonly Color4 RedLighter = Color4Extensions.FromHex(@"ffeded");
         public readonly Color4 RedLight = Color4Extensions.FromHex(@"ed7787");

From f6031bc15f46a2a00103c8f8e63e3d1fa62e6b11 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 13:41:32 +0200
Subject: [PATCH 1360/2100] fix: prevent flickering when hovering out

---
 osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
index b722fe92e0..953a14a241 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
@@ -84,6 +84,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Full,
+                                AlwaysPresent = true,
                                 Margin = new MarginPadding { Bottom = margin, Top = margin / 2f }
                             }
                         }

From 200b3f87fff5ce4a7de5948f990cc85a70c89060 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 14:26:10 +0200
Subject: [PATCH 1361/2100] fix: adjust values according to osu-web

---
 .../Overlays/Profile/Header/Components/PreviousUsernames.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
index 953a14a241..18257e96c4 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             AutoSizeAxes = Axes.Y;
             Width = width;
             Masking = true;
-            CornerRadius = 5;
+            CornerRadius = 6;
 
             AddRangeInternal(new Drawable[]
             {
@@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            background.Colour = colours.GreySeaFoamDarker;
+            background.Colour = colours.B6;
         }
 
         protected override void LoadComplete()
@@ -157,7 +157,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 {
                     Margin = new MarginPadding { Top = 6, Left = margin, Right = margin * 2 },
                     Size = new Vector2(15),
-                    Icon = FontAwesome.Solid.IdCard,
+                    Icon = FontAwesome.Solid.AddressCard,
                 };
             }
 

From 8c137353b62ac8a43e197d2d31a3efa2a9219357 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 15:02:19 +0200
Subject: [PATCH 1362/2100] feat: integrate previous usernames tooltip to
 profile overlay

---
 .../Online/TestSceneUserProfileHeader.cs      | 26 +++++++++++++++++++
 .../Profile/Header/TopHeaderContainer.cs      | 14 ++++++++++
 2 files changed, 40 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
index 640e895b6c..4f28baa849 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
@@ -110,5 +110,31 @@ namespace osu.Game.Tests.Visual.Online
                 }
             }, new OsuRuleset().RulesetInfo));
         }
+
+        [Test]
+        public void TestPreviousUsernames()
+        {
+            AddStep("Show user w/ previous usernames", () => header.User.Value = new UserProfileData(new APIUser
+            {
+                Id = 727,
+                Username = "SomeoneIndecisive",
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
+                Groups = new[]
+                {
+                    new APIUserGroup { Colour = "#EB47D0", ShortName = "DEV", Name = "Developers" },
+                },
+                Statistics = new UserStatistics
+                {
+                    IsRanked = false,
+                    // web will sometimes return non-empty rank history even for unranked users.
+                    RankHistory = new APIRankHistory
+                    {
+                        Mode = @"osu",
+                        Data = Enumerable.Range(2345, 85).ToArray()
+                    },
+                },
+                PreviousUsernames = new[] { "tsrk.", "quoicoubeh", "apagnan", "epita" }
+            }, new OsuRuleset().RulesetInfo));
+        }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index dc47ce6e30..f4f962cdfb 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Overlays.Profile.Header
         private OsuSpriteText userCountryText = null!;
         private GroupBadgeFlow groupBadgeFlow = null!;
         private ToggleCoverButton coverToggle = null!;
+        private PreviousUsernames previousUsernames = null!;
 
         private Bindable<bool> coverExpanded = null!;
 
@@ -143,6 +144,18 @@ namespace osu.Game.Overlays.Profile.Header
                                                             Anchor = Anchor.CentreLeft,
                                                             Origin = Anchor.CentreLeft,
                                                         },
+                                                        new Container
+                                                        {
+                                                            Child = previousUsernames = new PreviousUsernames
+                                                            {
+                                                                Anchor = Anchor.TopLeft,
+                                                                Origin = Anchor.TopLeft,
+                                                            },
+                                                            Anchor = Anchor.TopLeft,
+                                                            Origin = Anchor.TopLeft,
+                                                            Size = new Vector2(0),
+                                                            Position = new Vector2(10)
+                                                        }
                                                     }
                                                 },
                                                 titleText = new OsuSpriteText
@@ -216,6 +229,7 @@ namespace osu.Game.Overlays.Profile.Header
             titleText.Text = user?.Title ?? string.Empty;
             titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");
             groupBadgeFlow.User.Value = user;
+            previousUsernames.User.Value = user;
         }
 
         private void updateCoverState()

From 65f3feb044dc77518e0c767bd36da68ec71cb08b Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 15:21:51 +0200
Subject: [PATCH 1363/2100] refactor: remove container position

---
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index f4f962cdfb..8aae13ebc5 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -154,7 +154,6 @@ namespace osu.Game.Overlays.Profile.Header
                                                             Anchor = Anchor.TopLeft,
                                                             Origin = Anchor.TopLeft,
                                                             Size = new Vector2(0),
-                                                            Position = new Vector2(10)
                                                         }
                                                     }
                                                 },

From c6e8a77f08d13f9790c40a7d6697e089bc9f0fa8 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 15:22:23 +0200
Subject: [PATCH 1364/2100] refactor: slightly offset to make it look good

---
 .../Profile/Header/Components/PreviousUsernames.cs        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
index 18257e96c4..686f6b2918 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
@@ -22,8 +22,9 @@ namespace osu.Game.Overlays.Profile.Header.Components
     {
         private const int duration = 200;
         private const int margin = 10;
-        private const int width = 310;
+        private const int width = 300;
         private const int move_offset = 15;
+        private const int base_y_offset = -3; // eye balled to make it look good
 
         public readonly Bindable<APIUser?> User = new Bindable<APIUser?>();
 
@@ -39,6 +40,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             Width = width;
             Masking = true;
             CornerRadius = 6;
+            Y = base_y_offset;
 
             AddRangeInternal(new Drawable[]
             {
@@ -135,7 +137,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             text.FadeIn(duration, Easing.OutQuint);
             header.FadeIn(duration, Easing.OutQuint);
             background.FadeIn(duration, Easing.OutQuint);
-            this.MoveToY(-move_offset, duration, Easing.OutQuint);
+            this.MoveToY(base_y_offset - move_offset, duration, Easing.OutQuint);
         }
 
         private void hideContent()
@@ -143,7 +145,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             text.FadeOut(duration, Easing.OutQuint);
             header.FadeOut(duration, Easing.OutQuint);
             background.FadeOut(duration, Easing.OutQuint);
-            this.MoveToY(0, duration, Easing.OutQuint);
+            this.MoveToY(base_y_offset, duration, Easing.OutQuint);
         }
 
         private partial class HoverIconContainer : Container

From 8c989d77bdf020f2f34a84095ea95ac24f21bdd2 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 16:00:46 +0200
Subject: [PATCH 1365/2100] revert: use `OverlayColourProvider` for B6

Refs: 293b81106261b1a3aad47d9461a8ba7f550c8b6
---
 osu.Game/Graphics/OsuColour.cs                                | 1 -
 .../Overlays/Profile/Header/Components/PreviousUsernames.cs   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 481015de85..1b21f79c0a 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -383,7 +383,6 @@ namespace osu.Game.Graphics
 
         // Content Background
         public readonly Color4 B5 = Color4Extensions.FromHex(@"222a28");
-        public readonly Color4 B6 = Color4Extensions.FromHex(@"1c1719"); // hsl(333,10%,10%)
 
         public readonly Color4 RedLighter = Color4Extensions.FromHex(@"ffeded");
         public readonly Color4 RedLight = Color4Extensions.FromHex(@"ed7787");
diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
index 686f6b2918..2ea175d1f0 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
@@ -99,9 +99,9 @@ namespace osu.Game.Overlays.Profile.Header.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colours)
         {
-            background.Colour = colours.B6;
+            background.Colour = colours.Background6;
         }
 
         protected override void LoadComplete()

From f331f921518f1bf470480a255d7a6d4a448aad8d Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 16:06:06 +0200
Subject: [PATCH 1366/2100] chore: explain `f6031bc1`

---
 .../Overlays/Profile/Header/Components/PreviousUsernames.cs    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
index 2ea175d1f0..42f54ea43e 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
@@ -86,6 +86,9 @@ namespace osu.Game.Overlays.Profile.Header.Components
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Full,
+                                // Prevents the tooltip of having a sudden size reduction
+                                // and flickering when the text is being faded out.
+                                // Also prevents a potential OnHover/HoverLost infinite loop
                                 AlwaysPresent = true,
                                 Margin = new MarginPadding { Bottom = margin, Top = margin / 2f }
                             }

From 824416067e0c95bdd4ca74f3da59f0cebfea9827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 20:53:17 +0200
Subject: [PATCH 1367/2100] Fix test failure

---
 .../UserInterface/TestSceneModEffectPreviewPanel.cs   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
index f958b231f9..adb12ad249 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
@@ -9,7 +9,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -31,12 +30,14 @@ namespace osu.Game.Tests.Visual.UserInterface
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
 
         private Container content = null!;
+        protected override Container<Drawable> Content => content;
+
         private ModEffectPreviewPanel panel = null!;
 
-        [SetUpSteps]
-        public void SetUpSteps()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            AddStep("set up cache", () => Children = new Drawable[]
+            base.Content.AddRange(new Drawable[]
             {
                 difficultyCache,
                 content = new Container
@@ -52,7 +53,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuModDifficultyAdjust difficultyAdjust = new OsuModDifficultyAdjust();
             OsuModDoubleTime doubleTime = new OsuModDoubleTime();
 
-            AddStep("create display", () => content.Child = panel = new ModEffectPreviewPanel
+            AddStep("create display", () => Child = panel = new ModEffectPreviewPanel
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

From dbc07bc6dc50f5da76cf529cebcfdaa60105361e Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Tue, 12 Sep 2023 01:34:17 +0200
Subject: [PATCH 1368/2100] fix: provide `OverlayColourProvider` as a dep in
 tests

---
 .../Online/TestSceneUserProfilePreviousUsernames.cs   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
index 921738d331..4310710624 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
@@ -5,6 +5,7 @@ using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Profile.Header.Components;
 
 namespace osu.Game.Tests.Visual.Online
@@ -13,12 +14,20 @@ namespace osu.Game.Tests.Visual.Online
     public partial class TestSceneUserProfilePreviousUsernames : OsuTestScene
     {
         private PreviousUsernames container = null!;
+        private OverlayColourProvider colourProvider = null!;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            Child = container = new PreviousUsernames
+            colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
+            Child = new DependencyProvidingContainer
             {
+                Child = container = new PreviousUsernames
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                CachedDependencies = new (Type, object)[] { (typeof(OverlayColourProvider), colourProvider) },
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };

From 04ab44bb7a057851ad68e198e8746334e9827bc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 15:28:55 +0900
Subject: [PATCH 1369/2100] Reword xmldoc to read better
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/Scoring/Legacy/ILegacyScoreSimulator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
index 3cea58b2b7..fe7843a682 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Scoring.Legacy
     public interface ILegacyScoreSimulator
     {
         /// <summary>
-        /// Performs the simulation, scoring values achievable for the given beatmap.
+        /// Performs the simulation, computing the maximum scoring values 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>

From b4bedee49e0a8fc2104fbc5d98e2abb5d38edca4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 15:43:59 +0900
Subject: [PATCH 1370/2100] Adjust naming of component to give more context

---
 ...s.cs => TestSceneUserProfilePreviousUsernamesDisplay.cs} | 6 +++---
 .../{PreviousUsernames.cs => PreviousUsernamesDisplay.cs}   | 4 ++--
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs      | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Visual/Online/{TestSceneUserProfilePreviousUsernames.cs => TestSceneUserProfilePreviousUsernamesDisplay.cs} (92%)
 rename osu.Game/Overlays/Profile/Header/Components/{PreviousUsernames.cs => PreviousUsernamesDisplay.cs} (98%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernamesDisplay.cs
similarity index 92%
rename from osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
rename to osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernamesDisplay.cs
index 4310710624..c1140f60af 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernamesDisplay.cs
@@ -11,9 +11,9 @@ using osu.Game.Overlays.Profile.Header.Components;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public partial class TestSceneUserProfilePreviousUsernames : OsuTestScene
+    public partial class TestSceneUserProfilePreviousUsernamesDisplay : OsuTestScene
     {
-        private PreviousUsernames container = null!;
+        private PreviousUsernamesDisplay container = null!;
         private OverlayColourProvider colourProvider = null!;
 
         [SetUp]
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Online
             colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
             Child = new DependencyProvidingContainer
             {
-                Child = container = new PreviousUsernames
+                Child = container = new PreviousUsernamesDisplay
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
similarity index 98%
rename from osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
rename to osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
index 42f54ea43e..634e6c5209 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
@@ -18,7 +18,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public partial class PreviousUsernames : CompositeDrawable
+    public partial class PreviousUsernamesDisplay : CompositeDrawable
     {
         private const int duration = 200;
         private const int margin = 10;
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private readonly Box background;
         private readonly SpriteText header;
 
-        public PreviousUsernames()
+        public PreviousUsernamesDisplay()
         {
             HoverIconContainer hoverIcon;
 
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 8aae13ebc5..146e38d389 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Profile.Header
         private OsuSpriteText userCountryText = null!;
         private GroupBadgeFlow groupBadgeFlow = null!;
         private ToggleCoverButton coverToggle = null!;
-        private PreviousUsernames previousUsernames = null!;
+        private PreviousUsernamesDisplay previousUsernamesDisplay = null!;
 
         private Bindable<bool> coverExpanded = null!;
 
@@ -146,7 +146,7 @@ namespace osu.Game.Overlays.Profile.Header
                                                         },
                                                         new Container
                                                         {
-                                                            Child = previousUsernames = new PreviousUsernames
+                                                            Child = previousUsernamesDisplay = new PreviousUsernamesDisplay
                                                             {
                                                                 Anchor = Anchor.TopLeft,
                                                                 Origin = Anchor.TopLeft,
@@ -228,7 +228,7 @@ namespace osu.Game.Overlays.Profile.Header
             titleText.Text = user?.Title ?? string.Empty;
             titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");
             groupBadgeFlow.User.Value = user;
-            previousUsernames.User.Value = user;
+            previousUsernamesDisplay.User.Value = user;
         }
 
         private void updateCoverState()

From a6acd00908ffd82ce1b43b8e1f1d839ee3906ec7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 15:46:05 +0900
Subject: [PATCH 1371/2100] Reword inline comment

---
 .../Profile/Header/Components/PreviousUsernamesDisplay.cs    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
index 634e6c5209..dce5c84d12 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
@@ -86,9 +86,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Full,
-                                // Prevents the tooltip of having a sudden size reduction
-                                // and flickering when the text is being faded out.
-                                // Also prevents a potential OnHover/HoverLost infinite loop
+                                // Prevents the tooltip of having a sudden size reduction and flickering when the text is being faded out.
+                                // Also prevents a potential OnHover/HoverLost feedback loop.
                                 AlwaysPresent = true,
                                 Margin = new MarginPadding { Bottom = margin, Top = margin / 2f }
                             }

From 23521ad394dbab69b8be597f800475dc06db4ddf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 15:53:27 +0900
Subject: [PATCH 1372/2100] Simplify container structure and mention why a
 zero-size container is being used

---
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 146e38d389..36bd8a5af5 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -146,14 +146,8 @@ namespace osu.Game.Overlays.Profile.Header
                                                         },
                                                         new Container
                                                         {
-                                                            Child = previousUsernamesDisplay = new PreviousUsernamesDisplay
-                                                            {
-                                                                Anchor = Anchor.TopLeft,
-                                                                Origin = Anchor.TopLeft,
-                                                            },
-                                                            Anchor = Anchor.TopLeft,
-                                                            Origin = Anchor.TopLeft,
-                                                            Size = new Vector2(0),
+                                                            // Intentionally use a zero-size container, else the fill flow will adjust to (and cancel) the upwards animation.
+                                                            Child = previousUsernamesDisplay = new PreviousUsernamesDisplay(),
                                                         }
                                                     }
                                                 },

From e40eaa73774804646f928989672054ce9d56f15a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 17:00:06 +0900
Subject: [PATCH 1373/2100] Improve collapse/expand animations

Especially when on a screen resolution where it would start collapsed.
---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 23 +++++++++++++++----
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  4 +++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index a6d7732cba..b9511cc544 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -73,8 +73,6 @@ namespace osu.Game.Overlays.Mods
                 Origin = Anchor.BottomRight,
                 Anchor = Anchor.BottomRight,
                 AutoSizeAxes = Axes.X,
-                AutoSizeEasing = Easing.OutQuint,
-                AutoSizeDuration = transition_duration,
                 Height = ShearedButton.HEIGHT,
                 Shear = new Vector2(shear, 0),
                 CornerRadius = ShearedButton.CORNER_RADIUS,
@@ -135,6 +133,7 @@ namespace osu.Game.Overlays.Mods
                             },
                             outerContent = new FillFlowContainer<VerticalAttributeDisplay>
                             {
+                                Alpha = 0,
                                 Origin = Anchor.CentreLeft,
                                 Anchor = Anchor.CentreLeft,
                                 AutoSizeAxes = Axes.X,
@@ -163,7 +162,6 @@ namespace osu.Game.Overlays.Mods
             content.BorderColour = ColourInfo.GradientVertical(background.Colour, glowColour);
             innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glowColour);
 
-            BeatmapInfo.BindValueChanged(_ => updateValues());
             mods.BindValueChanged(_ =>
             {
                 modSettingChangeTracker?.Dispose();
@@ -173,12 +171,20 @@ namespace osu.Game.Overlays.Mods
                 updateValues();
             }, true);
 
-            Collapsed.BindValueChanged(_ => updateCollapsedState(), true);
-            FinishTransforms(true);
+            Collapsed.BindValueChanged(_ =>
+            {
+                // Only start autosize animations on first collapse toggle. This avoids an ugly initial presentation.
+                startAnimating();
+
+                updateCollapsedState();
+            });
+
+            BeatmapInfo.BindValueChanged(_ => updateValues(), true);
         }
 
         protected override bool OnHover(HoverEvent e)
         {
+            startAnimating();
             updateCollapsedState();
             return true;
         }
@@ -193,12 +199,19 @@ namespace osu.Game.Overlays.Mods
 
         protected override bool OnClick(ClickEvent e) => true;
 
+        private void startAnimating()
+        {
+            content.AutoSizeEasing = Easing.OutQuint;
+            content.AutoSizeDuration = transition_duration;
+        }
+
         private void updateValues() => Scheduler.AddOnce(() =>
         {
             if (BeatmapInfo.Value == null)
                 return;
 
             cancellationSource?.Cancel();
+
             starDifficulty = difficultyCache.GetBindableDifficulty(BeatmapInfo.Value, (cancellationSource = new CancellationTokenSource()).Token);
             starDifficulty.BindValueChanged(s =>
             {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index d52782cf11..242f883068 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -339,9 +339,11 @@ namespace osu.Game.Overlays.Mods
 
             SearchTextBox.PlaceholderText = SearchTextBox.HasFocus ? Resources.Localisation.Web.CommonStrings.InputSearch : ModSelectOverlayStrings.TabToSearch;
 
-            if (modEffectPreviewPanel != null)
+            // only update preview panel's collapsed state after we are fully visible, to ensure all the buttons are where we expect them to be.
+            if (modEffectPreviewPanel != null && Alpha == 1)
             {
                 float rightEdgeOfLastButton = footerButtonFlow.Last().ScreenSpaceDrawQuad.TopRight.X;
+
                 // this is cheating a bit; the 375 value is hardcoded based on how wide the expanded panel _generally_ is.
                 // due to the transition applied, the raw screenspace quad of the panel cannot be used, as it will trigger an ugly feedback cycle of expanding and collapsing.
                 float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(375 + 70, 0)).X;

From 3da30485b2766242f626798c206940cc52c9f90f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 17:06:42 +0900
Subject: [PATCH 1374/2100] Move shear spec to correct location

---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 20 +++++++++++++++----
 .../Overlays/Mods/VerticalAttributeDisplay.cs |  8 +++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index b9511cc544..c961235cb2 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -141,10 +141,22 @@ namespace osu.Game.Overlays.Mods
                                 Direction = FillDirection.Horizontal,
                                 Children = new[]
                                 {
-                                    circleSizeDisplay = new VerticalAttributeDisplay("CS"),
-                                    drainRateDisplay = new VerticalAttributeDisplay("HP"),
-                                    approachRateDisplay = new VerticalAttributeDisplay("AR"),
-                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD"),
+                                    circleSizeDisplay = new VerticalAttributeDisplay("CS")
+                                    {
+                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    },
+                                    drainRateDisplay = new VerticalAttributeDisplay("HP")
+                                    {
+                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    },
+                                    approachRateDisplay = new VerticalAttributeDisplay("AR")
+                                    {
+                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    },
+                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD")
+                                    {
+                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    },
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index ba8efd1c2b..60cc875dbb 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -10,7 +10,6 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -32,9 +31,12 @@ namespace osu.Game.Overlays.Mods
         public VerticalAttributeDisplay(LocalisableString label)
         {
             Label = label;
+
             AutoSizeAxes = Axes.X;
-            Origin = Anchor = Anchor.CentreLeft;
-            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0);
+
+            Origin = Anchor.CentreLeft;
+            Anchor = Anchor.CentreLeft;
+
             InternalChild = new FillFlowContainer
             {
                 Origin = Anchor.CentreLeft,

From 7e3652284db7ab6bc14695ea4c4bb345edaf0bf1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 17:15:16 +0900
Subject: [PATCH 1375/2100] Adjust various class naming and add some xmldoc

---
 .../UserInterface/TestSceneModEffectPreviewPanel.cs       | 4 ++--
 .../Visual/UserInterface/TestSceneModsEffectDisplay.cs    | 2 +-
 ...dEffectPreviewPanel.cs => BeatmapAttributesDisplay.cs} | 6 +++++-
 osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs     | 2 +-
 .../Mods/{ModsEffectDisplay.cs => ModCounterDisplay.cs}   | 6 +++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                | 8 ++++----
 6 files changed, 16 insertions(+), 12 deletions(-)
 rename osu.Game/Overlays/Mods/{ModEffectPreviewPanel.cs => BeatmapAttributesDisplay.cs} (97%)
 rename osu.Game/Overlays/Mods/{ModsEffectDisplay.cs => ModCounterDisplay.cs} (97%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
index adb12ad249..b3ad5a499e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private Container content = null!;
         protected override Container<Drawable> Content => content;
 
-        private ModEffectPreviewPanel panel = null!;
+        private BeatmapAttributesDisplay panel = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuModDifficultyAdjust difficultyAdjust = new OsuModDifficultyAdjust();
             OsuModDoubleTime doubleTime = new OsuModDoubleTime();
 
-            AddStep("create display", () => Child = panel = new ModEffectPreviewPanel
+            AddStep("create display", () => Child = panel = new BeatmapAttributesDisplay
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
index a1c8bef1de..bf6a718167 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyIncrease));
         }
 
-        private partial class TestDisplay : ModsEffectDisplay
+        private partial class TestDisplay : ModCounterDisplay
         {
             public Container<Drawable> Container => Content;
 
diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
similarity index 97%
rename from osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
rename to osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index c961235cb2..2aea53090a 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -25,7 +25,11 @@ using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModEffectPreviewPanel : CompositeDrawable
+    /// <summary>
+    /// On the mod select overlay, this provides a local updating view of BPM, star rating and other
+    /// difficulty attributes so the user can have a better insight into what mods are changing.
+    /// </summary>
+    public partial class BeatmapAttributesDisplay : CompositeDrawable
     {
         private Container content = null!;
         private Container innerContent = null!;
diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 9e16aa926f..9f4d187879 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Mods
 {
-    public sealed partial class DifficultyMultiplierDisplay : ModsEffectDisplay
+    public sealed partial class DifficultyMultiplierDisplay : ModCounterDisplay
     {
         protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
 
diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
similarity index 97%
rename from osu.Game/Overlays/Mods/ModsEffectDisplay.cs
rename to osu.Game/Overlays/Mods/ModCounterDisplay.cs
index 3f31736ee1..3bec27d290 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
@@ -19,9 +19,9 @@ using osuTK;
 namespace osu.Game.Overlays.Mods
 {
     /// <summary>
-    /// Base class for displays of mods effects.
+    /// Base class for displays of singular counters. Not to be confused with <see cref="BeatmapAttributesDisplay"/> which aggregates multiple attributes.
     /// </summary>
-    public abstract partial class ModsEffectDisplay : Container, IHasCurrentValue<double>
+    public abstract partial class ModCounterDisplay : Container, IHasCurrentValue<double>
     {
         public const float HEIGHT = 42;
         private const float transition_duration = 200;
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly RollingCounter<double> Counter;
 
-        protected ModsEffectDisplay()
+        protected ModCounterDisplay()
         {
             Height = HEIGHT;
             AutoSizeAxes = Axes.X;
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 242f883068..666e2849e8 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.Mods
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
-        private ModEffectPreviewPanel? modEffectPreviewPanel;
+        private BeatmapAttributesDisplay? modEffectPreviewPanel;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -181,7 +181,7 @@ namespace osu.Game.Overlays.Mods
                 aboveColumnsContent = new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = ModsEffectDisplay.HEIGHT,
+                    Height = ModCounterDisplay.HEIGHT,
                     Padding = new MarginPadding { Horizontal = 100 },
                     Child = SearchTextBox = new ShearedSearchTextBox
                     {
@@ -196,7 +196,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = ModsEffectDisplay.HEIGHT + PADDING,
+                            Top = ModCounterDisplay.HEIGHT + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,
@@ -257,7 +257,7 @@ namespace osu.Game.Overlays.Mods
                     Origin = Anchor.TopRight
                 });
 
-                FooterContent.Add(modEffectPreviewPanel = new ModEffectPreviewPanel
+                FooterContent.Add(modEffectPreviewPanel = new BeatmapAttributesDisplay
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,

From 95d15a703eb33b37baa10d90d56fdc0ce4df550f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 11:36:41 +0200
Subject: [PATCH 1376/2100] Improve legibility of scoring test scene

- Add black background to avoid clashes with background images.
- Use sorta-tetradic colours for the four plots.
---
 .../Visual/Gameplay/TestSceneScoring.cs         | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index c722d67ac9..4cbc046877 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -36,6 +37,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private FillFlowContainer legend = null!;
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         [Test]
         public void TestBasic()
         {
@@ -43,6 +47,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 Children = new Drawable[]
                 {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Colour4.Black
+                    },
                     new GridContainer
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -125,8 +134,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Clear();
             legend.Clear();
 
-            runForProcessor("lazer-standardised", Color4.YellowGreen, new OsuScoreProcessor(), ScoringMode.Standardised);
-            runForProcessor("lazer-classic", Color4.MediumPurple, new OsuScoreProcessor(), ScoringMode.Classic);
+            runForProcessor("lazer-standardised", colours.Green1, new OsuScoreProcessor(), ScoringMode.Standardised);
+            runForProcessor("lazer-classic", colours.Blue1, new OsuScoreProcessor(), ScoringMode.Classic);
 
             runScoreV1();
             runScoreV2();
@@ -156,7 +165,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 currentCombo++;
             }
 
-            runForAlgorithm("ScoreV1 (classic)", Color4.Purple,
+            runForAlgorithm("ScoreV1 (classic)", colours.Purple1,
                 () => applyHitV1(base_great),
                 () => applyHitV1(base_ok),
                 () => applyHitV1(0),
@@ -199,7 +208,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 currentHits++;
             }
 
-            runForAlgorithm("ScoreV2", Color4.OrangeRed,
+            runForAlgorithm("ScoreV2", colours.Red1,
                 () => applyHitV2(base_great),
                 () => applyHitV2(base_ok),
                 () =>

From 4ecc4632aa9849865f438401783172169d6aac71 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 18:41:08 +0900
Subject: [PATCH 1377/2100] Make rounding error even less precise

Basically matching the old code more closely to avoid too much precision
from doing math in a slightly different way.
---
 .../Legacy/DistanceObjectPatternGenerator.cs   |  2 +-
 .../Beatmaps/TaikoBeatmapConverter.cs          |  2 +-
 .../Objects/Types/IHasSliderVelocity.cs        | 18 +++++++++++++-----
 3 files changed, 15 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 749ab78fa5..476bcda36f 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             double beatLength;
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.GetPrecisionAdjustedSliderVelocityMultiplier(ManiaRuleset.SHORT_NAME);
+                beatLength = hasSliderVelocity.GetPrecisionAdjustedBeatLength(timingPoint, ManiaRuleset.SHORT_NAME);
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 339c671943..ff6809e69a 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             double beatLength;
 
             if (obj is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.GetPrecisionAdjustedSliderVelocityMultiplier(TaikoRuleset.SHORT_NAME);
+                beatLength = hasSliderVelocity.GetPrecisionAdjustedBeatLength(timingPoint, TaikoRuleset.SHORT_NAME);
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
index 34c2bda05c..73582b8fdc 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Bindables;
+using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
@@ -19,21 +20,28 @@ namespace osu.Game.Rulesets.Objects.Types
         BindableNumber<double> SliderVelocityMultiplierBindable { get; }
 
         /// <summary>
-        /// Introduces floating-point errors for rulesets that depend on it.
+        /// Introduces floating-point errors to post-multiplied beat length for rulesets that depend on it.
         /// </summary>
-        public double GetPrecisionAdjustedSliderVelocityMultiplier(string rulesetShortName)
+        public double GetPrecisionAdjustedBeatLength(TimingControlPoint timingControlPoint, string rulesetShortName)
         {
-            double beatLength = -100 / SliderVelocityMultiplier;
+            double sliderVelocityAsBeatLength = -100 / SliderVelocityMultiplier;
+
+            // Note: In stable, the division occurs on floats, but with compiler optimisations turned on actually seems to occur on doubles via some .NET black magic (possibly inlining?).
+            double bpmMultiplier;
 
             switch (rulesetShortName)
             {
                 case "taiko":
                 case "mania":
-                    return 1 / (beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100.0 : 1);
+                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 10000) / 100.0 : 1;
+                    break;
 
                 default:
-                    return 1 / (beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 1000) / 100.0 : 1);
+                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 1000) / 100.0 : 1;
+                    break;
             }
+
+            return timingControlPoint.BeatLength * bpmMultiplier;
         }
     }
 }

From 3cf8082aa7b2877a7f533074ad697b4329cf391f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 12:07:12 +0200
Subject: [PATCH 1378/2100] Add capability to toggle visibility of graph

---
 .../Visual/Gameplay/TestSceneScoring.cs       | 92 ++++++++++++++++---
 1 file changed, 77 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index 4cbc046877..d7974b63e7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using NUnit.Framework;
 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.Cursor;
@@ -75,7 +76,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                                 legend = new FillFlowContainer
                                 {
                                     Padding = new MarginPadding(20),
-                                    Direction = FillDirection.Full,
+                                    Direction = FillDirection.Vertical,
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
                                 },
@@ -263,7 +264,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 results.Add(getTotalScore());
             }
 
-            graphs.Add(new LineGraph
+            LineGraph graph;
+            graphs.Add(graph = new LineGraph
             {
                 Name = name,
                 RelativeSizeAxes = Axes.Both,
@@ -271,20 +273,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Values = results
             });
 
-            legend.Add(new OsuSpriteText
+            legend.Add(new LegendEntry(name, getTotalScore(), graph)
             {
-                Colour = colour,
-                RelativeSizeAxes = Axes.X,
-                Width = 0.5f,
-                Text = $"{FontAwesome.Solid.Circle.Icon} {name}"
-            });
-
-            legend.Add(new OsuSpriteText
-            {
-                Colour = colour,
-                RelativeSizeAxes = Axes.X,
-                Width = 0.5f,
-                Text = $"final score {getTotalScore():#,0}"
+                AccentColour = colour
             });
         }
     }
@@ -505,4 +496,75 @@ namespace osu.Game.Tests.Visual.Gameplay
             public void Move(Vector2 pos) => this.MoveTo(pos);
         }
     }
+
+    public partial class LegendEntry : OsuClickableContainer, IHasAccentColour
+    {
+        public Color4 AccentColour { get; set; }
+
+        public BindableBool Visible { get; } = new BindableBool(true);
+
+        private readonly string description;
+        private readonly long finalScore;
+        private readonly LineGraph lineGraph;
+
+        private OsuSpriteText descriptionText = null!;
+        private OsuSpriteText finalScoreText = null!;
+
+        public LegendEntry(string description, long finalScore, LineGraph lineGraph)
+        {
+            this.description = description;
+            this.finalScore = finalScore;
+            this.lineGraph = lineGraph;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Content.RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Content.AutoSizeAxes = Axes.Y;
+
+            Children = new Drawable[]
+            {
+                descriptionText = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+                finalScoreText = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Font = OsuFont.Default.With(fixedWidth: true)
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Visible.BindValueChanged(_ => updateState(), true);
+            Action = Visible.Toggle;
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            updateState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            updateState();
+            base.OnHoverLost(e);
+        }
+
+        private void updateState()
+        {
+            Colour = IsHovered ? AccentColour.Lighten(0.2f) : AccentColour;
+
+            descriptionText.Text = $"{(Visible.Value ? FontAwesome.Solid.CheckCircle.Icon : FontAwesome.Solid.Circle.Icon)} {description}";
+            finalScoreText.Text = finalScore.ToString("#,0");
+            lineGraph.Alpha = Visible.Value ? 1 : 0;
+        }
+    }
 }

From 607ceeccb98e8cfd269bdf17156cbf2432eaab98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 12:19:50 +0200
Subject: [PATCH 1379/2100] Persist visibility state of graphs

---
 .../Visual/Gameplay/TestSceneScoring.cs       | 99 +++++++++++++------
 1 file changed, 67 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index d7974b63e7..0162d57cd5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -38,6 +38,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private FillFlowContainer legend = null!;
 
+        private readonly BindableBool standardisedVisible = new BindableBool(true);
+        private readonly BindableBool classicVisible = new BindableBool(true);
+        private readonly BindableBool scoreV1Visible = new BindableBool(true);
+        private readonly BindableBool scoreV2Visible = new BindableBool(true);
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -135,8 +140,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Clear();
             legend.Clear();
 
-            runForProcessor("lazer-standardised", colours.Green1, new OsuScoreProcessor(), ScoringMode.Standardised);
-            runForProcessor("lazer-classic", colours.Blue1, new OsuScoreProcessor(), ScoringMode.Classic);
+            runForProcessor("lazer-standardised", colours.Green1, new OsuScoreProcessor(), ScoringMode.Standardised, standardisedVisible);
+            runForProcessor("lazer-classic", colours.Blue1, new OsuScoreProcessor(), ScoringMode.Classic, classicVisible);
 
             runScoreV1();
             runScoreV2();
@@ -166,17 +171,22 @@ namespace osu.Game.Tests.Visual.Gameplay
                 currentCombo++;
             }
 
-            runForAlgorithm("ScoreV1 (classic)", colours.Purple1,
-                () => applyHitV1(base_great),
-                () => applyHitV1(base_ok),
-                () => applyHitV1(0),
-                () =>
+            runForAlgorithm(new ScoringAlgorithm
+            {
+                Name = "ScoreV1 (classic)",
+                Colour = colours.Purple1,
+                ApplyHit = () => applyHitV1(base_great),
+                ApplyNonPerfect = () => applyHitV1(base_ok),
+                ApplyMiss = () => applyHitV1(0),
+                GetTotalScore = () =>
                 {
                     // Arbitrary value chosen towards the upper range.
                     const double score_multiplier = 4;
 
                     return (int)(totalScore * score_multiplier);
-                });
+                },
+                Visible = scoreV1Visible
+            });
         }
 
         private void runScoreV2()
@@ -209,15 +219,19 @@ namespace osu.Game.Tests.Visual.Gameplay
                 currentHits++;
             }
 
-            runForAlgorithm("ScoreV2", colours.Red1,
-                () => applyHitV2(base_great),
-                () => applyHitV2(base_ok),
-                () =>
+            runForAlgorithm(new ScoringAlgorithm
+            {
+                Name = "ScoreV2",
+                Colour = colours.Red1,
+                ApplyHit = () => applyHitV2(base_great),
+                ApplyNonPerfect = () => applyHitV2(base_ok),
+                ApplyMiss = () =>
                 {
                     currentHits++;
                     maxBaseScore += base_great;
                     currentCombo = 0;
-                }, () =>
+                },
+                GetTotalScore = () =>
                 {
                     double accuracy = currentBaseScore / maxBaseScore;
 
@@ -226,10 +240,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                         700000 * comboPortion / comboPortionMax +
                         300000 * Math.Pow(accuracy, 10) * ((double)currentHits / maxCombo)
                     );
-                });
+                },
+                Visible = scoreV2Visible
+            });
         }
 
-        private void runForProcessor(string name, Color4 colour, ScoreProcessor processor, ScoringMode mode)
+        private void runForProcessor(string name, Color4 colour, ScoreProcessor processor, ScoringMode mode, BindableBool visibility)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
 
@@ -239,14 +255,19 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             processor.ApplyBeatmap(beatmap);
 
-            runForAlgorithm(name, colour,
-                () => 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 }),
-                () => processor.GetDisplayScore(mode));
+            runForAlgorithm(new ScoringAlgorithm
+            {
+                Name = name,
+                Colour = colour,
+                ApplyHit = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great }),
+                ApplyNonPerfect = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok }),
+                ApplyMiss = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss }),
+                GetTotalScore = () => processor.GetDisplayScore(mode),
+                Visible = visibility
+            });
         }
 
-        private void runForAlgorithm(string name, Color4 colour, Action applyHit, Action applyNonPerfect, Action applyMiss, Func<long> getTotalScore)
+        private void runForAlgorithm(ScoringAlgorithm scoringAlgorithm)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
 
@@ -255,31 +276,42 @@ namespace osu.Game.Tests.Visual.Gameplay
             for (int i = 0; i < maxCombo; i++)
             {
                 if (graphs.MissLocations.Contains(i))
-                    applyMiss();
+                    scoringAlgorithm.ApplyMiss();
                 else if (graphs.NonPerfectLocations.Contains(i))
-                    applyNonPerfect();
+                    scoringAlgorithm.ApplyNonPerfect();
                 else
-                    applyHit();
+                    scoringAlgorithm.ApplyHit();
 
-                results.Add(getTotalScore());
+                results.Add(scoringAlgorithm.GetTotalScore());
             }
 
             LineGraph graph;
             graphs.Add(graph = new LineGraph
             {
-                Name = name,
+                Name = scoringAlgorithm.Name,
                 RelativeSizeAxes = Axes.Both,
-                LineColour = colour,
+                LineColour = scoringAlgorithm.Colour,
                 Values = results
             });
 
-            legend.Add(new LegendEntry(name, getTotalScore(), graph)
+            legend.Add(new LegendEntry(scoringAlgorithm, graph)
             {
-                AccentColour = colour
+                AccentColour = scoringAlgorithm.Colour,
             });
         }
     }
 
+    public class ScoringAlgorithm
+    {
+        public string Name { get; init; } = null!;
+        public Color4 Colour { get; init; }
+        public Action ApplyHit { get; init; } = () => { };
+        public Action ApplyNonPerfect { get; init; } = () => { };
+        public Action ApplyMiss { get; init; } = () => { };
+        public Func<long> GetTotalScore { get; init; } = null!;
+        public BindableBool Visible { get; init; } = null!;
+    }
+
     public partial class GraphContainer : Container, IHasCustomTooltip<IEnumerable<LineGraph>>
     {
         public readonly BindableList<double> MissLocations = new BindableList<double>();
@@ -510,10 +542,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         private OsuSpriteText descriptionText = null!;
         private OsuSpriteText finalScoreText = null!;
 
-        public LegendEntry(string description, long finalScore, LineGraph lineGraph)
+        public LegendEntry(ScoringAlgorithm scoringAlgorithm, LineGraph lineGraph)
         {
-            this.description = description;
-            this.finalScore = finalScore;
+            description = scoringAlgorithm.Name;
+            finalScore = scoringAlgorithm.GetTotalScore();
+            AccentColour = scoringAlgorithm.Colour;
+            Visible.BindTo(scoringAlgorithm.Visible);
+
             this.lineGraph = lineGraph;
         }
 

From 15708ee46546562ffea09cd21e1af76491df17ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 13:27:40 +0200
Subject: [PATCH 1380/2100] Add toggle for showing relative/absolute score
 values

---
 .../Visual/Gameplay/TestSceneScoring.cs       | 59 +++++++++++++++----
 1 file changed, 46 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index 0162d57cd5..3cd79fa729 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -35,8 +35,9 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private GraphContainer graphs = null!;
         private SettingsSlider<int> sliderMaxCombo = null!;
+        private SettingsCheckbox scaleToMax = null!;
 
-        private FillFlowContainer legend = null!;
+        private FillFlowContainer<LegendEntry> legend = null!;
 
         private readonly BindableBool standardisedVisible = new BindableBool(true);
         private readonly BindableBool classicVisible = new BindableBool(true);
@@ -78,7 +79,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                             },
                             new Drawable[]
                             {
-                                legend = new FillFlowContainer
+                                legend = new FillFlowContainer<LegendEntry>
                                 {
                                     Padding = new MarginPadding(20),
                                     Direction = FillDirection.Vertical,
@@ -93,26 +94,31 @@ namespace osu.Game.Tests.Visual.Gameplay
                                     Padding = new MarginPadding(20),
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
-                                    Direction = FillDirection.Full,
+                                    Direction = FillDirection.Vertical,
+                                    Spacing = new Vector2(10),
                                     Children = new Drawable[]
                                     {
                                         sliderMaxCombo = new SettingsSlider<int>
                                         {
-                                            Width = 0.5f,
                                             TransferValueOnCommit = true,
                                             Current = new BindableInt(1024)
                                             {
                                                 MinValue = 96,
                                                 MaxValue = 8192,
                                             },
-                                            LabelText = "max combo",
+                                            LabelText = "Max combo",
+                                        },
+                                        scaleToMax = new SettingsCheckbox
+                                        {
+                                            LabelText = "Rescale plots to 100%",
+                                            Current = { Value = true, Default = true }
                                         },
                                         new OsuTextFlowContainer
                                         {
                                             RelativeSizeAxes = Axes.X,
-                                            Width = 0.5f,
                                             AutoSizeAxes = Axes.Y,
-                                            Text = $"Left click to add miss\nRight click to add OK/{base_ok}"
+                                            Text = $"Left click to add miss\nRight click to add OK/{base_ok}",
+                                            Margin = new MarginPadding { Top = 20 }
                                         }
                                     }
                                 },
@@ -122,6 +128,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                 };
 
                 sliderMaxCombo.Current.BindValueChanged(_ => rerun());
+                scaleToMax.Current.BindValueChanged(_ => rerun());
+
+                standardisedVisible.BindValueChanged(_ => rescalePlots());
+                classicVisible.BindValueChanged(_ => rescalePlots());
+                scoreV1Visible.BindValueChanged(_ => rescalePlots());
+                scoreV2Visible.BindValueChanged(_ => rescalePlots());
 
                 graphs.MissLocations.BindCollectionChanged((_, __) => rerun());
                 graphs.NonPerfectLocations.BindCollectionChanged((_, __) => rerun());
@@ -145,6 +157,24 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             runScoreV1();
             runScoreV2();
+
+            rescalePlots();
+        }
+
+        private void rescalePlots()
+        {
+            if (!scaleToMax.Current.Value && legend.Any(entry => entry.Visible.Value))
+            {
+                long maxScore = legend.Where(entry => entry.Visible.Value).Max(entry => entry.FinalScore);
+
+                foreach (var graph in graphs)
+                    graph.Height = graph.Values.Max() / maxScore;
+            }
+            else
+            {
+                foreach (var graph in graphs)
+                    graph.Height = 1;
+            }
         }
 
         private void runScoreV1()
@@ -289,6 +319,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Add(graph = new LineGraph
             {
                 Name = scoringAlgorithm.Name,
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
                 RelativeSizeAxes = Axes.Both,
                 LineColour = scoringAlgorithm.Colour,
                 Values = results
@@ -312,14 +344,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         public BindableBool Visible { get; init; } = null!;
     }
 
-    public partial class GraphContainer : Container, IHasCustomTooltip<IEnumerable<LineGraph>>
+    public partial class GraphContainer : Container<LineGraph>, IHasCustomTooltip<IEnumerable<LineGraph>>
     {
         public readonly BindableList<double> MissLocations = new BindableList<double>();
         public readonly BindableList<double> NonPerfectLocations = new BindableList<double>();
 
         public Bindable<int> MaxCombo = new Bindable<int>();
 
-        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+        protected override Container<LineGraph> Content { get; } = new Container<LineGraph> { RelativeSizeAxes = Axes.Both };
 
         private readonly Box hoverLine;
 
@@ -470,7 +502,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public ITooltip<IEnumerable<LineGraph>> GetCustomTooltip() => tooltip ??= new GraphTooltip(this);
 
-        public IEnumerable<LineGraph> TooltipContent => Content.OfType<LineGraph>();
+        public IEnumerable<LineGraph> TooltipContent => Content;
 
         public partial class GraphTooltip : CompositeDrawable, ITooltip<IEnumerable<LineGraph>>
         {
@@ -535,8 +567,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public BindableBool Visible { get; } = new BindableBool(true);
 
+        public readonly long FinalScore;
+
         private readonly string description;
-        private readonly long finalScore;
         private readonly LineGraph lineGraph;
 
         private OsuSpriteText descriptionText = null!;
@@ -545,7 +578,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public LegendEntry(ScoringAlgorithm scoringAlgorithm, LineGraph lineGraph)
         {
             description = scoringAlgorithm.Name;
-            finalScore = scoringAlgorithm.GetTotalScore();
+            FinalScore = scoringAlgorithm.GetTotalScore();
             AccentColour = scoringAlgorithm.Colour;
             Visible.BindTo(scoringAlgorithm.Visible);
 
@@ -598,7 +631,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             Colour = IsHovered ? AccentColour.Lighten(0.2f) : AccentColour;
 
             descriptionText.Text = $"{(Visible.Value ? FontAwesome.Solid.CheckCircle.Icon : FontAwesome.Solid.Circle.Icon)} {description}";
-            finalScoreText.Text = finalScore.ToString("#,0");
+            finalScoreText.Text = FinalScore.ToString("#,0");
             lineGraph.Alpha = Visible.Value ? 1 : 0;
         }
     }

From 3981e2e957ab14d1d8f23b2e65d8f910c18765fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 13:29:02 +0200
Subject: [PATCH 1381/2100] Only show visible graph values in tooltip

---
 osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index 3cd79fa729..0e64af9920 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -550,6 +550,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 foreach (var graph in content)
                 {
+                    if (graph.Alpha == 0) continue;
+
                     float valueAtHover = graph.Values.ElementAt(relevantCombo);
                     float ofTotal = valueAtHover / graph.Values.Last();
 

From e810abf1e61aa032ad9bc3d3a4a18cd366cacbc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 20:51:22 +0900
Subject: [PATCH 1382/2100] Rename variable

---
 .../Objects/Drawables/DrawableSpinner.cs             |  2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs             | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index c30ac6b88b..24446db92a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -312,7 +312,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     tick.TriggerResult(true);
 
                     if (tick is DrawableSpinnerBonusTick)
-                        gainedBonus.Value = score_per_tick * (spins - HitObject.FirstBonusSpin);
+                        gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequiredForBonus);
                 }
 
                 completedFullSpins++;
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index a26cb7b090..5ef670c739 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -31,6 +31,11 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public int SpinsRequired { get; protected set; } = 1;
 
+        /// <summary>
+        /// The number of spins required to start receiving bonus score. The first bonus is awarded on this spin count.
+        /// </summary>
+        public int SpinsRequiredForBonus => SpinsRequired + bonus_spins_gap;
+
         /// <summary>
         /// The gap between spinner completion and the first bonus-awarding spin.
         /// </summary>
@@ -41,11 +46,6 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public int MaximumBonusSpins { get; protected set; } = 1;
 
-        /// <summary>
-        /// The first spin awarding bonus score.
-        /// </summary>
-        public int FirstBonusSpin => SpinsRequired + bonus_spins_gap;
-
         public override Vector2 StackOffset => Vector2.Zero;
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
                 double startTime = StartTime + (float)(i + 1) / totalSpins * Duration;
 
-                AddNested(i < FirstBonusSpin
+                AddNested(i < SpinsRequiredForBonus
                     ? new SpinnerTick { StartTime = startTime, SpinnerDuration = Duration }
                     : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration, Samples = new[] { CreateHitSampleInfo("spinnerbonus") } });
             }

From 7c65a9de75e3342e46240e4d588291fda430c9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 20:31:49 +0200
Subject: [PATCH 1383/2100] Fix Score V1 simulation in scoring test scene
 incorrectly applying multiplier

`TestSceneScoring` included a local simulation of stable's Score V1
algorithm. One of the parts of said algorithm is a mysterious
"score multiplier", influenced by - among others - the beatmap's drain
rate, overall difficulty, circle size, object count, drain length,
and active mods. (An implementation of this already exists in lazer
source, in `OsuLegacyScoreSimulator`, but more on this later.)

However, `TestSceneScoring` had this multiplier in _two_ places, with
_two_ distinct values, one of which being 1 (i.e. basically off).
Unfortunately, the place that had 1 as the multiplier was the wrong one.

Stable calculates the score increase for every hit in two stages;
first, it takes the raw numerical value of the judgement, but then
applies a combo-based bonus on top of it:

    scoreIncrease += (int)(Math.Max(0, ComboCounter.HitCombo - 1) * (scoreIncrease / 25 * ScoreMultiplier));

On the face of it, it may appear that the `ScoreMultiplier` factor
can be factored out and applied at the end only when returning total
score. However, once the above formula is rewritten as:

    scoreIncrease = scoreIncrease + (int)(Math.Max(0, ComboCounter.HitCombo - 1) * (scoreIncrease / 25 * ScoreMultiplier));
                  = scoreIncrease * (1 + (Math.Max(0, ComboCounter.HitCombo - 1) / 25 * ScoreMultiplier))

it becomes clear that that assumption is actually _incorrect_,
and the `ScoreMultiplier` _must_ be applied to every score increase
individually.

The above was cross-checked experimentally against stable source
on an example test map with 100 objects, and a replay hitting them
perfectly.
---
 osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index 0e64af9920..5db05ea67c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -190,7 +190,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                     return;
                 }
 
-                const float score_multiplier = 1;
+                // this corresponds to stable's `ScoreMultiplier`.
+                // value is chosen arbitrarily, towards the upper range.
+                const float score_multiplier = 4;
 
                 totalScore += baseScore;
 
@@ -208,13 +210,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 ApplyHit = () => applyHitV1(base_great),
                 ApplyNonPerfect = () => applyHitV1(base_ok),
                 ApplyMiss = () => applyHitV1(0),
-                GetTotalScore = () =>
-                {
-                    // Arbitrary value chosen towards the upper range.
-                    const double score_multiplier = 4;
-
-                    return (int)(totalScore * score_multiplier);
-                },
+                GetTotalScore = () => totalScore,
                 Visible = scoreV1Visible
             });
         }

From d146da95466e5251f37376da8fbbf07701e6c1d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 16:43:06 +0900
Subject: [PATCH 1384/2100] Fix rate adjust mods not showing "x" prefix on
 customisation slider's tooltip

---
 .../Settings/MultiplierSettingsSlider.cs      | 24 +++++++++++++++++++
 osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs    |  3 ++-
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       |  3 ++-
 osu.Game/Rulesets/Mods/ModHalfTime.cs         |  3 ++-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  5 ++--
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/MultiplierSettingsSlider.cs

diff --git a/osu.Game/Overlays/Settings/MultiplierSettingsSlider.cs b/osu.Game/Overlays/Settings/MultiplierSettingsSlider.cs
new file mode 100644
index 0000000000..bd5b8f92b6
--- /dev/null
+++ b/osu.Game/Overlays/Settings/MultiplierSettingsSlider.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 osu.Framework.Localisation;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings
+{
+    public partial class MultiplierSettingsSlider : SettingsSlider<double, MultiplierSettingsSlider.MultiplierRoundedSliderBar>
+    {
+        public MultiplierSettingsSlider()
+        {
+            KeyboardStep = 0.01f;
+        }
+
+        /// <summary>
+        /// A slider bar which adds a "x" to the end of the tooltip string.
+        /// </summary>
+        public partial class MultiplierRoundedSliderBar : RoundedSliderBar<double>
+        {
+            public override LocalisableString TooltipText => $"{base.TooltipText}x";
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
index e7127abcf0..f62ba21827 100644
--- a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
+++ b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
@@ -10,6 +10,7 @@ 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.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -35,7 +36,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(ModRateAdjust), typeof(ModTimeRamp), typeof(ModAutoplay) };
 
-        [SettingSource("Initial rate", "The starting speed of the track")]
+        [SettingSource("Initial rate", "The starting speed of the track", SettingControlType = typeof(MultiplierSettingsSlider))]
         public BindableNumber<double> InitialRate { get; } = new BindableDouble(1)
         {
             MinValue = 0.5,
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 733610c040..27e594edfe 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -17,7 +18,7 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyIncrease;
         public override LocalisableString Description => "Zoooooooooom...";
 
-        [SettingSource("Speed increase", "The actual increase to apply")]
+        [SettingSource("Speed increase", "The actual increase to apply", SettingControlType = typeof(MultiplierSettingsSlider))]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(1.5)
         {
             MinValue = 1.01,
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 06c7750035..7415c94cd8 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -17,7 +18,7 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyReduction;
         public override LocalisableString Description => "Less zoom...";
 
-        [SettingSource("Speed decrease", "The actual decrease to apply")]
+        [SettingSource("Speed decrease", "The actual decrease to apply", SettingControlType = typeof(MultiplierSettingsSlider))]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(0.75)
         {
             MinValue = 0.5,
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 7285315c3b..54ee0cd3bf 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -7,6 +7,7 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mods
@@ -20,10 +21,10 @@ namespace osu.Game.Rulesets.Mods
 
         public override double ScoreMultiplier => 0.5;
 
-        [SettingSource("Initial rate", "The starting speed of the track")]
+        [SettingSource("Initial rate", "The starting speed of the track", SettingControlType = typeof(MultiplierSettingsSlider))]
         public abstract BindableNumber<double> InitialRate { get; }
 
-        [SettingSource("Final rate", "The final speed to ramp to")]
+        [SettingSource("Final rate", "The final speed to ramp to", SettingControlType = typeof(MultiplierSettingsSlider))]
         public abstract BindableNumber<double> FinalRate { get; }
 
         [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]

From f5cee22db79eca51c234da2fc1865ee1606ef1de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 17:05:42 +0900
Subject: [PATCH 1385/2100] Collapse mod presets column slightly when not in
 use

---
 osu.Game/Overlays/Mods/ModPresetColumn.cs | 10 +++++++++-
 osu.Game/Overlays/Mods/ModSelectColumn.cs |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPresetColumn.cs b/osu.Game/Overlays/Mods/ModPresetColumn.cs
index 3b12eec195..0803389f45 100644
--- a/osu.Game/Overlays/Mods/ModPresetColumn.cs
+++ b/osu.Game/Overlays/Mods/ModPresetColumn.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
+        private const float contracted_width = WIDTH - 120;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -42,6 +44,8 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             ruleset.BindValueChanged(_ => rulesetChanged(), true);
+
+            Width = contracted_width;
         }
 
         private IDisposable? presetSubscription;
@@ -65,7 +69,11 @@ namespace osu.Game.Overlays.Mods
         {
             cancellationTokenSource?.Cancel();
 
-            if (!presets.Any())
+            bool hasPresets = presets.Any();
+
+            this.ResizeWidthTo(hasPresets ? WIDTH : contracted_width, 200, Easing.OutQuint);
+
+            if (!hasPresets)
             {
                 removeAndDisposePresetPanels();
                 return;
diff --git a/osu.Game/Overlays/Mods/ModSelectColumn.cs b/osu.Game/Overlays/Mods/ModSelectColumn.cs
index 338ebdaef4..1c56763bd9 100644
--- a/osu.Game/Overlays/Mods/ModSelectColumn.cs
+++ b/osu.Game/Overlays/Mods/ModSelectColumn.cs
@@ -61,9 +61,11 @@ namespace osu.Game.Overlays.Mods
 
         private const float header_height = 42;
 
+        protected const float WIDTH = 320;
+
         protected ModSelectColumn()
         {
-            Width = 320;
+            Width = WIDTH;
             RelativeSizeAxes = Axes.Y;
             Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0);
 

From be373391f8ef90c5b1da0ca63dca62a7fc76a9f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 17:43:41 +0900
Subject: [PATCH 1386/2100] Simplify multiplier display implementation

---
 osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs | 1 +
 osu.Game/Overlays/Mods/ModCounterDisplay.cs           | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 9f4d187879..7f92a4e644 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Overlays.Mods
         {
             Current.Default = 1d;
             Current.Value = 1d;
+
             Add(new SpriteIcon
             {
                 Anchor = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/Mods/ModCounterDisplay.cs b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
index 3bec27d290..de8f4433f4 100644
--- a/osu.Game/Overlays/Mods/ModCounterDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
@@ -49,8 +49,6 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected abstract LocalisableString Label { get; }
 
-        protected virtual float ValueAreaWidth => 56;
-
         protected virtual string CounterFormat => @"N0";
 
         protected override Container<Drawable> Content => content;
@@ -59,7 +57,7 @@ namespace osu.Game.Overlays.Mods
 
         protected ModCounterDisplay()
         {
-            Height = HEIGHT;
+            Height = ShearedButton.HEIGHT;
             AutoSizeAxes = Axes.X;
 
             InternalChild = new InputBlockingContainer
@@ -75,8 +73,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.CentreRight,
-                        RelativeSizeAxes = Axes.Y,
-                        Width = ValueAreaWidth + ModSelectPanel.CORNER_RADIUS
+                        RelativeSizeAxes = Axes.Both,
                     },
                     new GridContainer
                     {
@@ -85,7 +82,7 @@ namespace osu.Game.Overlays.Mods
                         ColumnDimensions = new[]
                         {
                             new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, ValueAreaWidth)
+                            new Dimension(GridSizeMode.Absolute, 56)
                         },
                         Content = new[]
                         {

From 49114430ed9ac71858c2cb1adbde90d28683ab6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 17:43:55 +0900
Subject: [PATCH 1387/2100] Move multiplier display to bottom of sceen to make
 visible while customising

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 47 +++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 666e2849e8..fb28c41395 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -120,11 +120,12 @@ namespace osu.Game.Overlays.Mods
         private ColumnScrollContainer columnScroll = null!;
         private ColumnFlowContainer columnFlow = null!;
         private FillFlowContainer<ShearedButton> footerButtonFlow = null!;
+        private FillFlowContainer footerContentFlow = null!;
         private DeselectAllModsButton deselectAllModsButton = null!;
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
-        private BeatmapAttributesDisplay? modEffectPreviewPanel;
+        private BeatmapAttributesDisplay? beatmapAttributesDisplay;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -142,8 +143,8 @@ namespace osu.Game.Overlays.Mods
                 if (beatmap == value) return;
 
                 beatmap = value;
-                if (IsLoaded && modEffectPreviewPanel != null)
-                    modEffectPreviewPanel.BeatmapInfo.Value = beatmap?.BeatmapInfo;
+                if (IsLoaded && beatmapAttributesDisplay != null)
+                    beatmapAttributesDisplay.BeatmapInfo.Value = beatmap?.BeatmapInfo;
             }
         }
 
@@ -251,22 +252,32 @@ namespace osu.Game.Overlays.Mods
 
             if (ShowModEffects)
             {
-                aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight
-                });
-
-                FooterContent.Add(modEffectPreviewPanel = new BeatmapAttributesDisplay
+                FooterContent.Add(footerContentFlow = new FillFlowContainer
                 {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(30, 10),
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
                     Margin = new MarginPadding
                     {
                         Vertical = PADDING,
-                        Horizontal = 70
+                        Horizontal = 20
                     },
-                    BeatmapInfo = { Value = beatmap?.BeatmapInfo }
+                    Children = new Drawable[]
+                    {
+                        beatmapAttributesDisplay = new BeatmapAttributesDisplay
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            BeatmapInfo = { Value = beatmap?.BeatmapInfo }
+                        },
+                        multiplierDisplay = new DifficultyMultiplierDisplay
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight
+                        },
+                    }
                 });
             }
 
@@ -340,14 +351,22 @@ namespace osu.Game.Overlays.Mods
             SearchTextBox.PlaceholderText = SearchTextBox.HasFocus ? Resources.Localisation.Web.CommonStrings.InputSearch : ModSelectOverlayStrings.TabToSearch;
 
             // only update preview panel's collapsed state after we are fully visible, to ensure all the buttons are where we expect them to be.
-            if (modEffectPreviewPanel != null && Alpha == 1)
+            if (beatmapAttributesDisplay != null && Alpha == 1)
             {
                 float rightEdgeOfLastButton = footerButtonFlow.Last().ScreenSpaceDrawQuad.TopRight.X;
 
                 // this is cheating a bit; the 375 value is hardcoded based on how wide the expanded panel _generally_ is.
                 // due to the transition applied, the raw screenspace quad of the panel cannot be used, as it will trigger an ugly feedback cycle of expanding and collapsing.
                 float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(375 + 70, 0)).X;
-                modEffectPreviewPanel.Collapsed.Value = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
+
+                bool screenIsntWideEnough = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
+
+                beatmapAttributesDisplay.Collapsed.Value = screenIsntWideEnough;
+                footerContentFlow.Direction = screenIsntWideEnough ? FillDirection.Vertical : FillDirection.Horizontal;
+
+                int layout = screenIsntWideEnough ? -1 : 1;
+                if (footerContentFlow.GetLayoutPosition(beatmapAttributesDisplay) != layout)
+                    footerContentFlow.SetLayoutPosition(beatmapAttributesDisplay, layout);
             }
         }
 

From e241e41f2a692351d426db65b9e84b003e3f4d47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 17:55:21 +0900
Subject: [PATCH 1388/2100] Fix layout decision to account for new multiplier
 addition

---
 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 fb28c41395..95104eb29e 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -355,9 +355,9 @@ namespace osu.Game.Overlays.Mods
             {
                 float rightEdgeOfLastButton = footerButtonFlow.Last().ScreenSpaceDrawQuad.TopRight.X;
 
-                // this is cheating a bit; the 375 value is hardcoded based on how wide the expanded panel _generally_ is.
+                // this is cheating a bit; the 640 value is hardcoded based on how wide the expanded panel _generally_ is.
                 // due to the transition applied, the raw screenspace quad of the panel cannot be used, as it will trigger an ugly feedback cycle of expanding and collapsing.
-                float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(375 + 70, 0)).X;
+                float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(640, 0)).X;
 
                 bool screenIsntWideEnough = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
 

From 21252c1c2381e169586458e61314f4b30d59f854 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 17:55:25 +0900
Subject: [PATCH 1389/2100] Fix animations

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 95104eb29e..a18ee65612 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -266,16 +266,16 @@ namespace osu.Game.Overlays.Mods
                     },
                     Children = new Drawable[]
                     {
-                        beatmapAttributesDisplay = new BeatmapAttributesDisplay
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            BeatmapInfo = { Value = beatmap?.BeatmapInfo }
-                        },
                         multiplierDisplay = new DifficultyMultiplierDisplay
                         {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight
+                        },
+                        beatmapAttributesDisplay = new BeatmapAttributesDisplay
+                        {
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight,
+                            BeatmapInfo = { Value = beatmap?.BeatmapInfo }
                         },
                     }
                 });
@@ -350,8 +350,7 @@ namespace osu.Game.Overlays.Mods
 
             SearchTextBox.PlaceholderText = SearchTextBox.HasFocus ? Resources.Localisation.Web.CommonStrings.InputSearch : ModSelectOverlayStrings.TabToSearch;
 
-            // only update preview panel's collapsed state after we are fully visible, to ensure all the buttons are where we expect them to be.
-            if (beatmapAttributesDisplay != null && Alpha == 1)
+            if (beatmapAttributesDisplay != null)
             {
                 float rightEdgeOfLastButton = footerButtonFlow.Last().ScreenSpaceDrawQuad.TopRight.X;
 
@@ -361,12 +360,13 @@ namespace osu.Game.Overlays.Mods
 
                 bool screenIsntWideEnough = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
 
-                beatmapAttributesDisplay.Collapsed.Value = screenIsntWideEnough;
-                footerContentFlow.Direction = screenIsntWideEnough ? FillDirection.Vertical : FillDirection.Horizontal;
+                // only update preview panel's collapsed state after we are fully visible, to ensure all the buttons are where we expect them to be.
+                if (Alpha == 1)
+                    beatmapAttributesDisplay.Collapsed.Value = screenIsntWideEnough;
 
-                int layout = screenIsntWideEnough ? -1 : 1;
-                if (footerContentFlow.GetLayoutPosition(beatmapAttributesDisplay) != layout)
-                    footerContentFlow.SetLayoutPosition(beatmapAttributesDisplay, layout);
+                footerContentFlow.LayoutDuration = 200;
+                footerContentFlow.LayoutEasing = Easing.OutQuint;
+                footerContentFlow.Direction = screenIsntWideEnough ? FillDirection.Vertical : FillDirection.Horizontal;
             }
         }
 

From 923c2a16edb66b7af3f3f3cc1d7c228290cd9ae7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 18:11:16 +0900
Subject: [PATCH 1390/2100] Fix weird centering of multiplier "x"

---
 .../Overlays/Mods/DifficultyMultiplierDisplay.cs   | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 7f92a4e644..a2d3e4b385 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.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.
 
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osuTK;
 using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Mods
@@ -13,21 +10,12 @@ namespace osu.Game.Overlays.Mods
     {
         protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
 
-        protected override string CounterFormat => @"N2";
+        protected override string CounterFormat => @"0.0x";
 
         public DifficultyMultiplierDisplay()
         {
             Current.Default = 1d;
             Current.Value = 1d;
-
-            Add(new SpriteIcon
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Icon = FontAwesome.Solid.Times,
-                Size = new Vector2(7),
-                Margin = new MarginPadding { Top = 1 }
-            });
         }
 
         protected override void LoadComplete()

From 41b0619533f15f7aac4c5899acdc3d71c4b3afb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 18:19:42 +0900
Subject: [PATCH 1391/2100] Fix shear being included on wrong side of
 `ModCounterDisplay`

---
 osu.Game/Overlays/Mods/ModCounterDisplay.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModCounterDisplay.cs b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
index de8f4433f4..2b6d1953ee 100644
--- a/osu.Game/Overlays/Mods/ModCounterDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
@@ -67,6 +67,8 @@ namespace osu.Game.Overlays.Mods
                 Masking = true,
                 CornerRadius = ModSelectPanel.CORNER_RADIUS,
                 Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
                 Children = new Drawable[]
                 {
                     contentBackground = new Box

From 491d94c5ac0d65d8d275f2622b7ab0f04e27b624 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 18:51:48 +0900
Subject: [PATCH 1392/2100] Use local shear definition

---
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 2aea53090a..770e792736 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -72,6 +72,7 @@ namespace osu.Game.Overlays.Mods
             const float shear = ShearedOverlayContainer.SHEAR;
 
             AutoSizeAxes = Axes.Both;
+
             InternalChild = content = new Container
             {
                 Origin = Anchor.BottomRight,
@@ -145,22 +146,10 @@ namespace osu.Game.Overlays.Mods
                                 Direction = FillDirection.Horizontal,
                                 Children = new[]
                                 {
-                                    circleSizeDisplay = new VerticalAttributeDisplay("CS")
-                                    {
-                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    },
-                                    drainRateDisplay = new VerticalAttributeDisplay("HP")
-                                    {
-                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    },
-                                    approachRateDisplay = new VerticalAttributeDisplay("AR")
-                                    {
-                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    },
-                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD")
-                                    {
-                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    },
+                                    circleSizeDisplay = new VerticalAttributeDisplay("CS") { Shear = new Vector2(-shear, 0), },
+                                    drainRateDisplay = new VerticalAttributeDisplay("HP") { Shear = new Vector2(-shear, 0), },
+                                    approachRateDisplay = new VerticalAttributeDisplay("AR") { Shear = new Vector2(-shear, 0), },
+                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD") { Shear = new Vector2(-shear, 0), },
                                 }
                             }
                         }

From 35840bf6719923053584d442594c0ba65737f40e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 18:51:31 +0900
Subject: [PATCH 1393/2100] Combine `ModCounterDisplay` and
 `DifficultyMultiplierDisplay` into one class

---
 .../TestSceneModsEffectDisplay.cs             |  68 ------
 .../Mods/DifficultyMultiplierDisplay.cs       | 216 ++++++++++++++++-
 osu.Game/Overlays/Mods/ModCounterDisplay.cs   | 222 ------------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |   4 +-
 4 files changed, 213 insertions(+), 297 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
 delete mode 100644 osu.Game/Overlays/Mods/ModCounterDisplay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
deleted file mode 100644
index bf6a718167..0000000000
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
+++ /dev/null
@@ -1,68 +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.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Localisation;
-using osu.Framework.Testing;
-using osu.Game.Graphics;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Mods;
-using osu.Game.Rulesets.Mods;
-using osuTK.Graphics;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    [TestFixture]
-    public partial class TestSceneModsEffectDisplay : OsuTestScene
-    {
-        [Cached]
-        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
-
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
-
-        [Test]
-        public void TestModsEffectDisplay()
-        {
-            TestDisplay testDisplay = null!;
-            Box background = null!;
-
-            AddStep("add display", () =>
-            {
-                Add(testDisplay = new TestDisplay
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
-                });
-                var boxes = testDisplay.ChildrenOfType<Box>();
-                background = boxes.First();
-            });
-
-            AddStep("set value to default", () => testDisplay.Current.Value = 50);
-            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == Color4.White && background.Colour == colourProvider.Background3);
-
-            AddStep("set value to less", () => testDisplay.Current.Value = 40);
-            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyReduction));
-
-            AddStep("set value to bigger", () => testDisplay.Current.Value = 60);
-            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyIncrease));
-        }
-
-        private partial class TestDisplay : ModCounterDisplay
-        {
-            public Container<Drawable> Container => Content;
-
-            protected override LocalisableString Label => "Test display";
-
-            public TestDisplay()
-            {
-                Current.Default = 50;
-            }
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index a2d3e4b385..3c14e3aa60 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -1,30 +1,236 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (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.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
+using osu.Game.Rulesets.Mods;
+using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    public sealed partial class DifficultyMultiplierDisplay : ModCounterDisplay
+    /// <summary>
+    /// Base class for displays of singular counters. Not to be confused with <see cref="BeatmapAttributesDisplay"/> which aggregates multiple attributes.
+    /// </summary>
+    public partial class DifficultyMultiplierDisplay : Container, IHasCurrentValue<double>
     {
-        protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
+        public const float HEIGHT = 42;
+        private const float transition_duration = 200;
 
-        protected override string CounterFormat => @"0.0x";
+        private readonly Box background;
+        private readonly Box labelBackground;
+        private readonly FillFlowContainer content;
+
+        public Bindable<double> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        /// <summary>
+        /// Text to display in the left area of the display.
+        /// </summary>
+        protected LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
+
+        protected virtual string CounterFormat => @"0.0x";
+
+        protected override Container<Drawable> Content => content;
+
+        protected readonly RollingCounter<double> Counter;
+
+        private readonly InputBlockingContainer topContent;
 
         public DifficultyMultiplierDisplay()
         {
             Current.Default = 1d;
             Current.Value = 1d;
+
+            const float shear = ShearedOverlayContainer.SHEAR;
+
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = topContent = new InputBlockingContainer
+            {
+                Origin = Anchor.BottomRight,
+                Anchor = Anchor.BottomRight,
+                AutoSizeAxes = Axes.X,
+                Height = ShearedButton.HEIGHT,
+                Shear = new Vector2(shear, 0),
+                CornerRadius = ShearedButton.CORNER_RADIUS,
+                BorderThickness = ShearedButton.BORDER_THICKNESS,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        AutoSizeAxes = Axes.X,
+                        ColumnDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension(GridSizeMode.Absolute, 56)
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Y,
+                                    AutoSizeAxes = Axes.X,
+                                    Masking = true,
+                                    CornerRadius = ModSelectPanel.CORNER_RADIUS,
+                                    Children = new Drawable[]
+                                    {
+                                        labelBackground = new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            Margin = new MarginPadding { Horizontal = 18 },
+                                            Shear = new Vector2(-shear, 0),
+                                            Text = Label,
+                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+                                        }
+                                    }
+                                },
+                                content = new FillFlowContainer
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Direction = FillDirection.Horizontal,
+                                    Shear = new Vector2(-shear, 0),
+                                    Spacing = new Vector2(2, 0),
+                                    Child = Counter = new EffectCounter(CounterFormat)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Current = { BindTarget = Current }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            background.Colour = colourProvider.Background4;
+            topContent.BorderColour = ColourInfo.GradientVertical(background.Colour, colourProvider.Background1);
+
+            labelBackground.Colour = colourProvider.Background4;
         }
 
         protected override void LoadComplete()
         {
-            base.LoadComplete();
+            Current.BindValueChanged(e =>
+            {
+                var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
+                setColours(effect);
+            }, true);
 
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
             Counter.SetCountWithoutRolling(Current.Value);
         }
+
+        /// <summary>
+        /// Fades colours of text and its background according to displayed value.
+        /// </summary>
+        /// <param name="effect">Effect of the value.</param>
+        private void setColours(ModEffect effect)
+        {
+            switch (effect)
+            {
+                case ModEffect.NotChanged:
+                    background.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
+                    content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
+                    break;
+
+                case ModEffect.DifficultyReduction:
+                    background.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
+                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    break;
+
+                case ModEffect.DifficultyIncrease:
+                    background.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
+                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(effect));
+            }
+        }
+
+        /// <summary>
+        /// Converts signed integer into <see cref="ModEffect"/>. Negative values are counted as difficulty reduction, positive as increase.
+        /// </summary>
+        /// <param name="comparison">Value to convert. Will arrive from comparison between <see cref="Current"/> bindable once it changes and it's <see cref="Bindable{T}.Default"/>.</param>
+        /// <returns>Effect of the value.</returns>
+        protected virtual ModEffect CalculateEffectForComparison(int comparison)
+        {
+            if (comparison == 0)
+                return ModEffect.NotChanged;
+            if (comparison < 0)
+                return ModEffect.DifficultyReduction;
+
+            return ModEffect.DifficultyIncrease;
+        }
+
+        protected enum ModEffect
+        {
+            NotChanged,
+            DifficultyReduction,
+            DifficultyIncrease
+        }
+
+        private partial class EffectCounter : RollingCounter<double>
+        {
+            private readonly string? format;
+
+            public EffectCounter(string? format)
+            {
+                this.format = format;
+            }
+
+            protected override double RollingDuration => 500;
+
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(format);
+
+            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
+            {
+                Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+            };
+        }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModCounterDisplay.cs b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
deleted file mode 100644
index 2b6d1953ee..0000000000
--- a/osu.Game/Overlays/Mods/ModCounterDisplay.cs
+++ /dev/null
@@ -1,222 +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.Bindables;
-using osu.Framework.Extensions.LocalisationExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Localisation;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Mods;
-using osuTK;
-
-namespace osu.Game.Overlays.Mods
-{
-    /// <summary>
-    /// Base class for displays of singular counters. Not to be confused with <see cref="BeatmapAttributesDisplay"/> which aggregates multiple attributes.
-    /// </summary>
-    public abstract partial class ModCounterDisplay : Container, IHasCurrentValue<double>
-    {
-        public const float HEIGHT = 42;
-        private const float transition_duration = 200;
-
-        private readonly Box contentBackground;
-        private readonly Box labelBackground;
-        private readonly FillFlowContainer content;
-
-        public Bindable<double> Current
-        {
-            get => current.Current;
-            set => current.Current = value;
-        }
-
-        private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
-
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
-
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
-
-        /// <summary>
-        /// Text to display in the left area of the display.
-        /// </summary>
-        protected abstract LocalisableString Label { get; }
-
-        protected virtual string CounterFormat => @"N0";
-
-        protected override Container<Drawable> Content => content;
-
-        protected readonly RollingCounter<double> Counter;
-
-        protected ModCounterDisplay()
-        {
-            Height = ShearedButton.HEIGHT;
-            AutoSizeAxes = Axes.X;
-
-            InternalChild = new InputBlockingContainer
-            {
-                RelativeSizeAxes = Axes.Y,
-                AutoSizeAxes = Axes.X,
-                Masking = true,
-                CornerRadius = ModSelectPanel.CORNER_RADIUS,
-                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
-                Anchor = Anchor.BottomRight,
-                Origin = Anchor.BottomRight,
-                Children = new Drawable[]
-                {
-                    contentBackground = new Box
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Y,
-                        AutoSizeAxes = Axes.X,
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, 56)
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
-                            {
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.Y,
-                                    AutoSizeAxes = Axes.X,
-                                    Masking = true,
-                                    CornerRadius = ModSelectPanel.CORNER_RADIUS,
-                                    Children = new Drawable[]
-                                    {
-                                        labelBackground = new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both
-                                        },
-                                        new OsuSpriteText
-                                        {
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                            Margin = new MarginPadding { Horizontal = 18 },
-                                            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                            Text = Label,
-                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
-                                        }
-                                    }
-                                },
-                                content = new FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Direction = FillDirection.Horizontal,
-                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    Spacing = new Vector2(2, 0),
-                                    Child = Counter = new EffectCounter(CounterFormat)
-                                    {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        Current = { BindTarget = Current }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            labelBackground.Colour = colourProvider.Background4;
-        }
-
-        protected override void LoadComplete()
-        {
-            Current.BindValueChanged(e =>
-            {
-                var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
-                setColours(effect);
-            }, true);
-        }
-
-        /// <summary>
-        /// Fades colours of text and its background according to displayed value.
-        /// </summary>
-        /// <param name="effect">Effect of the value.</param>
-        private void setColours(ModEffect effect)
-        {
-            switch (effect)
-            {
-                case ModEffect.NotChanged:
-                    contentBackground.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
-                    content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
-                    break;
-
-                case ModEffect.DifficultyReduction:
-                    contentBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
-                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
-                    break;
-
-                case ModEffect.DifficultyIncrease:
-                    contentBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
-                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(effect));
-            }
-        }
-
-        /// <summary>
-        /// Converts signed integer into <see cref="ModEffect"/>. Negative values are counted as difficulty reduction, positive as increase.
-        /// </summary>
-        /// <param name="comparison">Value to convert. Will arrive from comparison between <see cref="Current"/> bindable once it changes and it's <see cref="Bindable{T}.Default"/>.</param>
-        /// <returns>Effect of the value.</returns>
-        protected virtual ModEffect CalculateEffectForComparison(int comparison)
-        {
-            if (comparison == 0)
-                return ModEffect.NotChanged;
-            if (comparison < 0)
-                return ModEffect.DifficultyReduction;
-
-            return ModEffect.DifficultyIncrease;
-        }
-
-        protected enum ModEffect
-        {
-            NotChanged,
-            DifficultyReduction,
-            DifficultyIncrease
-        }
-
-        private partial class EffectCounter : RollingCounter<double>
-        {
-            private readonly string? format;
-
-            public EffectCounter(string? format)
-            {
-                this.format = format;
-            }
-
-            protected override double RollingDuration => 500;
-
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(format);
-
-            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
-            {
-                Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
-            };
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a18ee65612..7e3082652a 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Overlays.Mods
                 aboveColumnsContent = new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = ModCounterDisplay.HEIGHT,
+                    Height = DifficultyMultiplierDisplay.HEIGHT,
                     Padding = new MarginPadding { Horizontal = 100 },
                     Child = SearchTextBox = new ShearedSearchTextBox
                     {
@@ -197,7 +197,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = ModCounterDisplay.HEIGHT + PADDING,
+                            Top = DifficultyMultiplierDisplay.HEIGHT + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,

From 9a7d1ed98bb5ab10f41a84403876854d45980f48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 18:55:17 +0900
Subject: [PATCH 1394/2100] Tidy up `DifficultyMultiplierDisplay`

---
 .../Mods/DifficultyMultiplierDisplay.cs       | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 3c14e3aa60..7d0f9f1b31 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -21,7 +21,7 @@ using osuTK;
 namespace osu.Game.Overlays.Mods
 {
     /// <summary>
-    /// Base class for displays of singular counters. Not to be confused with <see cref="BeatmapAttributesDisplay"/> which aggregates multiple attributes.
+    /// On the mod select overlay, this provides a local updating view of the aggregate score multiplier coming from mods.
     /// </summary>
     public partial class DifficultyMultiplierDisplay : Container, IHasCurrentValue<double>
     {
@@ -46,16 +46,7 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        /// <summary>
-        /// Text to display in the left area of the display.
-        /// </summary>
-        protected LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
-
-        protected virtual string CounterFormat => @"0.0x";
-
-        protected override Container<Drawable> Content => content;
-
-        protected readonly RollingCounter<double> Counter;
+        private readonly RollingCounter<double> counter;
 
         private readonly InputBlockingContainer topContent;
 
@@ -115,7 +106,7 @@ namespace osu.Game.Overlays.Mods
                                             Origin = Anchor.Centre,
                                             Margin = new MarginPadding { Horizontal = 18 },
                                             Shear = new Vector2(-shear, 0),
-                                            Text = Label,
+                                            Text = DifficultyMultiplierDisplayStrings.DifficultyMultiplier,
                                             Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
                                         }
                                     }
@@ -128,7 +119,7 @@ namespace osu.Game.Overlays.Mods
                                     Direction = FillDirection.Horizontal,
                                     Shear = new Vector2(-shear, 0),
                                     Spacing = new Vector2(2, 0),
-                                    Child = Counter = new EffectCounter(CounterFormat)
+                                    Child = counter = new EffectCounter(@"0.0x")
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
@@ -155,13 +146,13 @@ namespace osu.Game.Overlays.Mods
         {
             Current.BindValueChanged(e =>
             {
-                var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
+                var effect = calculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
                 setColours(effect);
             }, true);
 
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
-            Counter.SetCountWithoutRolling(Current.Value);
+            counter.SetCountWithoutRolling(Current.Value);
         }
 
         /// <summary>
@@ -197,7 +188,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <param name="comparison">Value to convert. Will arrive from comparison between <see cref="Current"/> bindable once it changes and it's <see cref="Bindable{T}.Default"/>.</param>
         /// <returns>Effect of the value.</returns>
-        protected virtual ModEffect CalculateEffectForComparison(int comparison)
+        private static ModEffect calculateEffectForComparison(int comparison)
         {
             if (comparison == 0)
                 return ModEffect.NotChanged;

From 46d5aa59bfa4e7ae6f28eaafe9dd195f7227116d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 19:33:30 +0900
Subject: [PATCH 1395/2100] Split base design out of `BeatmapAttributesDisplay`

---
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 175 ++++--------------
 .../Mods/ModFooterInformationDisplay.cs       | 153 +++++++++++++++
 2 files changed, 184 insertions(+), 144 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 770e792736..8828e017fd 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -7,9 +7,6 @@ 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.Graphics.Colour;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
@@ -18,9 +15,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
 using osuTK;
-using osuTK.Graphics;
 using System.Threading;
-using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
@@ -29,143 +24,69 @@ namespace osu.Game.Overlays.Mods
     /// On the mod select overlay, this provides a local updating view of BPM, star rating and other
     /// difficulty attributes so the user can have a better insight into what mods are changing.
     /// </summary>
-    public partial class BeatmapAttributesDisplay : CompositeDrawable
+    public partial class BeatmapAttributesDisplay : ModFooterInformationDisplay
     {
-        private Container content = null!;
-        private Container innerContent = null!;
-
-        private Box background = null!;
-        private Box innerBackground = null!;
-
         private StarRatingDisplay starRatingDisplay = null!;
         private BPMDisplay bpmDisplay = null!;
 
-        private FillFlowContainer<VerticalAttributeDisplay> outerContent = null!;
         private VerticalAttributeDisplay circleSizeDisplay = null!;
         private VerticalAttributeDisplay drainRateDisplay = null!;
         private VerticalAttributeDisplay approachRateDisplay = null!;
         private VerticalAttributeDisplay overallDifficultyDisplay = null!;
 
-        private const float transition_duration = 250;
-
         public Bindable<IBeatmapInfo?> BeatmapInfo { get; } = new Bindable<IBeatmapInfo?>();
 
-        public BindableBool Collapsed { get; } = new BindableBool(true);
-
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
         private ModSettingChangeTracker? modSettingChangeTracker;
 
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
-
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
         private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
+        public BeatmapAttributesDisplay()
+        {
+            Collapsed.Value = true;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
             const float shear = ShearedOverlayContainer.SHEAR;
 
-            AutoSizeAxes = Axes.Both;
-
-            InternalChild = content = new Container
+            LeftContent.AddRange(new Drawable[]
             {
-                Origin = Anchor.BottomRight,
-                Anchor = Anchor.BottomRight,
-                AutoSizeAxes = Axes.X,
-                Height = ShearedButton.HEIGHT,
-                Shear = new Vector2(shear, 0),
-                CornerRadius = ShearedButton.CORNER_RADIUS,
-                BorderThickness = ShearedButton.BORDER_THICKNESS,
-                Masking = true,
-                Children = new Drawable[]
+                starRatingDisplay = new StarRatingDisplay(default, animated: true)
                 {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                    new FillFlowContainer // divide inner and outer content
-                    {
-                        Origin = Anchor.BottomLeft,
-                        Anchor = Anchor.BottomLeft,
-                        AutoSizeAxes = Axes.X,
-                        RelativeSizeAxes = Axes.Y,
-                        Direction = FillDirection.Horizontal,
-                        Children = new Drawable[]
-                        {
-                            innerContent = new Container
-                            {
-                                AutoSizeAxes = Axes.X,
-                                RelativeSizeAxes = Axes.Y,
-                                BorderThickness = ShearedButton.BORDER_THICKNESS,
-                                CornerRadius = ShearedButton.CORNER_RADIUS,
-                                Masking = true,
-                                Children = new Drawable[]
-                                {
-                                    innerBackground = new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both
-                                    },
-                                    new Container // actual inner content
-                                    {
-                                        Origin = Anchor.Centre,
-                                        Anchor = Anchor.Centre,
-                                        Width = 140,
-                                        RelativeSizeAxes = Axes.Y,
-                                        Margin = new MarginPadding { Horizontal = 15 },
-                                        Children = new Drawable[]
-                                        {
-                                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
-                                            {
-                                                Origin = Anchor.CentreLeft,
-                                                Anchor = Anchor.CentreLeft,
-                                                Shear = new Vector2(-shear, 0),
-                                            },
-                                            bpmDisplay = new BPMDisplay
-                                            {
-                                                Origin = Anchor.CentreRight,
-                                                Anchor = Anchor.CentreRight,
-                                                Shear = new Vector2(-shear, 0),
-                                            }
-                                        }
-                                    }
-                                }
-                            },
-                            outerContent = new FillFlowContainer<VerticalAttributeDisplay>
-                            {
-                                Alpha = 0,
-                                Origin = Anchor.CentreLeft,
-                                Anchor = Anchor.CentreLeft,
-                                AutoSizeAxes = Axes.X,
-                                RelativeSizeAxes = Axes.Y,
-                                Direction = FillDirection.Horizontal,
-                                Children = new[]
-                                {
-                                    circleSizeDisplay = new VerticalAttributeDisplay("CS") { Shear = new Vector2(-shear, 0), },
-                                    drainRateDisplay = new VerticalAttributeDisplay("HP") { Shear = new Vector2(-shear, 0), },
-                                    approachRateDisplay = new VerticalAttributeDisplay("AR") { Shear = new Vector2(-shear, 0), },
-                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD") { Shear = new Vector2(-shear, 0), },
-                                }
-                            }
-                        }
-                    }
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Shear = new Vector2(-shear, 0),
+                },
+                bpmDisplay = new BPMDisplay
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Shear = new Vector2(-shear, 0),
+                    AutoSizeAxes = Axes.Y,
+                    Width = 75,
                 }
-            };
+            });
+
+            RightContent.AddRange(new Drawable[]
+            {
+                circleSizeDisplay = new VerticalAttributeDisplay("CS") { Shear = new Vector2(-shear, 0), },
+                drainRateDisplay = new VerticalAttributeDisplay("HP") { Shear = new Vector2(-shear, 0), },
+                approachRateDisplay = new VerticalAttributeDisplay("AR") { Shear = new Vector2(-shear, 0), },
+                overallDifficultyDisplay = new VerticalAttributeDisplay("OD") { Shear = new Vector2(-shear, 0), },
+            });
         }
 
         protected override void LoadComplete()
         {
-            background.Colour = colourProvider.Background4;
-            innerBackground.Colour = colourProvider.Background3;
-            Color4 glowColour = colourProvider.Background1;
-
-            content.BorderColour = ColourInfo.GradientVertical(background.Colour, glowColour);
-            innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glowColour);
+            base.LoadComplete();
 
             mods.BindValueChanged(_ =>
             {
@@ -176,40 +97,9 @@ namespace osu.Game.Overlays.Mods
                 updateValues();
             }, true);
 
-            Collapsed.BindValueChanged(_ =>
-            {
-                // Only start autosize animations on first collapse toggle. This avoids an ugly initial presentation.
-                startAnimating();
-
-                updateCollapsedState();
-            });
-
             BeatmapInfo.BindValueChanged(_ => updateValues(), true);
         }
 
-        protected override bool OnHover(HoverEvent e)
-        {
-            startAnimating();
-            updateCollapsedState();
-            return true;
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            updateCollapsedState();
-            base.OnHoverLost(e);
-        }
-
-        protected override bool OnMouseDown(MouseDownEvent e) => true;
-
-        protected override bool OnClick(ClickEvent e) => true;
-
-        private void startAnimating()
-        {
-            content.AutoSizeEasing = Easing.OutQuint;
-            content.AutoSizeDuration = transition_duration;
-        }
-
         private void updateValues() => Scheduler.AddOnce(() =>
         {
             if (BeatmapInfo.Value == null)
@@ -242,11 +132,6 @@ namespace osu.Game.Overlays.Mods
             overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
         });
 
-        private void updateCollapsedState()
-        {
-            outerContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
-        }
-
         private partial class BPMDisplay : RollingCounter<double>
         {
             protected override double RollingDuration => 500;
@@ -255,6 +140,8 @@ namespace osu.Game.Overlays.Mods
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {
+                Anchor = Anchor.CentreRight,
+                Origin = Anchor.CentreRight,
                 Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold),
                 UseFullGlyphHeight = false,
             };
diff --git a/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
new file mode 100644
index 0000000000..ca9c13e75f
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
@@ -0,0 +1,153 @@
+// Copyright (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;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Mods
+{
+    public abstract partial class ModFooterInformationDisplay : CompositeDrawable
+    {
+        protected FillFlowContainer LeftContent { get; private set; } = null!;
+        protected FillFlowContainer RightContent { get; private set; } = null!;
+        protected Container Content { get; private set; } = null!;
+
+        public BindableBool Collapsed { get; } = new BindableBool();
+
+        private Container innerContent = null!;
+
+        protected Box MainBackground { get; private set; } = null!;
+        protected Box FrontBackground { get; private set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        private const float transition_duration = 250;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = Content = new Container
+            {
+                Origin = Anchor.BottomRight,
+                Anchor = Anchor.BottomRight,
+                AutoSizeAxes = Axes.X,
+                Height = ShearedButton.HEIGHT,
+                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                CornerRadius = ShearedButton.CORNER_RADIUS,
+                BorderThickness = ShearedButton.BORDER_THICKNESS,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    MainBackground = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new FillFlowContainer // divide inner and outer content
+                    {
+                        Origin = Anchor.BottomLeft,
+                        Anchor = Anchor.BottomLeft,
+                        AutoSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Y,
+                        Direction = FillDirection.Horizontal,
+                        Children = new Drawable[]
+                        {
+                            innerContent = new Container
+                            {
+                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Y,
+                                BorderThickness = ShearedButton.BORDER_THICKNESS,
+                                CornerRadius = ShearedButton.CORNER_RADIUS,
+                                Masking = true,
+                                Children = new Drawable[]
+                                {
+                                    FrontBackground = new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both
+                                    },
+                                    LeftContent = new FillFlowContainer // actual inner content
+                                    {
+                                        Origin = Anchor.Centre,
+                                        Anchor = Anchor.Centre,
+                                        RelativeSizeAxes = Axes.Y,
+                                        AutoSizeAxes = Axes.X,
+                                        Margin = new MarginPadding { Horizontal = 15 },
+                                        Spacing = new Vector2(10),
+                                    }
+                                }
+                            },
+                            RightContent = new FillFlowContainer
+                            {
+                                Alpha = 0,
+                                Origin = Anchor.CentreLeft,
+                                Anchor = Anchor.CentreLeft,
+                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Y,
+                                Direction = FillDirection.Horizontal,
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            MainBackground.Colour = colourProvider.Background4;
+            FrontBackground.Colour = colourProvider.Background3;
+            Color4 glowColour = colourProvider.Background1;
+
+            Content.BorderColour = ColourInfo.GradientVertical(MainBackground.Colour, glowColour);
+            innerContent.BorderColour = ColourInfo.GradientVertical(FrontBackground.Colour, glowColour);
+
+            Collapsed.BindValueChanged(_ =>
+            {
+                // Only start autosize animations on first collapse toggle. This avoids an ugly initial presentation.
+                startAnimating();
+                updateCollapsedState();
+            });
+
+            updateCollapsedState();
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            startAnimating();
+            updateCollapsedState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            updateCollapsedState();
+            base.OnHoverLost(e);
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
+
+        private void startAnimating()
+        {
+            Content.AutoSizeEasing = Easing.OutQuint;
+            Content.AutoSizeDuration = transition_duration;
+        }
+
+        private void updateCollapsedState()
+        {
+            RightContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
+        }
+    }
+}

From 5b2af7f264cba42dbb4ad4dababb38a48eff2cf9 Mon Sep 17 00:00:00 2001
From: sw1tchbl4d3 <sw1tchbl4d3@sw1tchbl4d3.com>
Date: Wed, 13 Sep 2023 12:44:00 +0200
Subject: [PATCH 1396/2100] Default to none bank if invalid samplebank is
 specified

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

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 3dbe7b6519..339e9bb5bc 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -193,10 +193,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
             var addBank = (LegacySampleBank)Parsing.ParseInt(split[1]);
 
             string stringBank = bank.ToString().ToLowerInvariant();
-            if (stringBank == @"none")
+            if (stringBank == @"none" || !Enum.IsDefined(bank))
                 stringBank = null;
             string stringAddBank = addBank.ToString().ToLowerInvariant();
-            if (stringAddBank == @"none")
+            if (stringAddBank == @"none" || !Enum.IsDefined(addBank))
                 stringAddBank = null;
 
             bankInfo.BankForNormal = stringBank;

From 824a3e4adc5eee76168dde693205067ce8632f61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 19:33:39 +0900
Subject: [PATCH 1397/2100] Update `DifficultyMultiplierDisplay` to use new
 shared design

---
 .../Mods/DifficultyMultiplierDisplay.cs       | 144 +++++-------------
 1 file changed, 37 insertions(+), 107 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 7d0f9f1b31..98dc3fa62e 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -6,9 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
@@ -23,14 +20,9 @@ namespace osu.Game.Overlays.Mods
     /// <summary>
     /// On the mod select overlay, this provides a local updating view of the aggregate score multiplier coming from mods.
     /// </summary>
-    public partial class DifficultyMultiplierDisplay : Container, IHasCurrentValue<double>
+    public partial class DifficultyMultiplierDisplay : ModFooterInformationDisplay, IHasCurrentValue<double>
     {
         public const float HEIGHT = 42;
-        private const float transition_duration = 200;
-
-        private readonly Box background;
-        private readonly Box labelBackground;
-        private readonly FillFlowContainer content;
 
         public Bindable<double> Current
         {
@@ -40,110 +32,53 @@ namespace osu.Game.Overlays.Mods
 
         private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
 
+        private const float transition_duration = 200;
+
+        private RollingCounter<double> counter = null!;
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        private readonly RollingCounter<double> counter;
-
-        private readonly InputBlockingContainer topContent;
-
         public DifficultyMultiplierDisplay()
         {
             Current.Default = 1d;
             Current.Value = 1d;
-
-            const float shear = ShearedOverlayContainer.SHEAR;
-
-            AutoSizeAxes = Axes.Both;
-
-            InternalChild = topContent = new InputBlockingContainer
-            {
-                Origin = Anchor.BottomRight,
-                Anchor = Anchor.BottomRight,
-                AutoSizeAxes = Axes.X,
-                Height = ShearedButton.HEIGHT,
-                Shear = new Vector2(shear, 0),
-                CornerRadius = ShearedButton.CORNER_RADIUS,
-                BorderThickness = ShearedButton.BORDER_THICKNESS,
-                Masking = true,
-                Children = new Drawable[]
-                {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Y,
-                        AutoSizeAxes = Axes.X,
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, 56)
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
-                            {
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.Y,
-                                    AutoSizeAxes = Axes.X,
-                                    Masking = true,
-                                    CornerRadius = ModSelectPanel.CORNER_RADIUS,
-                                    Children = new Drawable[]
-                                    {
-                                        labelBackground = new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both
-                                        },
-                                        new OsuSpriteText
-                                        {
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                            Margin = new MarginPadding { Horizontal = 18 },
-                                            Shear = new Vector2(-shear, 0),
-                                            Text = DifficultyMultiplierDisplayStrings.DifficultyMultiplier,
-                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
-                                        }
-                                    }
-                                },
-                                content = new FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Direction = FillDirection.Horizontal,
-                                    Shear = new Vector2(-shear, 0),
-                                    Spacing = new Vector2(2, 0),
-                                    Child = counter = new EffectCounter(@"0.0x")
-                                    {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        Current = { BindTarget = Current }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            background.Colour = colourProvider.Background4;
-            topContent.BorderColour = ColourInfo.GradientVertical(background.Colour, colourProvider.Background1);
+            LeftContent.AddRange(new Drawable[]
+            {
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                    Text = DifficultyMultiplierDisplayStrings.DifficultyMultiplier,
+                    Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+                }
+            });
 
-            labelBackground.Colour = colourProvider.Background4;
+            RightContent.Add(counter = new EffectCounter
+            {
+                Margin = new MarginPadding(10),
+                AutoSizeAxes = Axes.Y,
+                Width = 40,
+                Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Current = { BindTarget = Current }
+            });
         }
 
         protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             Current.BindValueChanged(e =>
             {
                 var effect = calculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
@@ -164,18 +99,18 @@ namespace osu.Game.Overlays.Mods
             switch (effect)
             {
                 case ModEffect.NotChanged:
-                    background.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
-                    content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
+                    MainBackground.FadeColour(colourProvider.Background4, transition_duration, Easing.OutQuint);
+                    counter.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
                     break;
 
                 case ModEffect.DifficultyReduction:
-                    background.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
-                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    MainBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
+                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
                     break;
 
                 case ModEffect.DifficultyIncrease:
-                    background.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
-                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    MainBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
+                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
                     break;
 
                 default:
@@ -207,19 +142,14 @@ namespace osu.Game.Overlays.Mods
 
         private partial class EffectCounter : RollingCounter<double>
         {
-            private readonly string? format;
-
-            public EffectCounter(string? format)
-            {
-                this.format = format;
-            }
-
             protected override double RollingDuration => 500;
 
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(format);
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(@"0.00x");
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
                 Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
             };
         }

From 3e1388c73f9230c19fb258ea1a750d5a7223b92f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 19:57:48 +0900
Subject: [PATCH 1398/2100] Add vertical animation when difficulty multiplier
 is changed

---
 .../Mods/DifficultyMultiplierDisplay.cs       | 95 ++++++++-----------
 1 file changed, 38 insertions(+), 57 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 98dc3fa62e..879df73861 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -6,6 +6,7 @@ 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.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
@@ -14,6 +15,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -63,15 +65,20 @@ namespace osu.Game.Overlays.Mods
                 }
             });
 
-            RightContent.Add(counter = new EffectCounter
+            RightContent.Add(new Container
             {
-                Margin = new MarginPadding(10),
-                AutoSizeAxes = Axes.Y,
                 Width = 40,
-                Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                RelativeSizeAxes = Axes.Y,
+                Margin = new MarginPadding(10),
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Current = { BindTarget = Current }
+                Child = counter = new EffectCounter
+                {
+                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Current = { BindTarget = Current }
+                }
             });
         }
 
@@ -81,8 +88,32 @@ namespace osu.Game.Overlays.Mods
 
             Current.BindValueChanged(e =>
             {
-                var effect = calculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
-                setColours(effect);
+                if (e.NewValue > Current.Default)
+                {
+                    MainBackground
+                        .FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
+                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                }
+                else if (e.NewValue < Current.Default)
+                {
+                    MainBackground
+                        .FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
+                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                }
+                else
+                {
+                    MainBackground.FadeColour(colourProvider.Background4, transition_duration, Easing.OutQuint);
+                    counter.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
+                }
+
+                if (e.NewValue != Current.Default)
+                    MainBackground.FlashColour(Color4.White, 500, Easing.OutQuint);
+
+                const float move_amount = 4;
+                if (e.NewValue > e.OldValue)
+                    counter.MoveToY(Math.Max(-move_amount * 2, counter.Y - move_amount)).Then().MoveToY(0, transition_duration * 2, Easing.OutQuint);
+                else
+                    counter.MoveToY(Math.Min(move_amount * 2, counter.Y + move_amount)).Then().MoveToY(0, transition_duration * 2, Easing.OutQuint);
             }, true);
 
             // required to prevent the counter initially rolling up from 0 to 1
@@ -90,56 +121,6 @@ namespace osu.Game.Overlays.Mods
             counter.SetCountWithoutRolling(Current.Value);
         }
 
-        /// <summary>
-        /// Fades colours of text and its background according to displayed value.
-        /// </summary>
-        /// <param name="effect">Effect of the value.</param>
-        private void setColours(ModEffect effect)
-        {
-            switch (effect)
-            {
-                case ModEffect.NotChanged:
-                    MainBackground.FadeColour(colourProvider.Background4, transition_duration, Easing.OutQuint);
-                    counter.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
-                    break;
-
-                case ModEffect.DifficultyReduction:
-                    MainBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
-                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
-                    break;
-
-                case ModEffect.DifficultyIncrease:
-                    MainBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
-                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(effect));
-            }
-        }
-
-        /// <summary>
-        /// Converts signed integer into <see cref="ModEffect"/>. Negative values are counted as difficulty reduction, positive as increase.
-        /// </summary>
-        /// <param name="comparison">Value to convert. Will arrive from comparison between <see cref="Current"/> bindable once it changes and it's <see cref="Bindable{T}.Default"/>.</param>
-        /// <returns>Effect of the value.</returns>
-        private static ModEffect calculateEffectForComparison(int comparison)
-        {
-            if (comparison == 0)
-                return ModEffect.NotChanged;
-            if (comparison < 0)
-                return ModEffect.DifficultyReduction;
-
-            return ModEffect.DifficultyIncrease;
-        }
-
-        protected enum ModEffect
-        {
-            NotChanged,
-            DifficultyReduction,
-            DifficultyIncrease
-        }
-
         private partial class EffectCounter : RollingCounter<double>
         {
             protected override double RollingDuration => 500;

From 32946413de83efceb75b51571802536e88dc708f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 20:00:06 +0900
Subject: [PATCH 1399/2100] Change display text from "difficulty" to "score"
 multiplier

---
 .../TestSceneModSelectOverlay.cs              |  8 ++++----
 ....cs => TestSceneScoreMultiplierDisplay.cs} | 13 ++++++-------
 .../DifficultyMultiplierDisplayStrings.cs     | 19 -------------------
 .../Localisation/ModSelectOverlayStrings.cs   |  7 ++++++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  8 ++++----
 ...erDisplay.cs => ScoreMultiplierDisplay.cs} |  6 +++---
 6 files changed, 23 insertions(+), 38 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestSceneDifficultyMultiplierDisplay.cs => TestSceneScoreMultiplierDisplay.cs} (79%)
 delete mode 100644 osu.Game/Localisation/DifficultyMultiplierDisplayStrings.cs
 rename osu.Game/Overlays/Mods/{DifficultyMultiplierDisplay.cs => ScoreMultiplierDisplay.cs} (95%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 029a7f8b9e..3728fb3f21 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("mod multiplier correct", () =>
             {
                 double multiplier = SelectedMods.Value.Aggregate(1d, (m, mod) => m * mod.ScoreMultiplier);
-                return Precision.AlmostEquals(multiplier, modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value);
+                return Precision.AlmostEquals(multiplier, modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value);
             });
             assertCustomisationToggleState(disabled: false, active: false);
             AddAssert("setting items created", () => modSelectOverlay.ChildrenOfType<ISettingsItem>().Any());
@@ -130,7 +130,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("mod multiplier correct", () =>
             {
                 double multiplier = SelectedMods.Value.Aggregate(1d, (m, mod) => m * mod.ScoreMultiplier);
-                return Precision.AlmostEquals(multiplier, modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value);
+                return Precision.AlmostEquals(multiplier, modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value);
             });
             assertCustomisationToggleState(disabled: false, active: false);
             AddAssert("setting items created", () => modSelectOverlay.ChildrenOfType<ISettingsItem>().Any());
@@ -787,7 +787,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 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));
+            AddAssert("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().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.
@@ -796,7 +796,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<RevertToDefaultButton<double>>().Single().TriggerClick());
-            AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.7));
+            AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.7));
         }
 
         private void waitForColumnLoad() => AddUntilStep("all column content loaded",
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDifficultyMultiplierDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneScoreMultiplierDisplay.cs
similarity index 79%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneDifficultyMultiplierDisplay.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneScoreMultiplierDisplay.cs
index 890c7295b4..c2ddd814b7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDifficultyMultiplierDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneScoreMultiplierDisplay.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 NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -12,17 +11,17 @@ using osu.Game.Overlays.Mods;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public partial class TestSceneDifficultyMultiplierDisplay : OsuTestScene
+    public partial class TestSceneScoreMultiplierDisplay : OsuTestScene
     {
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
         [Test]
-        public void TestDifficultyMultiplierDisplay()
+        public void TestBasic()
         {
-            DifficultyMultiplierDisplay multiplierDisplay = null;
+            ScoreMultiplierDisplay multiplierDisplay = null!;
 
-            AddStep("create content", () => Child = multiplierDisplay = new DifficultyMultiplierDisplay
+            AddStep("create content", () => Child = multiplierDisplay = new ScoreMultiplierDisplay
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre
@@ -34,7 +33,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddSliderStep("set multiplier", 0, 2, 1d, multiplier =>
             {
-                if (multiplierDisplay != null)
+                if (multiplierDisplay.IsNotNull())
                     multiplierDisplay.Current.Value = multiplier;
             });
         }
diff --git a/osu.Game/Localisation/DifficultyMultiplierDisplayStrings.cs b/osu.Game/Localisation/DifficultyMultiplierDisplayStrings.cs
deleted file mode 100644
index 952ca22678..0000000000
--- a/osu.Game/Localisation/DifficultyMultiplierDisplayStrings.cs
+++ /dev/null
@@ -1,19 +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.Localisation;
-
-namespace osu.Game.Localisation
-{
-    public static class DifficultyMultiplierDisplayStrings
-    {
-        private const string prefix = @"osu.Game.Resources.Localisation.DifficultyMultiplierDisplay";
-
-        /// <summary>
-        /// "Difficulty Multiplier"
-        /// </summary>
-        public static LocalisableString DifficultyMultiplier => new TranslatableString(getKey(@"difficulty_multiplier"), @"Difficulty Multiplier");
-
-        private static string getKey(string key) => $@"{prefix}:{key}";
-    }
-}
diff --git a/osu.Game/Localisation/ModSelectOverlayStrings.cs b/osu.Game/Localisation/ModSelectOverlayStrings.cs
index 05dcf138d7..86ebebd293 100644
--- a/osu.Game/Localisation/ModSelectOverlayStrings.cs
+++ b/osu.Game/Localisation/ModSelectOverlayStrings.cs
@@ -44,6 +44,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString TabToSearch => new TranslatableString(getKey(@"tab_to_search"), @"tab to search...");
 
+        /// <summary>
+        /// "Score Multiplier"
+        /// </summary>
+        public static LocalisableString ScoreMultiplier => new TranslatableString(getKey(@"score_multiplier"), @"Score Multiplier");
+
         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 7e3082652a..bdea8a126c 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.Mods
         private DeselectAllModsButton deselectAllModsButton = null!;
 
         private Container aboveColumnsContent = null!;
-        private DifficultyMultiplierDisplay? multiplierDisplay;
+        private ScoreMultiplierDisplay? multiplierDisplay;
         private BeatmapAttributesDisplay? beatmapAttributesDisplay;
 
         protected ShearedButton BackButton { get; private set; } = null!;
@@ -182,7 +182,7 @@ namespace osu.Game.Overlays.Mods
                 aboveColumnsContent = new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = DifficultyMultiplierDisplay.HEIGHT,
+                    Height = ScoreMultiplierDisplay.HEIGHT,
                     Padding = new MarginPadding { Horizontal = 100 },
                     Child = SearchTextBox = new ShearedSearchTextBox
                     {
@@ -197,7 +197,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = DifficultyMultiplierDisplay.HEIGHT + PADDING,
+                            Top = ScoreMultiplierDisplay.HEIGHT + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,
@@ -266,7 +266,7 @@ namespace osu.Game.Overlays.Mods
                     },
                     Children = new Drawable[]
                     {
-                        multiplierDisplay = new DifficultyMultiplierDisplay
+                        multiplierDisplay = new ScoreMultiplierDisplay
                         {
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight
diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
similarity index 95%
rename from osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
rename to osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
index 879df73861..2b075442e4 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Mods
     /// <summary>
     /// On the mod select overlay, this provides a local updating view of the aggregate score multiplier coming from mods.
     /// </summary>
-    public partial class DifficultyMultiplierDisplay : ModFooterInformationDisplay, IHasCurrentValue<double>
+    public partial class ScoreMultiplierDisplay : ModFooterInformationDisplay, IHasCurrentValue<double>
     {
         public const float HEIGHT = 42;
 
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        public DifficultyMultiplierDisplay()
+        public ScoreMultiplierDisplay()
         {
             Current.Default = 1d;
             Current.Value = 1d;
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Mods
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                    Text = DifficultyMultiplierDisplayStrings.DifficultyMultiplier,
+                    Text = ModSelectOverlayStrings.ScoreMultiplier,
                     Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
                 }
             });

From 8f9cde01aae3ea874a8225c40fedacd637ec0c2e Mon Sep 17 00:00:00 2001
From: sw1tchbl4d3 <sw1tchbl4d3@sw1tchbl4d3.com>
Date: Wed, 13 Sep 2023 13:38:13 +0200
Subject: [PATCH 1400/2100] Add test

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 27 +++++++++++++++++++
 osu.Game.Tests/Resources/invalid-bank.osu     | 11 ++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/invalid-bank.osu

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 970b6aaf60..6fe9c902bb 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -621,6 +621,33 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestInvalidBankDefaultsToNone()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("invalid-bank.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var hitObjects = decoder.Decode(stream).HitObjects;
+
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[0].Samples[0].Bank);
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[0].Samples[1].Bank);
+
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[1].Samples[0].Bank);
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[1].Samples[1].Bank);
+
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[2].Samples[0].Bank);
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[2].Samples[1].Bank);
+
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[3].Samples[0].Bank);
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[3].Samples[1].Bank);
+
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[4].Samples[0].Bank);
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[4].Samples[1].Bank);
+            }
+        }
+
         [Test]
         public void TestFallbackDecoderForCorruptedHeader()
         {
diff --git a/osu.Game.Tests/Resources/invalid-bank.osu b/osu.Game.Tests/Resources/invalid-bank.osu
new file mode 100644
index 0000000000..fb54a61fd3
--- /dev/null
+++ b/osu.Game.Tests/Resources/invalid-bank.osu
@@ -0,0 +1,11 @@
+osu file format v14
+
+[General]
+SampleSet: Normal
+
+[HitObjects]
+256,192,1000,1,8,0:0:0:0:
+256,192,2000,1,8,1:2:0:0:
+256,192,3000,1,8,2:62:0:0:
+256,192,4000,1,8,41:2:0:0:
+256,192,5000,1,8,41:62:0:0:

From 753c1c877c48527c9a5b4d3f5ecc6608581d0e89 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Sep 2023 23:10:13 +0900
Subject: [PATCH 1401/2100] Revert masking SSBO changes

---
 .../UI/Cursor/CursorTrail.cs                  | 20 +++++--------------
 .../Resources/Shaders/sh_TestVertex.vs        |  2 +-
 osu.Game/Screens/Loader.cs                    |  5 ++++-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index 0774d34488..a29faac5a0 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     if (time - part.Time >= 1)
                         continue;
 
-                    vertexBatch.Add(new TexturedTrailVertex(renderer)
+                    vertexBatch.Add(new TexturedTrailVertex
                     {
                         Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomLeft,
@@ -295,7 +295,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex(renderer)
+                    vertexBatch.Add(new TexturedTrailVertex
                     {
                         Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomRight,
@@ -304,7 +304,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex(renderer)
+                    vertexBatch.Add(new TexturedTrailVertex
                     {
                         Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopRight,
@@ -313,7 +313,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex(renderer)
+                    vertexBatch.Add(new TexturedTrailVertex
                     {
                         Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopLeft,
@@ -362,22 +362,12 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             [VertexMember(1, VertexAttribPointerType.Float)]
             public float Time;
 
-            [VertexMember(1, VertexAttribPointerType.Int)]
-            private readonly int maskingIndex;
-
-            public TexturedTrailVertex(IRenderer renderer)
-            {
-                this = default;
-                maskingIndex = renderer.CurrentMaskingIndex;
-            }
-
             public bool Equals(TexturedTrailVertex other)
             {
                 return Position.Equals(other.Position)
                        && TexturePosition.Equals(other.TexturePosition)
                        && Colour.Equals(other.Colour)
-                       && Time.Equals(other.Time)
-                       && maskingIndex == other.maskingIndex;
+                       && Time.Equals(other.Time);
             }
         }
     }
diff --git a/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs b/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
index 80ed686ba5..505554bb33 100644
--- a/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
+++ b/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
@@ -13,7 +13,7 @@ layout(location = 4) out mediump vec2 v_BlendRange;
 void main(void)
 {
 	// Transform from screen space to masking space.
-	highp vec3 maskingPos = g_MaskingInfo.ToMaskingSpace * vec3(m_Position, 1.0);
+	highp vec3 maskingPos = g_ToMaskingSpace * vec3(m_Position, 1.0);
 	v_MaskingPosition = maskingPos.xy / maskingPos.z;
 
 	v_Colour = m_Colour;
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index 962c7d9d14..372cfe748e 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -126,9 +126,12 @@ namespace osu.Game.Screens
             private void load(ShaderManager manager)
             {
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE));
-                loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2_NO_MASKING, FragmentShaderDescriptor.BLUR));
+                loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.BLUR));
+
                 loadTargets.Add(manager.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE));
+
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, "TriangleBorder"));
+
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_3, FragmentShaderDescriptor.TEXTURE));
             }
 

From b5902a873688d547dd114be1ede034b946e825b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 13:29:29 +0900
Subject: [PATCH 1402/2100] Avoid `MemoryStream` overhead for incoming
 non-`MemoryStream` in `ImportTask`

---
 osu.Game/Database/ImportTask.cs | 38 ++++++++++++---------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index def20bc1fb..bf5b377a07 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -46,9 +46,19 @@ namespace osu.Game.Database
         /// </summary>
         public ArchiveReader GetReader()
         {
-            return Stream != null
-                ? getReaderFrom(Stream)
-                : getReaderFrom(Path);
+            if (Stream == null)
+                return getReaderFromPath(Path);
+
+            if (Stream is MemoryStream memoryStream)
+            {
+                if (ZipUtils.IsZipArchive(memoryStream))
+                    return new ZipArchiveReader(memoryStream, Path);
+
+                return new LegacyByteArrayReader(memoryStream.ToArray(), Path);
+            }
+
+            // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
+            return new LegacyByteArrayReader(Stream.ReadAllBytesToArray(), Path);
         }
 
         /// <summary>
@@ -60,32 +70,12 @@ namespace osu.Game.Database
                 File.Delete(Path);
         }
 
-        /// <summary>
-        /// Creates an <see cref="ArchiveReader"/> from a stream.
-        /// </summary>
-        /// <param name="stream">A seekable stream containing the archive content.</param>
-        /// <returns>A reader giving access to the archive's content.</returns>
-        private ArchiveReader getReaderFrom(Stream stream)
-        {
-            if (!(stream is MemoryStream memoryStream))
-            {
-                // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
-                memoryStream = new MemoryStream(stream.ReadAllBytesToArray());
-                stream.Dispose();
-            }
-
-            if (ZipUtils.IsZipArchive(memoryStream))
-                return new ZipArchiveReader(memoryStream, Path);
-
-            return new LegacyByteArrayReader(memoryStream.ToArray(), Path);
-        }
-
         /// <summary>
         /// Creates an <see cref="ArchiveReader"/> from a valid storage path.
         /// </summary>
         /// <param name="path">A file or folder path resolving the archive content.</param>
         /// <returns>A reader giving access to the archive's content.</returns>
-        private ArchiveReader getReaderFrom(string path)
+        private ArchiveReader getReaderFromPath(string path)
         {
             if (ZipUtils.IsZipArchive(path))
                 return new ZipArchiveReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read), System.IO.Path.GetFileName(path));

From 0657b551964986fc5504a202eaa5e699d1c72f00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 13:33:25 +0900
Subject: [PATCH 1403/2100] Avoid `MemoryStream.ToArray` overhead in
 `LegacyByteArrayReader`

---
 osu.Game/Database/ImportTask.cs               |  2 +-
 .../IO/Archives/MemoryStreamArchiveReader.cs  | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/IO/Archives/MemoryStreamArchiveReader.cs

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index bf5b377a07..962eab9fa5 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Database
                 if (ZipUtils.IsZipArchive(memoryStream))
                     return new ZipArchiveReader(memoryStream, Path);
 
-                return new LegacyByteArrayReader(memoryStream.ToArray(), Path);
+                return new MemoryStreamArchiveReader(memoryStream, Path);
             }
 
             // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
diff --git a/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs b/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs
new file mode 100644
index 0000000000..37ce1e508e
--- /dev/null
+++ b/osu.Game/IO/Archives/MemoryStreamArchiveReader.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 System.IO;
+
+namespace osu.Game.IO.Archives
+{
+    /// <summary>
+    /// Allows reading a single file from the provided memory stream.
+    /// </summary>
+    public class MemoryStreamArchiveReader : ArchiveReader
+    {
+        private readonly MemoryStream stream;
+
+        public MemoryStreamArchiveReader(MemoryStream stream, string filename)
+            : base(filename)
+        {
+            this.stream = stream;
+        }
+
+        public override Stream GetStream(string name) => new MemoryStream(stream.GetBuffer(), 0, (int)stream.Length);
+
+        public override void Dispose()
+        {
+        }
+
+        public override IEnumerable<string> Filenames => new[] { Name };
+    }
+}

From 541cd972e1e19ba641b1e3397bb1b073d53121bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 13:36:07 +0900
Subject: [PATCH 1404/2100] Rename `ArchiveReader` implementations to read
 better

---
 osu.Game/Beatmaps/BeatmapImporter.cs                        | 2 +-
 osu.Game/Database/ImportTask.cs                             | 6 +++---
 .../{LegacyByteArrayReader.cs => ByteArrayArchiveReader.cs} | 4 ++--
 ...yDirectoryArchiveReader.cs => DirectoryArchiveReader.cs} | 6 +++---
 ...egacyFileArchiveReader.cs => SingleFileArchiveReader.cs} | 6 +++---
 osu.Game/Screens/Play/Player.cs                             | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename osu.Game/IO/Archives/{LegacyByteArrayReader.cs => ByteArrayArchiveReader.cs} (84%)
 rename osu.Game/IO/Archives/{LegacyDirectoryArchiveReader.cs => DirectoryArchiveReader.cs} (85%)
 rename osu.Game/IO/Archives/{LegacyFileArchiveReader.cs => SingleFileArchiveReader.cs} (83%)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 14719da1bc..b497b8e8dc 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -319,7 +319,7 @@ namespace osu.Game.Beatmaps
         {
             DateTimeOffset dateAdded = DateTimeOffset.UtcNow;
 
-            if (reader is LegacyDirectoryArchiveReader legacyReader)
+            if (reader is DirectoryArchiveReader legacyReader)
             {
                 var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
 
diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index 962eab9fa5..cbc5c9005c 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Database
             }
 
             // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
-            return new LegacyByteArrayReader(Stream.ReadAllBytesToArray(), Path);
+            return new ByteArrayArchiveReader(Stream.ReadAllBytesToArray(), Path);
         }
 
         /// <summary>
@@ -80,9 +80,9 @@ namespace osu.Game.Database
             if (ZipUtils.IsZipArchive(path))
                 return new ZipArchiveReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read), System.IO.Path.GetFileName(path));
             if (Directory.Exists(path))
-                return new LegacyDirectoryArchiveReader(path);
+                return new DirectoryArchiveReader(path);
             if (File.Exists(path))
-                return new LegacyFileArchiveReader(path);
+                return new SingleFileArchiveReader(path);
 
             throw new InvalidFormatException($"{path} is not a valid archive");
         }
diff --git a/osu.Game/IO/Archives/LegacyByteArrayReader.cs b/osu.Game/IO/Archives/ByteArrayArchiveReader.cs
similarity index 84%
rename from osu.Game/IO/Archives/LegacyByteArrayReader.cs
rename to osu.Game/IO/Archives/ByteArrayArchiveReader.cs
index 06db02b335..0e2dee3456 100644
--- a/osu.Game/IO/Archives/LegacyByteArrayReader.cs
+++ b/osu.Game/IO/Archives/ByteArrayArchiveReader.cs
@@ -9,11 +9,11 @@ namespace osu.Game.IO.Archives
     /// <summary>
     /// Allows reading a single file from the provided byte array.
     /// </summary>
-    public class LegacyByteArrayReader : ArchiveReader
+    public class ByteArrayArchiveReader : ArchiveReader
     {
         private readonly byte[] content;
 
-        public LegacyByteArrayReader(byte[] content, string filename)
+        public ByteArrayArchiveReader(byte[] content, string filename)
             : base(filename)
         {
             this.content = content;
diff --git a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs b/osu.Game/IO/Archives/DirectoryArchiveReader.cs
similarity index 85%
rename from osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
rename to osu.Game/IO/Archives/DirectoryArchiveReader.cs
index 1503705022..f2012b7b49 100644
--- a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
+++ b/osu.Game/IO/Archives/DirectoryArchiveReader.cs
@@ -8,13 +8,13 @@ using System.Linq;
 namespace osu.Game.IO.Archives
 {
     /// <summary>
-    /// Reads an archive from a directory on disk.
+    /// Reads an archive directly from a directory on disk.
     /// </summary>
-    public class LegacyDirectoryArchiveReader : ArchiveReader
+    public class DirectoryArchiveReader : ArchiveReader
     {
         private readonly string path;
 
-        public LegacyDirectoryArchiveReader(string path)
+        public DirectoryArchiveReader(string path)
             : base(Path.GetFileName(path))
         {
             // re-get full path to standardise with Directory.GetFiles return values below.
diff --git a/osu.Game/IO/Archives/LegacyFileArchiveReader.cs b/osu.Game/IO/Archives/SingleFileArchiveReader.cs
similarity index 83%
rename from osu.Game/IO/Archives/LegacyFileArchiveReader.cs
rename to osu.Game/IO/Archives/SingleFileArchiveReader.cs
index c317cae5fc..79d9c5de71 100644
--- a/osu.Game/IO/Archives/LegacyFileArchiveReader.cs
+++ b/osu.Game/IO/Archives/SingleFileArchiveReader.cs
@@ -7,14 +7,14 @@ using System.IO;
 namespace osu.Game.IO.Archives
 {
     /// <summary>
-    /// Reads a file on disk as an archive.
+    /// Reads a single file on disk as an archive.
     /// Note: In this case, the file is not an extractable archive, use <see cref="ZipArchiveReader"/> instead.
     /// </summary>
-    public class LegacyFileArchiveReader : ArchiveReader
+    public class SingleFileArchiveReader : ArchiveReader
     {
         private readonly string path;
 
-        public LegacyFileArchiveReader(string path)
+        public SingleFileArchiveReader(string path)
             : base(Path.GetFileName(path))
         {
             // re-get full path to standardise
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8c5828fc92..60806a73c5 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1144,14 +1144,14 @@ namespace osu.Game.Screens.Play
             if (DrawableRuleset.ReplayScore != null)
                 return Task.CompletedTask;
 
-            LegacyByteArrayReader replayReader = null;
+            ByteArrayArchiveReader replayReader = null;
 
             if (score.ScoreInfo.Ruleset.IsLegacyRuleset())
             {
                 using (var stream = new MemoryStream())
                 {
                     new LegacyScoreEncoder(score, GameplayState.Beatmap).Encode(stream);
-                    replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
+                    replayReader = new ByteArrayArchiveReader(stream.ToArray(), "replay.osr");
                 }
             }
 

From 364094fcf29e1a2e8e9f9af9dbd2dab55b28b2d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 13:38:23 +0900
Subject: [PATCH 1405/2100] Inline all archive reader pathing

---
 osu.Game/Database/ImportTask.cs | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index cbc5c9005c..6d432aac25 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -47,7 +47,16 @@ namespace osu.Game.Database
         public ArchiveReader GetReader()
         {
             if (Stream == null)
-                return getReaderFromPath(Path);
+            {
+                if (ZipUtils.IsZipArchive(Path))
+                    return new ZipArchiveReader(File.Open(Path, FileMode.Open, FileAccess.Read, FileShare.Read), System.IO.Path.GetFileName(Path));
+                if (Directory.Exists(Path))
+                    return new DirectoryArchiveReader(Path);
+                if (File.Exists(Path))
+                    return new SingleFileArchiveReader(Path);
+
+                throw new InvalidFormatException($"{Path} is not a valid archive");
+            }
 
             if (Stream is MemoryStream memoryStream)
             {
@@ -70,23 +79,6 @@ namespace osu.Game.Database
                 File.Delete(Path);
         }
 
-        /// <summary>
-        /// Creates an <see cref="ArchiveReader"/> from a valid storage path.
-        /// </summary>
-        /// <param name="path">A file or folder path resolving the archive content.</param>
-        /// <returns>A reader giving access to the archive's content.</returns>
-        private ArchiveReader getReaderFromPath(string path)
-        {
-            if (ZipUtils.IsZipArchive(path))
-                return new ZipArchiveReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read), System.IO.Path.GetFileName(path));
-            if (Directory.Exists(path))
-                return new DirectoryArchiveReader(path);
-            if (File.Exists(path))
-                return new SingleFileArchiveReader(path);
-
-            throw new InvalidFormatException($"{path} is not a valid archive");
-        }
-
         public override string ToString() => System.IO.Path.GetFileName(Path);
     }
 }

From 7bf0a22112bbd2d48bdef9f2f8d41dd804a5ad62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 13:57:56 +0900
Subject: [PATCH 1406/2100] Improve flash effect

---
 .../Mods/ModFooterInformationDisplay.cs       |  8 ++--
 .../Overlays/Mods/ScoreMultiplierDisplay.cs   | 40 ++++++++++++++-----
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
index ca9c13e75f..f4a277eb63 100644
--- a/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Mods
         protected Box FrontBackground { get; private set; } = null!;
 
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
+        protected OverlayColourProvider ColourProvider { get; private set; } = null!;
 
         private const float transition_duration = 250;
 
@@ -105,9 +105,9 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            MainBackground.Colour = colourProvider.Background4;
-            FrontBackground.Colour = colourProvider.Background3;
-            Color4 glowColour = colourProvider.Background1;
+            MainBackground.Colour = ColourProvider.Background4;
+            FrontBackground.Colour = ColourProvider.Background3;
+            Color4 glowColour = ColourProvider.Background1;
 
             Content.BorderColour = ColourInfo.GradientVertical(MainBackground.Colour, glowColour);
             innerContent.BorderColour = ColourInfo.GradientVertical(FrontBackground.Colour, glowColour);
diff --git a/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
index 2b075442e4..c758632392 100644
--- a/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
@@ -15,7 +16,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -38,11 +38,10 @@ namespace osu.Game.Overlays.Mods
 
         private RollingCounter<double> counter = null!;
 
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
+        private Box flashLayer = null!;
 
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
+        private OsuColour colours { get; set; } = null!;
 
         public ScoreMultiplierDisplay()
         {
@@ -53,6 +52,27 @@ namespace osu.Game.Overlays.Mods
         [BackgroundDependencyLoader]
         private void load()
         {
+            // You would think that we could add this to `Content`, but borders don't mix well
+            // with additive blending children elements.
+            AddInternal(new Container
+            {
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
+                RelativeSizeAxes = Axes.Both,
+                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                CornerRadius = ShearedButton.CORNER_RADIUS,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    flashLayer = new Box
+                    {
+                        Alpha = 0,
+                        Blending = BlendingParameters.Additive,
+                        RelativeSizeAxes = Axes.Both,
+                    }
+                }
+            });
+
             LeftContent.AddRange(new Drawable[]
             {
                 new OsuSpriteText
@@ -92,22 +112,24 @@ namespace osu.Game.Overlays.Mods
                 {
                     MainBackground
                         .FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
-                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    counter.FadeColour(ColourProvider.Background5, transition_duration, Easing.OutQuint);
                 }
                 else if (e.NewValue < Current.Default)
                 {
                     MainBackground
                         .FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
-                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    counter.FadeColour(ColourProvider.Background5, transition_duration, Easing.OutQuint);
                 }
                 else
                 {
-                    MainBackground.FadeColour(colourProvider.Background4, transition_duration, Easing.OutQuint);
+                    MainBackground.FadeColour(ColourProvider.Background4, transition_duration, Easing.OutQuint);
                     counter.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
                 }
 
-                if (e.NewValue != Current.Default)
-                    MainBackground.FlashColour(Color4.White, 500, Easing.OutQuint);
+                flashLayer
+                    .FadeOutFromOne()
+                    .FadeTo(0.15f, 60, Easing.OutQuint)
+                    .Then().FadeOut(500, Easing.OutQuint);
 
                 const float move_amount = 4;
                 if (e.NewValue > e.OldValue)

From 68323671ec689160ffc4790e8fd84a573979c3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Sep 2023 08:24:18 +0200
Subject: [PATCH 1407/2100] Update framework and resources

---
 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 2bfdce5ab8..10cee77b09 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.904.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.914.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 052528f93b..d109345518 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,8 +36,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.904.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.822.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.914.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 760ea2e31e..b754b156b3 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.904.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.914.0" />
   </ItemGroup>
 </Project>

From 900376b662ab31b975cda9d6cd4e21dca72e4932 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 16:06:59 +0900
Subject: [PATCH 1408/2100] Refactor storyboard resource lookup to be more
 streamlined

---
 .../Drawables/DrawableStoryboard.cs           | 53 ++++++++++++++++---
 .../Drawables/DrawableStoryboardAnimation.cs  |  6 +--
 .../Drawables/DrawableStoryboardSprite.cs     |  2 +-
 osu.Game/Storyboards/Storyboard.cs            | 13 ++---
 4 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index e674e7512c..6931cea81e 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -1,22 +1,23 @@
 // Copyright (c) ppy Pty Ltd <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;
 using System.Linq;
 using System.Threading;
-using osuTK;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
+using osuTK;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -57,12 +58,18 @@ namespace osu.Game.Storyboards.Drawables
         [Cached(typeof(IReadOnlyList<Mod>))]
         public IReadOnlyList<Mod> Mods { get; }
 
-        private DependencyContainer dependencies;
+        [Resolved]
+        private GameHost host { get; set; } = null!;
+
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
+
+        private DependencyContainer dependencies = null!;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-        public DrawableStoryboard(Storyboard storyboard, IReadOnlyList<Mod> mods = null)
+        public DrawableStoryboard(Storyboard storyboard, IReadOnlyList<Mod>? mods = null)
         {
             Storyboard = storyboard;
             Mods = mods ?? Array.Empty<Mod>();
@@ -85,12 +92,15 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(IGameplayClock clock, CancellationToken? cancellationToken, GameHost host, RealmAccess realm)
+        private void load(IGameplayClock? clock, CancellationToken? cancellationToken)
         {
             if (clock != null)
                 Clock = clock;
 
-            dependencies.Cache(new TextureStore(host.Renderer, host.CreateTextureLoaderStore(new RealmFileStore(realm, host.Storage).Store), false, scaleAdjust: 1));
+            dependencies.CacheAs(typeof(TextureStore),
+                new TextureStore(host.Renderer, host.CreateTextureLoaderStore(
+                    CreateResourceLookupStore()
+                ), false, scaleAdjust: 1));
 
             foreach (var layer in Storyboard.Layers)
             {
@@ -102,6 +112,8 @@ namespace osu.Game.Storyboards.Drawables
             lastEventEndTime = Storyboard.LatestEventTime;
         }
 
+        protected virtual IResourceStore<byte[]> CreateResourceLookupStore() => new StoryboardResourceLookupStore(Storyboard, realm, host);
+
         protected override void Update()
         {
             base.Update();
@@ -115,5 +127,32 @@ namespace osu.Game.Storyboards.Drawables
             foreach (var layer in Children)
                 layer.Enabled = passing ? layer.Layer.VisibleWhenPassing : layer.Layer.VisibleWhenFailing;
         }
+
+        private class StoryboardResourceLookupStore : IResourceStore<byte[]>
+        {
+            private readonly IResourceStore<byte[]> realmFileStore;
+            private readonly Storyboard storyboard;
+
+            public StoryboardResourceLookupStore(Storyboard storyboard, RealmAccess realm, GameHost host)
+            {
+                realmFileStore = new RealmFileStore(realm, host.Storage).Store;
+                this.storyboard = storyboard;
+            }
+
+            public void Dispose() =>
+                realmFileStore.Dispose();
+
+            public byte[] Get(string name) =>
+                realmFileStore.Get(storyboard.GetStoragePathFromStoryboardPath(name));
+
+            public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken()) =>
+                realmFileStore.GetAsync(storyboard.GetStoragePathFromStoryboardPath(name), cancellationToken);
+
+            public Stream GetStream(string name) =>
+                realmFileStore.GetStream(storyboard.GetStoragePathFromStoryboardPath(name));
+
+            public IEnumerable<string> GetAvailableResources() =>
+                realmFileStore.GetAvailableResources();
+        }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 82c01ea6a1..054a50456b 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -99,15 +99,13 @@ namespace osu.Game.Storyboards.Drawables
         {
             int frameIndex = 0;
 
-            Texture frameTexture = storyboard.GetTextureFromPath(getFramePath(frameIndex), textureStore);
+            Texture frameTexture = textureStore.Get(getFramePath(frameIndex));
 
             if (frameTexture != null)
             {
                 // sourcing from storyboard.
                 for (frameIndex = 0; frameIndex < Animation.FrameCount; frameIndex++)
-                {
-                    AddFrame(storyboard.GetTextureFromPath(getFramePath(frameIndex), textureStore), Animation.FrameDelay);
-                }
+                    AddFrame(textureStore.Get(getFramePath(frameIndex)), Animation.FrameDelay);
             }
             else if (storyboard.UseSkinSprites)
             {
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index ec0cb7ca19..379de1a497 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Storyboards.Drawables
         [BackgroundDependencyLoader]
         private void load(TextureStore textureStore, Storyboard storyboard)
         {
-            Texture = storyboard.GetTextureFromPath(Sprite.Path, textureStore);
+            Texture = textureStore.Get(Sprite.Path);
 
             if (Texture == null && storyboard.UseSkinSprites)
             {
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 566e064aad..1892855d3d 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Storyboards.Drawables;
@@ -92,7 +91,7 @@ namespace osu.Game.Storyboards
 
         private static readonly string[] image_extensions = { @".png", @".jpg" };
 
-        public Texture? GetTextureFromPath(string path, TextureStore textureStore)
+        public virtual string? GetStoragePathFromStoryboardPath(string path)
         {
             string? resolvedPath = null;
 
@@ -102,10 +101,7 @@ namespace osu.Game.Storyboards
             }
             else
             {
-                // Just doing this extension logic locally here for simplicity.
-                //
-                // A more "sane" path may be to use the ISkinSource.GetTexture path (which will use the extensions of the underlying TextureStore),
-                // but comes with potential complexity (what happens if the user has beatmap skins disabled?).
+                // Some old storyboards don't include a file extension, so let's best guess at one.
                 foreach (string ext in image_extensions)
                 {
                     if ((resolvedPath = BeatmapInfo.BeatmapSet?.GetPathForFile($"{path}{ext}")) != null)
@@ -113,10 +109,7 @@ namespace osu.Game.Storyboards
                 }
             }
 
-            if (!string.IsNullOrEmpty(resolvedPath))
-                return textureStore.Get(resolvedPath);
-
-            return null;
+            return resolvedPath;
         }
     }
 }

From 46126719ebb3d6c56fc479bb097eb9fecf5caaa2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 16:57:17 +0900
Subject: [PATCH 1409/2100] Fix slider tests not correctly passing slider
 velocity to slideres

---
 .../TestSceneSlider.cs                        | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index 4ad78a3190..6c78ac51b4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -19,7 +19,6 @@ 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;
 using osu.Game.Rulesets.Judgements;
@@ -206,7 +205,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 StackHeight = 10
             };
 
-            return createDrawable(slider, 2, 2);
+            return createDrawable(slider, 2);
         }
 
         private Drawable testSimpleMedium(int repeats = 0) => createSlider(5, repeats: repeats);
@@ -229,6 +228,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             var slider = new Slider
             {
+                SliderVelocityMultiplier = speedMultiplier,
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(0, -(distance / 2)),
                 Path = new SliderPath(PathType.PerfectCurve, new[]
@@ -240,7 +240,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 StackHeight = stackHeight
             };
 
-            return createDrawable(slider, circleSize, speedMultiplier);
+            return createDrawable(slider, circleSize);
         }
 
         private Drawable testPerfect(int repeats = 0)
@@ -258,7 +258,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 RepeatCount = repeats,
             };
 
-            return createDrawable(slider, 2, 3);
+            return createDrawable(slider, 2);
         }
 
         private Drawable testLinear(int repeats = 0) => createLinear(repeats);
@@ -281,7 +281,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 RepeatCount = repeats,
             };
 
-            return createDrawable(slider, 2, 3);
+            return createDrawable(slider, 2);
         }
 
         private Drawable testBezier(int repeats = 0) => createBezier(repeats);
@@ -303,7 +303,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 RepeatCount = repeats,
             };
 
-            return createDrawable(slider, 2, 3);
+            return createDrawable(slider, 2);
         }
 
         private Drawable testLinearOverlapping(int repeats = 0) => createOverlapping(repeats);
@@ -326,7 +326,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 RepeatCount = repeats,
             };
 
-            return createDrawable(slider, 2, 3);
+            return createDrawable(slider, 2);
         }
 
         private Drawable testCatmull(int repeats = 0) => createCatmull(repeats);
@@ -352,15 +352,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                 NodeSamples = repeatSamples
             };
 
-            return createDrawable(slider, 3, 1);
+            return createDrawable(slider, 3);
         }
 
-        private Drawable createDrawable(Slider slider, float circleSize, double speedMultiplier)
+        private Drawable createDrawable(Slider slider, float circleSize)
         {
-            var cpi = new LegacyControlPointInfo();
-            cpi.Add(0, new DifficultyControlPoint { SliderVelocity = speedMultiplier });
-
-            slider.ApplyDefaults(cpi, new BeatmapDifficulty
+            slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty
             {
                 CircleSize = circleSize,
                 SliderTickRate = 3

From e3e7a81ad9f88936ae6a58e7a3402e8716dc590d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 16:58:47 +0900
Subject: [PATCH 1410/2100] Remove slider head circle movement (and remove
 setting from "classic" mod)

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   |  4 ---
 .../Objects/Drawables/DrawableSliderHead.cs   | 25 -------------------
 .../Skinning/Default/PlaySliderBody.cs        | 16 ------------
 3 files changed, 45 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 0148ec1987..8930b4ad70 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -25,9 +25,6 @@ namespace osu.Game.Rulesets.Osu.Mods
         [SettingSource("No slider head accuracy requirement", "Scores sliders proportionally to the number of ticks hit.")]
         public Bindable<bool> NoSliderHeadAccuracy { get; } = new BindableBool(true);
 
-        [SettingSource("No slider head movement", "Pins slider heads at their starting position, regardless of time.")]
-        public Bindable<bool> NoSliderHeadMovement { get; } = new BindableBool(true);
-
         [SettingSource("Apply classic note lock", "Applies note lock to the full hit window.")]
         public Bindable<bool> ClassicNoteLock { get; } = new BindableBool(true);
 
@@ -71,7 +68,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             switch (obj)
             {
                 case DrawableSliderHead head:
-                    head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(head);
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 41f6a40c0a..2dea05da2f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -3,11 +3,9 @@
 
 #nullable disable
 
-using System;
 using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 
@@ -24,12 +22,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => HitObject?.JudgeAsNormalHitCircle ?? base.DisplayResult;
 
-        /// <summary>
-        /// Makes this <see cref="DrawableSliderHead"/> track the follow circle when the start time is reached.
-        /// If <c>false</c>, this <see cref="DrawableSliderHead"/> will be pinned to its initial position in the slider.
-        /// </summary>
-        public bool TrackFollowCircle = true;
-
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
         protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
@@ -64,23 +56,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             CheckHittable = (d, t, r) => DrawableSlider.CheckHittable?.Invoke(d, t, r) ?? ClickAction.Hit;
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            Debug.Assert(Slider != null);
-            Debug.Assert(HitObject != null);
-
-            if (TrackFollowCircle)
-            {
-                double completionProgress = Math.Clamp((Time.Current - Slider.StartTime) / Slider.Duration, 0, 1);
-
-                //todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
-                if (!IsHit)
-                    Position = Slider.CurvePositionAt(completionProgress);
-            }
-        }
-
         protected override HitResult ResultFor(double timeOffset)
         {
             Debug.Assert(HitObject != null);
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index 539777dd6b..aa507cbaf0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -46,22 +46,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
             BorderSize = skin.GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.SliderBorderSize)?.Value ?? 1;
             BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White;
-
-            drawableObject.HitObjectApplied += onHitObjectApplied;
-        }
-
-        private void onHitObjectApplied(DrawableHitObject obj)
-        {
-            var drawableSlider = (DrawableSlider)obj;
-            if (drawableSlider.HitObject == null)
-                return;
-
-            // When not tracking the follow circle, unbind from the config and forcefully disable snaking out - it looks better that way.
-            if (!drawableSlider.HeadCircle.TrackFollowCircle)
-            {
-                SnakingOut.UnbindFrom(configSnakingOut);
-                SnakingOut.Value = false;
-            }
         }
 
         protected virtual Color4 GetBodyAccentColour(ISkinSource skin, Color4 hitObjectAccentColour) =>

From 1ef0c92962a54b7173e6d4211129015f0b9d3742 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 17:23:57 +0900
Subject: [PATCH 1411/2100] Inverse snaking toggle

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index 6c78ac51b4..7a38e72bc9 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -34,16 +34,16 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         private int depthIndex;
 
-        private readonly BindableBool snakingIn = new BindableBool();
-        private readonly BindableBool snakingOut = new BindableBool();
+        private readonly BindableBool snakingIn = new BindableBool(true);
+        private readonly BindableBool snakingOut = new BindableBool(true);
 
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddToggleStep("toggle snaking", v =>
+            AddToggleStep("disable snaking", v =>
             {
-                snakingIn.Value = v;
-                snakingOut.Value = v;
+                snakingIn.Value = !v;
+                snakingOut.Value = !v;
             });
         }
 

From ec824140900bb03a0502903e88f64e6144310907 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 17:49:22 +0900
Subject: [PATCH 1412/2100] Allow testing hitting sliders are certain points in
 tests

---
 .../TestSceneSlider.cs                        | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index 7a38e72bc9..e005d7cac3 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Audio;
@@ -37,14 +38,22 @@ namespace osu.Game.Rulesets.Osu.Tests
         private readonly BindableBool snakingIn = new BindableBool(true);
         private readonly BindableBool snakingOut = new BindableBool(true);
 
-        [SetUpSteps]
-        public void SetUpSteps()
+        private float progressToHit;
+
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             AddToggleStep("disable snaking", v =>
             {
                 snakingIn.Value = !v;
                 snakingOut.Value = !v;
             });
+
+            AddSliderStep("hit at", 0f, 1f, 0f, v =>
+            {
+                progressToHit = v;
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -55,6 +64,18 @@ namespace osu.Game.Rulesets.Osu.Tests
             config.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            foreach (var slider in this.ChildrenOfType<DrawableSlider>())
+            {
+                double completionProgress = Math.Clamp((Time.Current - slider.HitObject.StartTime) / slider.HitObject.Duration, 0, 1);
+                if (completionProgress > progressToHit && !slider.IsHit)
+                    slider.HeadCircle.HitArea.Hit();
+            }
+        }
+
         [Test]
         public void TestVariousSliders()
         {

From cf9ca60b0902ae267aac8d50d46e934deb5759ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 17:49:38 +0900
Subject: [PATCH 1413/2100] Change slider body to not animate snaking until
 head circle is (successfully) hit

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 01174d4d61..09d98654c3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             double completionProgress = Math.Clamp((Time.Current - HitObject.StartTime) / HitObject.Duration, 0, 1);
 
             Ball.UpdateProgress(completionProgress);
-            SliderBody?.UpdateProgress(completionProgress);
+            SliderBody?.UpdateProgress(HeadCircle.IsHit ? completionProgress : 0);
 
             foreach (DrawableHitObject hitObject in NestedHitObjects)
             {

From 25dbd0a1d38caae7fe00266ecde01dbc03d4fa28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Sep 2023 11:24:53 +0200
Subject: [PATCH 1414/2100] Rename variable to reflect new "beatmap attributes
 display" naming

---
 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 a18ee65612..4ebb622bb6 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -356,9 +356,9 @@ namespace osu.Game.Overlays.Mods
 
                 // this is cheating a bit; the 640 value is hardcoded based on how wide the expanded panel _generally_ is.
                 // due to the transition applied, the raw screenspace quad of the panel cannot be used, as it will trigger an ugly feedback cycle of expanding and collapsing.
-                float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(640, 0)).X;
+                float projectedLeftEdgeOfExpandedBeatmapAttributesDisplay = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(640, 0)).X;
 
-                bool screenIsntWideEnough = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
+                bool screenIsntWideEnough = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedBeatmapAttributesDisplay;
 
                 // only update preview panel's collapsed state after we are fully visible, to ensure all the buttons are where we expect them to be.
                 if (Alpha == 1)

From 94cdcfd7ce845ba8010fbc829d56443196903bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Sep 2023 14:56:58 +0200
Subject: [PATCH 1415/2100] Move collapsed bindable back to
 `BeatmapAttributesDisplay` for now

Better to have it only in one place that needs it, rather than have it
not work as expected when someone inherits
`ModFooterInformationDisplay`.
---
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 46 +++++++++++++++++--
 .../Mods/ModFooterInformationDisplay.cs       | 44 ------------------
 2 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 8828e017fd..44c29e313b 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
 using osuTK;
 using System.Threading;
+using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
@@ -39,6 +40,8 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
+        public BindableBool Collapsed { get; } = new BindableBool(true);
+
         private ModSettingChangeTracker? modSettingChangeTracker;
 
         [Resolved]
@@ -47,10 +50,7 @@ namespace osu.Game.Overlays.Mods
         private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
-        public BeatmapAttributesDisplay()
-        {
-            Collapsed.Value = true;
-        }
+        private const float transition_duration = 250;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -75,6 +75,7 @@ namespace osu.Game.Overlays.Mods
                 }
             });
 
+            RightContent.Alpha = 0;
             RightContent.AddRange(new Drawable[]
             {
                 circleSizeDisplay = new VerticalAttributeDisplay("CS") { Shear = new Vector2(-shear, 0), },
@@ -98,6 +99,43 @@ namespace osu.Game.Overlays.Mods
             }, true);
 
             BeatmapInfo.BindValueChanged(_ => updateValues(), true);
+
+            Collapsed.BindValueChanged(_ =>
+            {
+                // Only start autosize animations on first collapse toggle. This avoids an ugly initial presentation.
+                startAnimating();
+                updateCollapsedState();
+            });
+
+            updateCollapsedState();
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            startAnimating();
+            updateCollapsedState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            updateCollapsedState();
+            base.OnHoverLost(e);
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
+
+        private void startAnimating()
+        {
+            Content.AutoSizeEasing = Easing.OutQuint;
+            Content.AutoSizeDuration = transition_duration;
+        }
+
+        private void updateCollapsedState()
+        {
+            RightContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
         }
 
         private void updateValues() => Scheduler.AddOnce(() =>
diff --git a/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
index ca9c13e75f..b55717fc17 100644
--- a/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
@@ -2,12 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
@@ -20,8 +18,6 @@ namespace osu.Game.Overlays.Mods
         protected FillFlowContainer RightContent { get; private set; } = null!;
         protected Container Content { get; private set; } = null!;
 
-        public BindableBool Collapsed { get; } = new BindableBool();
-
         private Container innerContent = null!;
 
         protected Box MainBackground { get; private set; } = null!;
@@ -30,8 +26,6 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        private const float transition_duration = 250;
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -88,7 +82,6 @@ namespace osu.Game.Overlays.Mods
                             },
                             RightContent = new FillFlowContainer
                             {
-                                Alpha = 0,
                                 Origin = Anchor.CentreLeft,
                                 Anchor = Anchor.CentreLeft,
                                 AutoSizeAxes = Axes.X,
@@ -111,43 +104,6 @@ namespace osu.Game.Overlays.Mods
 
             Content.BorderColour = ColourInfo.GradientVertical(MainBackground.Colour, glowColour);
             innerContent.BorderColour = ColourInfo.GradientVertical(FrontBackground.Colour, glowColour);
-
-            Collapsed.BindValueChanged(_ =>
-            {
-                // Only start autosize animations on first collapse toggle. This avoids an ugly initial presentation.
-                startAnimating();
-                updateCollapsedState();
-            });
-
-            updateCollapsedState();
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            startAnimating();
-            updateCollapsedState();
-            return true;
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            updateCollapsedState();
-            base.OnHoverLost(e);
-        }
-
-        protected override bool OnMouseDown(MouseDownEvent e) => true;
-
-        protected override bool OnClick(ClickEvent e) => true;
-
-        private void startAnimating()
-        {
-            Content.AutoSizeEasing = Easing.OutQuint;
-            Content.AutoSizeDuration = transition_duration;
-        }
-
-        private void updateCollapsedState()
-        {
-            RightContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
         }
     }
 }

From 57f32b177dbecff2c10cceeaef82e7bc6243d931 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 22:19:18 +0900
Subject: [PATCH 1416/2100] Fix incorrect handling of non-`MemoryStream`
 pathway

---
 osu.Game/Database/ImportTask.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index 6d432aac25..f02f12f8b7 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -58,16 +58,14 @@ namespace osu.Game.Database
                 throw new InvalidFormatException($"{Path} is not a valid archive");
             }
 
-            if (Stream is MemoryStream memoryStream)
-            {
-                if (ZipUtils.IsZipArchive(memoryStream))
-                    return new ZipArchiveReader(memoryStream, Path);
+            if (Stream is not MemoryStream memoryStream)
+                // Path used primarily in tests (converting `ManifestResourceStream`s to `MemoryStream`s).
+                memoryStream = new MemoryStream(Stream.ReadAllBytesToArray());
 
-                return new MemoryStreamArchiveReader(memoryStream, Path);
-            }
+            if (ZipUtils.IsZipArchive(memoryStream))
+                return new ZipArchiveReader(memoryStream, Path);
 
-            // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
-            return new ByteArrayArchiveReader(Stream.ReadAllBytesToArray(), Path);
+            return new MemoryStreamArchiveReader(memoryStream, Path);
         }
 
         /// <summary>

From 66751ef5bbd21e5426815795917216506cf36069 Mon Sep 17 00:00:00 2001
From: Lukynka CZE <lukynka@capollomedia.com>
Date: Thu, 14 Sep 2023 17:46:29 +0200
Subject: [PATCH 1417/2100] add regex

---
 osu.Game/Online/Chat/MessageFormatter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 10a005d71a..d04d971213 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Online.Chat
         //      http[s]://<domain>.<tld>[:port][/path][?query][#fragment]
         private static readonly Regex advanced_link_regex = new Regex(
             // protocol
-            @"(?<link>[a-z]*?:\/\/" +
+            @"(?<link>(https?|osu)[a-z]*?://" +
             // domain + tld
             @"(?<domain>(?:[a-z0-9]\.|[a-z0-9][a-z0-9-]*[a-z0-9]\.)*[a-z0-9-]*[a-z0-9]" +
             // port (optional)

From 25926af78258e25a32d2bec79d03c8a0fddd17e7 Mon Sep 17 00:00:00 2001
From: Lukynka CZE <lukynka@capollomedia.com>
Date: Thu, 14 Sep 2023 17:46:42 +0200
Subject: [PATCH 1418/2100] add unit test

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 47f4410b07..f0dcd527a4 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -32,8 +32,17 @@ namespace osu.Game.Tests.Chat
             Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a gopher://really-old-protocol we don't support." });
 
             Assert.AreEqual(result.Content, result.DisplayContent);
-            Assert.AreEqual(1, result.Links.Count);
-            Assert.AreEqual("gopher://really-old-protocol", result.Links[0].Url);
+            Assert.AreEqual(0, result.Links.Count);
+        }
+
+        [Test]
+        public void TestSupportedProtocolLinkParsing()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "forgotspacehttps://dev.ppy.sh joinmyosump://12345 jointheosu://chan/#english" });
+
+            Assert.AreEqual("https://dev.ppy.sh", result.Links[0].Url);
+            Assert.AreEqual("osump://12345", result.Links[1].Url);
+            Assert.AreEqual("osu://chan/#english", result.Links[2].Url);
         }
 
         [Test]

From 2a18f76b026441189224c5c61a9737ff06c7aea1 Mon Sep 17 00:00:00 2001
From: Lukynka CZE <lukynka@capollomedia.com>
Date: Thu, 14 Sep 2023 17:48:10 +0200
Subject: [PATCH 1419/2100] add visual test

---
 osu.Game.Tests/Visual/Online/TestSceneChatLink.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index ecf9b68297..7616b9b83c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -64,6 +64,9 @@ namespace osu.Game.Tests.Visual.Online
             addMessageWithChecks("test!");
             addMessageWithChecks("dev.ppy.sh!");
             addMessageWithChecks("https://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("http://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("forgothttps://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("forgothttp://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
             addMessageWithChecks("00:12:345 (1,2) - Test?", 1, expectedActions: LinkAction.OpenEditorTimestamp);
             addMessageWithChecks("Wiki link for tasty [[Performance Points]]", 1, expectedActions: LinkAction.OpenWiki);
             addMessageWithChecks("(osu forums)[https://dev.ppy.sh/forum] (old link format)", 1, expectedActions: LinkAction.External);
@@ -84,9 +87,11 @@ namespace osu.Game.Tests.Visual.Online
             addMessageWithChecks("feels important", 0, true, true);
             addMessageWithChecks("likes to post this [https://dev.ppy.sh/home link].", 1, true, true, expectedActions: LinkAction.External);
             addMessageWithChecks("Join my multiplayer game osump://12346.", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
+            addMessageWithChecks("Join my multiplayer gameosump://12346.", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
             addMessageWithChecks("Join my [multiplayer game](osump://12346).", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
             addMessageWithChecks($"Join my [#english]({OsuGameBase.OSU_PROTOCOL}chan/#english).", 1, expectedActions: LinkAction.OpenChannel);
             addMessageWithChecks($"Join my {OsuGameBase.OSU_PROTOCOL}chan/#english.", 1, expectedActions: LinkAction.OpenChannel);
+            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");

From 9b8fdcbcdc7fef881d9804cd4afc93c4a448536b Mon Sep 17 00:00:00 2001
From: Lukynka CZE <lukynka@capollomedia.com>
Date: Thu, 14 Sep 2023 17:55:53 +0200
Subject: [PATCH 1420/2100] somehow accidentally removed backslashes

---
 osu.Game/Online/Chat/MessageFormatter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index d04d971213..db4d0b1363 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Online.Chat
         //      http[s]://<domain>.<tld>[:port][/path][?query][#fragment]
         private static readonly Regex advanced_link_regex = new Regex(
             // protocol
-            @"(?<link>(https?|osu)[a-z]*?://" +
+            @"(?<link>(https?|osu)[a-z]*?:\/\/" +
             // domain + tld
             @"(?<domain>(?:[a-z0-9]\.|[a-z0-9][a-z0-9-]*[a-z0-9]\.)*[a-z0-9-]*[a-z0-9]" +
             // port (optional)

From c8b18acd4dd1d98170a069240b6666cea3d5da07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Sep 2023 19:36:33 +0200
Subject: [PATCH 1421/2100] Bring back disposal of stream after copy-out to
 `MemoryStream`

Was there in previous code and got removed in the refactor. I'd rather
have it than not.
---
 osu.Game/Database/ImportTask.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index f02f12f8b7..8f2752020b 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -59,8 +59,11 @@ namespace osu.Game.Database
             }
 
             if (Stream is not MemoryStream memoryStream)
+            {
                 // Path used primarily in tests (converting `ManifestResourceStream`s to `MemoryStream`s).
                 memoryStream = new MemoryStream(Stream.ReadAllBytesToArray());
+                Stream.Dispose();
+            }
 
             if (ZipUtils.IsZipArchive(memoryStream))
                 return new ZipArchiveReader(memoryStream, Path);

From ed295effc5206fcb347d2e73cadc5c5abb9251db Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Sep 2023 15:51:05 +0900
Subject: [PATCH 1422/2100] Maximise bonus score

---
 osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 03c6876bae..f92bf6f5ea 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -130,8 +130,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     // We'll redo the calculations to match osu-stable here...
                     const double maximum_rotations_per_second = 477.0 / 60;
 
-                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that minimises bonus score.
-                    const double minimum_rotations_per_second = 7.5;
+                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that maximises bonus score.
+                    const double minimum_rotations_per_second = 3;
 
                     double secondsDuration = spinner.Duration / 1000;
 

From 0031da76ffa68b8d7e3a7eae1155393e2ec85cf7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Sep 2023 17:38:34 +0900
Subject: [PATCH 1423/2100] Move to extension method and throw on non-legacy
 ruleset

---
 .../Legacy/DistanceObjectPatternGenerator.cs  |  1 +
 .../Beatmaps/TaikoBeatmapConverter.cs         |  1 +
 .../Objects/Legacy/LegacyRulesetExtensions.cs | 42 +++++++++++++++++++
 .../Objects/Types/IHasSliderVelocity.cs       | 27 ------------
 4 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 476bcda36f..07df79783c 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Utils;
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index ff6809e69a..054ae9a011 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -14,6 +14,7 @@ using JetBrains.Annotations;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Rulesets.Taiko.Beatmaps
 {
diff --git a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
new file mode 100644
index 0000000000..0bce269668
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.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;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Rulesets.Objects.Legacy
+{
+    public static class LegacyRulesetExtensions
+    {
+        /// <summary>
+        /// Introduces floating-point errors to post-multiplied beat length for legacy rulesets that depend on it.
+        /// You should definitely not use this unless you know exactly what you're doing.
+        /// </summary>
+        public static double GetPrecisionAdjustedBeatLength(this IHasSliderVelocity hasSliderVelocity, TimingControlPoint timingControlPoint, string rulesetShortName)
+        {
+            double sliderVelocityAsBeatLength = -100 / hasSliderVelocity.SliderVelocityMultiplier;
+
+            // Note: In stable, the division occurs on floats, but with compiler optimisations turned on actually seems to occur on doubles via some .NET black magic (possibly inlining?).
+            double bpmMultiplier;
+
+            switch (rulesetShortName)
+            {
+                case "taiko":
+                case "mania":
+                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 10000) / 100.0 : 1;
+                    break;
+
+                case "osu":
+                case "fruits":
+                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 1000) / 100.0 : 1;
+                    break;
+
+                default:
+                    throw new ArgumentException("Must be a legacy ruleset", nameof(rulesetShortName));
+            }
+
+            return timingControlPoint.BeatLength * bpmMultiplier;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
index 73582b8fdc..e665dcc752 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.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 osu.Framework.Bindables;
-using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
@@ -18,30 +16,5 @@ namespace osu.Game.Rulesets.Objects.Types
         double SliderVelocityMultiplier { get; set; }
 
         BindableNumber<double> SliderVelocityMultiplierBindable { get; }
-
-        /// <summary>
-        /// Introduces floating-point errors to post-multiplied beat length for rulesets that depend on it.
-        /// </summary>
-        public double GetPrecisionAdjustedBeatLength(TimingControlPoint timingControlPoint, string rulesetShortName)
-        {
-            double sliderVelocityAsBeatLength = -100 / SliderVelocityMultiplier;
-
-            // Note: In stable, the division occurs on floats, but with compiler optimisations turned on actually seems to occur on doubles via some .NET black magic (possibly inlining?).
-            double bpmMultiplier;
-
-            switch (rulesetShortName)
-            {
-                case "taiko":
-                case "mania":
-                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 10000) / 100.0 : 1;
-                    break;
-
-                default:
-                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 1000) / 100.0 : 1;
-                    break;
-            }
-
-            return timingControlPoint.BeatLength * bpmMultiplier;
-        }
     }
 }

From 56cc2b62f01c930d433a25c4cd65402c0ec2396d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Sep 2023 18:13:04 +0900
Subject: [PATCH 1424/2100] Make not extension method

---
 .../Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs  | 2 +-
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs       | 2 +-
 osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 07df79783c..cce0944564 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             double beatLength;
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                beatLength = hasSliderVelocity.GetPrecisionAdjustedBeatLength(timingPoint, ManiaRuleset.SHORT_NAME);
+                beatLength = LegacyRulesetExtensions.GetPrecisionAdjustedBeatLength(hasSliderVelocity, timingPoint, ManiaRuleset.SHORT_NAME);
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 054ae9a011..e46e2ec09c 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
             double beatLength;
 
             if (obj is IHasSliderVelocity hasSliderVelocity)
-                beatLength = hasSliderVelocity.GetPrecisionAdjustedBeatLength(timingPoint, TaikoRuleset.SHORT_NAME);
+                beatLength = LegacyRulesetExtensions.GetPrecisionAdjustedBeatLength(hasSliderVelocity, timingPoint, TaikoRuleset.SHORT_NAME);
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
index 0bce269668..6cff4b12c4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// Introduces floating-point errors to post-multiplied beat length for legacy rulesets that depend on it.
         /// You should definitely not use this unless you know exactly what you're doing.
         /// </summary>
-        public static double GetPrecisionAdjustedBeatLength(this IHasSliderVelocity hasSliderVelocity, TimingControlPoint timingControlPoint, string rulesetShortName)
+        public static double GetPrecisionAdjustedBeatLength(IHasSliderVelocity hasSliderVelocity, TimingControlPoint timingControlPoint, string rulesetShortName)
         {
             double sliderVelocityAsBeatLength = -100 / hasSliderVelocity.SliderVelocityMultiplier;
 

From 2abef4ade5d9b7d63a9d1cb2da5172c74aff9e9b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Sep 2023 18:35:17 +0900
Subject: [PATCH 1425/2100] Expand comment to justify maximising bonus score
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/Difficulty/OsuLegacyScoreSimulator.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index f92bf6f5ea..952ffa5e7a 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -131,6 +131,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     const double maximum_rotations_per_second = 477.0 / 60;
 
                     // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that maximises bonus score.
+                    // As we're primarily concerned with computing the maximum theoretical final score,
+                    // this will have the final effect of slightly underestimating bonus score achieved on stable when converting from score V1.
                     const double minimum_rotations_per_second = 3;
 
                     double secondsDuration = spinner.Duration / 1000;

From 86c46a5b3f6bebc56b01ce585bf3c01795c68449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Sep 2023 12:07:59 +0200
Subject: [PATCH 1426/2100] Manually reorder objects in expected mapping

The test added in 64baa4d01ae7bb9a2659a83c3e3238d2fbb07ef2 was
previously failing despite applying a fix. This was caused by the fact
that in stable, the last `sliderScoreTimingPoint` (i.e. the
`LegacyLastTick` is pulled back by 36ms, but the list of all of them
is not re-sorted afterwards, causing objects to be exported in
non-chronological order to the resultant conversion mapping.
lazer correctly sorts the objects, causing a false positive.
---
 ...ider-ticks-edge-case-expected-conversion.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
index 657121d812..6d97b643b1 100644
--- a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
@@ -14,20 +14,20 @@
           }
         },
         {
-          "StartTime": 7843.0,
-          "EndTime": 7843.0,
-          "X": 33.7820168,
-          "Y": 208.9957,
+          "StartTime": 7817.0,
+          "EndTime": 7817.0,
+          "X": 30.9946651,
+          "Y": 208.5157,
           "StackOffset": {
             "X": 0.0,
             "Y": 0.0
           }
         },
         {
-          "StartTime": 7817.0,
-          "EndTime": 7817.0,
-          "X": 30.9946651,
-          "Y": 208.5157,
+          "StartTime": 7843.0,
+          "EndTime": 7843.0,
+          "X": 33.7820168,
+          "Y": 208.9957,
           "StackOffset": {
             "X": 0.0,
             "Y": 0.0

From 5c6cd879ddae01fd86b29622d51652847b99a5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Sep 2023 12:21:58 +0200
Subject: [PATCH 1427/2100] Adjust slider calculations to new method API

Code originally read

	Velocity = scoringDistance / beatLength
		 = BASE_SCORING_DISTANCE * SliderMultiplier * GetPrecisionAdjustedSliderVelocityMultiplier() / beatLength

Given (mathematically, floats are not generally as forgiving):

	GetPrecisionAdjustedBeatLength() = beatLength / GetPrecisionAdjustedSliderVelocityMultiplier()

it follows that (inverting both sides):

	1 / GetPrecisionAdjustedBeatLength() = GetPrecisionAdjustedSliderVelocityMultiplier() / beatLength

and therefore

	Velocity = BASE_SCORING_DISTANCE * SliderMultiplier * GetPrecisionAdjustedSliderVelocityMultiplier() / beatLength
		 = BASE_SCORING_DISTANCE * SliderMultiplier / GetPrecisionAdjustedBeatLength()

and to recover `scoringDistance`

	scoringDistance = Velocity * beatLength
---
 osu.Game.Rulesets.Osu/Objects/Slider.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index f40c301220..e05dbd8ea6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -16,6 +16,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
@@ -166,9 +167,11 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * ((IHasSliderVelocity)this).GetPrecisionAdjustedSliderVelocityMultiplier(OsuRuleset.SHORT_NAME);
+            Velocity = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier / LegacyRulesetExtensions.GetPrecisionAdjustedBeatLength(this, timingPoint, OsuRuleset.SHORT_NAME);
+            // WARNING: this is intentionally not computed as `BASE_SCORING_DISTANCE * difficulty.SliderMultiplier`
+            // for backwards compatibility reasons (intentionally introducing floating point errors to match stable).
+            double scoringDistance = Velocity * timingPoint.BeatLength;
 
-            Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
         }
 

From 45751dd1f2cf5610daf4d9cb966347fb453ef570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 14:05:58 +0200
Subject: [PATCH 1428/2100] Minimum viable changes for ruleset-specific scoring
 test scenes

---
 .../TestSceneScoring.cs                       |  33 ++
 .../Tests/Visual/Gameplay/ScoringTestScene.cs | 556 +++++++++---------
 2 files changed, 311 insertions(+), 278 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
 rename osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs => osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs (53%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
new file mode 100644
index 0000000000..5dbfc8d3a1
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
@@ -0,0 +1,33 @@
+// Copyright (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.Beatmaps;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual.Gameplay;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public partial class TestSceneScoring : ScoringTestScene
+    {
+        protected override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
+
+        protected override IBeatmap CreateBeatmap(int maxCombo)
+        {
+            var beatmap = new OsuBeatmap();
+            for (int i = 0; i < maxCombo; i++)
+                beatmap.HitObjects.Add(new HitCircle());
+            return beatmap;
+        }
+
+        protected override JudgementResult CreatePerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great };
+        protected override JudgementResult CreateNonPerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok };
+        protected override JudgementResult CreateMissJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss };
+    }
+}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
similarity index 53%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
rename to osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index 5db05ea67c..ecf55419a2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
@@ -14,15 +14,13 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 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.Overlays.Settings;
-using osu.Game.Rulesets.Osu.Scoring;
-using osu.Game.Rulesets.Osu.Beatmaps;
-using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring.Legacy;
 using osuTK;
@@ -31,8 +29,14 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public partial class TestSceneScoring : OsuTestScene
+    public abstract partial class ScoringTestScene : OsuTestScene
     {
+        protected abstract ScoreProcessor CreateScoreProcessor();
+        protected abstract IBeatmap CreateBeatmap(int maxCombo);
+        protected abstract JudgementResult CreatePerfectJudgementResult();
+        protected abstract JudgementResult CreateNonPerfectJudgementResult();
+        protected abstract JudgementResult CreateMissJudgementResult();
+
         private GraphContainer graphs = null!;
         private SettingsSlider<int> sliderMaxCombo = null!;
         private SettingsCheckbox scaleToMax = null!;
@@ -152,8 +156,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Clear();
             legend.Clear();
 
-            runForProcessor("lazer-standardised", colours.Green1, new OsuScoreProcessor(), ScoringMode.Standardised, standardisedVisible);
-            runForProcessor("lazer-classic", colours.Blue1, new OsuScoreProcessor(), ScoringMode.Classic, classicVisible);
+            runForProcessor("lazer-standardised", colours.Green1, CreateScoreProcessor(), ScoringMode.Standardised, standardisedVisible);
+            runForProcessor("lazer-classic", colours.Blue1, CreateScoreProcessor(), ScoringMode.Classic, classicVisible);
 
             runScoreV1();
             runScoreV2();
@@ -274,20 +278,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         private void runForProcessor(string name, Color4 colour, ScoreProcessor processor, ScoringMode mode, BindableBool visibility)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
-
-            var beatmap = new OsuBeatmap();
-            for (int i = 0; i < maxCombo; i++)
-                beatmap.HitObjects.Add(new HitCircle());
-
+            var beatmap = CreateBeatmap(maxCombo);
             processor.ApplyBeatmap(beatmap);
 
             runForAlgorithm(new ScoringAlgorithm
             {
                 Name = name,
                 Colour = colour,
-                ApplyHit = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great }),
-                ApplyNonPerfect = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok }),
-                ApplyMiss = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss }),
+                ApplyHit = () => processor.ApplyResult(CreatePerfectJudgementResult()),
+                ApplyNonPerfect = () => processor.ApplyResult(CreateNonPerfectJudgementResult()),
+                ApplyMiss = () => processor.ApplyResult(CreateMissJudgementResult()),
                 GetTotalScore = () => processor.GetDisplayScore(mode),
                 Visible = visibility
             });
@@ -327,310 +327,310 @@ namespace osu.Game.Tests.Visual.Gameplay
                 AccentColour = scoringAlgorithm.Colour,
             });
         }
-    }
 
-    public class ScoringAlgorithm
-    {
-        public string Name { get; init; } = null!;
-        public Color4 Colour { get; init; }
-        public Action ApplyHit { get; init; } = () => { };
-        public Action ApplyNonPerfect { get; init; } = () => { };
-        public Action ApplyMiss { get; init; } = () => { };
-        public Func<long> GetTotalScore { get; init; } = null!;
-        public BindableBool Visible { get; init; } = null!;
-    }
-
-    public partial class GraphContainer : Container<LineGraph>, IHasCustomTooltip<IEnumerable<LineGraph>>
-    {
-        public readonly BindableList<double> MissLocations = new BindableList<double>();
-        public readonly BindableList<double> NonPerfectLocations = new BindableList<double>();
-
-        public Bindable<int> MaxCombo = new Bindable<int>();
-
-        protected override Container<LineGraph> Content { get; } = new Container<LineGraph> { RelativeSizeAxes = Axes.Both };
-
-        private readonly Box hoverLine;
-
-        private readonly Container missLines;
-        private readonly Container verticalGridLines;
-
-        public int CurrentHoverCombo { get; private set; }
-
-        public GraphContainer()
+        private class ScoringAlgorithm
         {
-            InternalChild = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = OsuColour.Gray(0.1f),
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    verticalGridLines = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    hoverLine = new Box
-                    {
-                        Colour = Color4.Yellow,
-                        RelativeSizeAxes = Axes.Y,
-                        Origin = Anchor.TopCentre,
-                        Alpha = 0,
-                        Width = 1,
-                    },
-                    missLines = new Container
-                    {
-                        Alpha = 0.6f,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    Content,
-                }
-            };
-
-            MissLocations.BindCollectionChanged((_, _) => updateMissLocations());
-            NonPerfectLocations.BindCollectionChanged((_, _) => updateMissLocations());
-
-            MaxCombo.BindValueChanged(_ =>
-            {
-                updateMissLocations();
-                updateVerticalGridLines();
-            }, true);
+            public string Name { get; init; } = null!;
+            public Color4 Colour { get; init; }
+            public Action ApplyHit { get; init; } = () => { };
+            public Action ApplyNonPerfect { get; init; } = () => { };
+            public Action ApplyMiss { get; init; } = () => { };
+            public Func<long> GetTotalScore { get; init; } = null!;
+            public BindableBool Visible { get; init; } = null!;
         }
 
-        private void updateVerticalGridLines()
+        public partial class GraphContainer : Container<LineGraph>, IHasCustomTooltip<IEnumerable<LineGraph>>
         {
-            verticalGridLines.Clear();
+            public readonly BindableList<double> MissLocations = new BindableList<double>();
+            public readonly BindableList<double> NonPerfectLocations = new BindableList<double>();
 
-            for (int i = 0; i < MaxCombo.Value; i++)
+            public Bindable<int> MaxCombo = new Bindable<int>();
+
+            protected override Container<LineGraph> Content { get; } = new Container<LineGraph> { RelativeSizeAxes = Axes.Both };
+
+            private readonly Box hoverLine;
+
+            private readonly Container missLines;
+            private readonly Container verticalGridLines;
+
+            public int CurrentHoverCombo { get; private set; }
+
+            public GraphContainer()
             {
-                if (i % 100 == 0)
+                InternalChild = new Container
                 {
-                    verticalGridLines.AddRange(new Drawable[]
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
                     {
                         new Box
                         {
-                            Colour = OsuColour.Gray(0.2f),
-                            Origin = Anchor.TopCentre,
-                            Width = 1,
-                            RelativeSizeAxes = Axes.Y,
-                            RelativePositionAxes = Axes.X,
-                            X = (float)i / MaxCombo.Value,
+                            Colour = OsuColour.Gray(0.1f),
+                            RelativeSizeAxes = Axes.Both,
                         },
-                        new OsuSpriteText
+                        verticalGridLines = new Container
                         {
-                            RelativePositionAxes = Axes.X,
-                            X = (float)i / MaxCombo.Value,
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            Text = $"{i:#,0}",
-                            Rotation = -30,
-                            Y = -20,
-                        }
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        hoverLine = new Box
+                        {
+                            Colour = Color4.Yellow,
+                            RelativeSizeAxes = Axes.Y,
+                            Origin = Anchor.TopCentre,
+                            Alpha = 0,
+                            Width = 1,
+                        },
+                        missLines = new Container
+                        {
+                            Alpha = 0.6f,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        Content,
+                    }
+                };
+
+                MissLocations.BindCollectionChanged((_, _) => updateMissLocations());
+                NonPerfectLocations.BindCollectionChanged((_, _) => updateMissLocations());
+
+                MaxCombo.BindValueChanged(_ =>
+                {
+                    updateMissLocations();
+                    updateVerticalGridLines();
+                }, true);
+            }
+
+            private void updateVerticalGridLines()
+            {
+                verticalGridLines.Clear();
+
+                for (int i = 0; i < MaxCombo.Value; i++)
+                {
+                    if (i % 100 == 0)
+                    {
+                        verticalGridLines.AddRange(new Drawable[]
+                        {
+                            new Box
+                            {
+                                Colour = OsuColour.Gray(0.2f),
+                                Origin = Anchor.TopCentre,
+                                Width = 1,
+                                RelativeSizeAxes = Axes.Y,
+                                RelativePositionAxes = Axes.X,
+                                X = (float)i / MaxCombo.Value,
+                            },
+                            new OsuSpriteText
+                            {
+                                RelativePositionAxes = Axes.X,
+                                X = (float)i / MaxCombo.Value,
+                                Anchor = Anchor.BottomLeft,
+                                Origin = Anchor.BottomLeft,
+                                Text = $"{i:#,0}",
+                                Rotation = -30,
+                                Y = -20,
+                            }
+                        });
+                    }
+                }
+            }
+
+            private void updateMissLocations()
+            {
+                missLines.Clear();
+
+                foreach (int miss in MissLocations)
+                {
+                    missLines.Add(new Box
+                    {
+                        Colour = Color4.Red,
+                        Origin = Anchor.TopCentre,
+                        Width = 1,
+                        RelativeSizeAxes = Axes.Y,
+                        RelativePositionAxes = Axes.X,
+                        X = (float)miss / MaxCombo.Value,
+                    });
+                }
+
+                foreach (int miss in NonPerfectLocations)
+                {
+                    missLines.Add(new Box
+                    {
+                        Colour = Color4.Orange,
+                        Origin = Anchor.TopCentre,
+                        Width = 1,
+                        RelativeSizeAxes = Axes.Y,
+                        RelativePositionAxes = Axes.X,
+                        X = (float)miss / MaxCombo.Value,
                     });
                 }
             }
-        }
 
-        private void updateMissLocations()
-        {
-            missLines.Clear();
-
-            foreach (int miss in MissLocations)
+            protected override bool OnHover(HoverEvent e)
             {
-                missLines.Add(new Box
-                {
-                    Colour = Color4.Red,
-                    Origin = Anchor.TopCentre,
-                    Width = 1,
-                    RelativeSizeAxes = Axes.Y,
-                    RelativePositionAxes = Axes.X,
-                    X = (float)miss / MaxCombo.Value,
-                });
+                hoverLine.Show();
+                return base.OnHover(e);
             }
 
-            foreach (int miss in NonPerfectLocations)
+            protected override void OnHoverLost(HoverLostEvent e)
             {
-                missLines.Add(new Box
-                {
-                    Colour = Color4.Orange,
-                    Origin = Anchor.TopCentre,
-                    Width = 1,
-                    RelativeSizeAxes = Axes.Y,
-                    RelativePositionAxes = Axes.X,
-                    X = (float)miss / MaxCombo.Value,
-                });
+                hoverLine.Hide();
+                base.OnHoverLost(e);
             }
-        }
 
-        protected override bool OnHover(HoverEvent e)
-        {
-            hoverLine.Show();
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            hoverLine.Hide();
-            base.OnHoverLost(e);
-        }
-
-        protected override bool OnMouseMove(MouseMoveEvent e)
-        {
-            CurrentHoverCombo = (int)(e.MousePosition.X / DrawWidth * MaxCombo.Value);
-
-            hoverLine.X = e.MousePosition.X;
-            return base.OnMouseMove(e);
-        }
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            if (e.Button == MouseButton.Left)
-                MissLocations.Add(CurrentHoverCombo);
-            else
-                NonPerfectLocations.Add(CurrentHoverCombo);
-
-            return true;
-        }
-
-        private GraphTooltip? tooltip;
-
-        public ITooltip<IEnumerable<LineGraph>> GetCustomTooltip() => tooltip ??= new GraphTooltip(this);
-
-        public IEnumerable<LineGraph> TooltipContent => Content;
-
-        public partial class GraphTooltip : CompositeDrawable, ITooltip<IEnumerable<LineGraph>>
-        {
-            private readonly GraphContainer graphContainer;
-
-            private readonly OsuTextFlowContainer textFlow;
-
-            public GraphTooltip(GraphContainer graphContainer)
+            protected override bool OnMouseMove(MouseMoveEvent e)
             {
-                this.graphContainer = graphContainer;
-                AutoSizeAxes = Axes.Both;
+                CurrentHoverCombo = (int)(e.MousePosition.X / DrawWidth * MaxCombo.Value);
 
-                Masking = true;
-                CornerRadius = 10;
+                hoverLine.X = e.MousePosition.X;
+                return base.OnMouseMove(e);
+            }
 
-                InternalChildren = new Drawable[]
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                if (e.Button == MouseButton.Left)
+                    MissLocations.Add(CurrentHoverCombo);
+                else
+                    NonPerfectLocations.Add(CurrentHoverCombo);
+
+                return true;
+            }
+
+            private GraphTooltip? tooltip;
+
+            public ITooltip<IEnumerable<LineGraph>> GetCustomTooltip() => tooltip ??= new GraphTooltip(this);
+
+            public IEnumerable<LineGraph> TooltipContent => Content;
+
+            public partial class GraphTooltip : CompositeDrawable, ITooltip<IEnumerable<LineGraph>>
+            {
+                private readonly GraphContainer graphContainer;
+
+                private readonly OsuTextFlowContainer textFlow;
+
+                public GraphTooltip(GraphContainer graphContainer)
                 {
-                    new Box
+                    this.graphContainer = graphContainer;
+                    AutoSizeAxes = Axes.Both;
+
+                    Masking = true;
+                    CornerRadius = 10;
+
+                    InternalChildren = new Drawable[]
                     {
-                        Colour = OsuColour.Gray(0.15f),
-                        RelativeSizeAxes = Axes.Both,
+                        new Box
+                        {
+                            Colour = OsuColour.Gray(0.15f),
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        textFlow = new OsuTextFlowContainer
+                        {
+                            Colour = Color4.White,
+                            AutoSizeAxes = Axes.Both,
+                            Padding = new MarginPadding(10),
+                        }
+                    };
+                }
+
+                private int? lastContentCombo;
+
+                public void SetContent(IEnumerable<LineGraph> content)
+                {
+                    int relevantCombo = graphContainer.CurrentHoverCombo;
+
+                    if (lastContentCombo == relevantCombo)
+                        return;
+
+                    lastContentCombo = relevantCombo;
+                    textFlow.Clear();
+
+                    textFlow.AddParagraph($"At combo {relevantCombo}:");
+
+                    foreach (var graph in content)
+                    {
+                        if (graph.Alpha == 0) continue;
+
+                        float valueAtHover = graph.Values.ElementAt(relevantCombo);
+                        float ofTotal = valueAtHover / graph.Values.Last();
+
+                        textFlow.AddParagraph($"{graph.Name}: {valueAtHover:#,0} ({ofTotal * 100:N0}% of final)\n", st => st.Colour = graph.LineColour);
+                    }
+                }
+
+                public void Move(Vector2 pos) => this.MoveTo(pos);
+            }
+        }
+
+        private partial class LegendEntry : OsuClickableContainer, IHasAccentColour
+        {
+            public Color4 AccentColour { get; set; }
+
+            public BindableBool Visible { get; } = new BindableBool(true);
+
+            public readonly long FinalScore;
+
+            private readonly string description;
+            private readonly LineGraph lineGraph;
+
+            private OsuSpriteText descriptionText = null!;
+            private OsuSpriteText finalScoreText = null!;
+
+            public LegendEntry(ScoringAlgorithm scoringAlgorithm, LineGraph lineGraph)
+            {
+                description = scoringAlgorithm.Name;
+                FinalScore = scoringAlgorithm.GetTotalScore();
+                AccentColour = scoringAlgorithm.Colour;
+                Visible.BindTo(scoringAlgorithm.Visible);
+
+                this.lineGraph = lineGraph;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RelativeSizeAxes = Content.RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Content.AutoSizeAxes = Axes.Y;
+
+                Children = new Drawable[]
+                {
+                    descriptionText = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
                     },
-                    textFlow = new OsuTextFlowContainer
+                    finalScoreText = new OsuSpriteText
                     {
-                        Colour = Color4.White,
-                        AutoSizeAxes = Axes.Both,
-                        Padding = new MarginPadding(10),
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Font = OsuFont.Default.With(fixedWidth: true)
                     }
                 };
             }
 
-            private int? lastContentCombo;
-
-            public void SetContent(IEnumerable<LineGraph> content)
+            protected override void LoadComplete()
             {
-                int relevantCombo = graphContainer.CurrentHoverCombo;
-
-                if (lastContentCombo == relevantCombo)
-                    return;
-
-                lastContentCombo = relevantCombo;
-                textFlow.Clear();
-
-                textFlow.AddParagraph($"At combo {relevantCombo}:");
-
-                foreach (var graph in content)
-                {
-                    if (graph.Alpha == 0) continue;
-
-                    float valueAtHover = graph.Values.ElementAt(relevantCombo);
-                    float ofTotal = valueAtHover / graph.Values.Last();
-
-                    textFlow.AddParagraph($"{graph.Name}: {valueAtHover:#,0} ({ofTotal * 100:N0}% of final)\n", st => st.Colour = graph.LineColour);
-                }
+                base.LoadComplete();
+                Visible.BindValueChanged(_ => updateState(), true);
+                Action = Visible.Toggle;
             }
 
-            public void Move(Vector2 pos) => this.MoveTo(pos);
-        }
-    }
-
-    public partial class LegendEntry : OsuClickableContainer, IHasAccentColour
-    {
-        public Color4 AccentColour { get; set; }
-
-        public BindableBool Visible { get; } = new BindableBool(true);
-
-        public readonly long FinalScore;
-
-        private readonly string description;
-        private readonly LineGraph lineGraph;
-
-        private OsuSpriteText descriptionText = null!;
-        private OsuSpriteText finalScoreText = null!;
-
-        public LegendEntry(ScoringAlgorithm scoringAlgorithm, LineGraph lineGraph)
-        {
-            description = scoringAlgorithm.Name;
-            FinalScore = scoringAlgorithm.GetTotalScore();
-            AccentColour = scoringAlgorithm.Colour;
-            Visible.BindTo(scoringAlgorithm.Visible);
-
-            this.lineGraph = lineGraph;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            RelativeSizeAxes = Content.RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Content.AutoSizeAxes = Axes.Y;
-
-            Children = new Drawable[]
+            protected override bool OnHover(HoverEvent e)
             {
-                descriptionText = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                },
-                finalScoreText = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Font = OsuFont.Default.With(fixedWidth: true)
-                }
-            };
-        }
+                updateState();
+                return true;
+            }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            Visible.BindValueChanged(_ => updateState(), true);
-            Action = Visible.Toggle;
-        }
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateState();
+                base.OnHoverLost(e);
+            }
 
-        protected override bool OnHover(HoverEvent e)
-        {
-            updateState();
-            return true;
-        }
+            private void updateState()
+            {
+                Colour = IsHovered ? AccentColour.Lighten(0.2f) : AccentColour;
 
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            updateState();
-            base.OnHoverLost(e);
-        }
-
-        private void updateState()
-        {
-            Colour = IsHovered ? AccentColour.Lighten(0.2f) : AccentColour;
-
-            descriptionText.Text = $"{(Visible.Value ? FontAwesome.Solid.CheckCircle.Icon : FontAwesome.Solid.Circle.Icon)} {description}";
-            finalScoreText.Text = FinalScore.ToString("#,0");
-            lineGraph.Alpha = Visible.Value ? 1 : 0;
+                descriptionText.Text = $"{(Visible.Value ? FontAwesome.Solid.CheckCircle.Icon : FontAwesome.Solid.Circle.Icon)} {description}";
+                finalScoreText.Text = FinalScore.ToString("#,0");
+                lineGraph.Alpha = Visible.Value ? 1 : 0;
+            }
         }
     }
 }

From 27b6bc3062cc7e531677e914ffd762671089555a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 14:35:07 +0200
Subject: [PATCH 1429/2100] Add skeleton of catch scoring test

---
 .../TestSceneScoring.cs                       | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
new file mode 100644
index 0000000000..7330e40568
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
@@ -0,0 +1,91 @@
+// Copyright (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.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Beatmaps;
+using osu.Game.Rulesets.Catch.Judgements;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Scoring;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual.Gameplay;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public partial class TestSceneScoring : ScoringTestScene
+    {
+        protected override IBeatmap CreateBeatmap(int maxCombo)
+        {
+            var beatmap = new CatchBeatmap();
+            for (int i = 0; i < maxCombo; ++i)
+                beatmap.HitObjects.Add(new Fruit());
+            return beatmap;
+        }
+
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1();
+
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new CatchProcessorBasedScoringAlgorithm(beatmap, mode);
+
+        private class ScoreV1 : IScoringAlgorithm
+        {
+            public void ApplyHit()
+            {
+            }
+
+            public void ApplyNonPerfect()
+            {
+            }
+
+            public void ApplyMiss()
+            {
+            }
+
+            public long TotalScore => 0;
+        }
+
+        private class ScoreV2 : IScoringAlgorithm
+        {
+            private readonly int maxCombo;
+
+            public ScoreV2(int maxCombo)
+            {
+                this.maxCombo = maxCombo;
+            }
+
+            public void ApplyHit()
+            {
+            }
+
+            public void ApplyNonPerfect()
+            {
+            }
+
+            public void ApplyMiss()
+            {
+            }
+
+            public long TotalScore => 0;
+        }
+
+        private class CatchProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
+        {
+            public CatchProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+                : base(beatmap, mode)
+            {
+            }
+
+            protected override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor();
+
+            protected override JudgementResult CreatePerfectJudgementResult() => new CatchJudgementResult(new Fruit(), new CatchJudgement()) { Type = HitResult.Great };
+
+            protected override JudgementResult CreateNonPerfectJudgementResult() => throw new NotSupportedException("catch does not have \"non-perfect\" judgements.");
+
+            protected override JudgementResult CreateMissJudgementResult() => new CatchJudgementResult(new Fruit(), new CatchJudgement()) { Type = HitResult.Miss };
+        }
+    }
+}

From 0c22ff2a8093efe5754f060dbab424af81571c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 10:13:53 +0200
Subject: [PATCH 1430/2100] Refactor further to allow extensibility to other
 rulesets

---
 .../TestSceneScoring.cs                       | 118 +++++++++-
 .../Tests/Visual/Gameplay/ScoringTestScene.cs | 207 +++++++-----------
 2 files changed, 187 insertions(+), 138 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
index 5dbfc8d3a1..36485b93ab 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.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.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
@@ -16,8 +17,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public partial class TestSceneScoring : ScoringTestScene
     {
-        protected override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
-
         protected override IBeatmap CreateBeatmap(int maxCombo)
         {
             var beatmap = new OsuBeatmap();
@@ -26,8 +25,117 @@ namespace osu.Game.Rulesets.Osu.Tests
             return beatmap;
         }
 
-        protected override JudgementResult CreatePerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great };
-        protected override JudgementResult CreateNonPerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok };
-        protected override JudgementResult CreateMissJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss };
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1();
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new OsuProcessorBasedScoringAlgorithm(beatmap, mode);
+
+        private const int base_great = 300;
+        private const int base_ok = 100;
+
+        private class ScoreV1 : IScoringAlgorithm
+        {
+            private int currentCombo;
+
+            // this corresponds to stable's `ScoreMultiplier`.
+            // value is chosen arbitrarily, towards the upper range.
+            private const float score_multiplier = 4;
+
+            public void ApplyHit() => applyHitV1(base_great);
+            public void ApplyNonPerfect() => applyHitV1(base_ok);
+            public void ApplyMiss() => applyHitV1(0);
+
+            private void applyHitV1(int baseScore)
+            {
+                if (baseScore == 0)
+                {
+                    currentCombo = 0;
+                    return;
+                }
+
+                TotalScore += baseScore;
+
+                // combo multiplier
+                // ReSharper disable once PossibleLossOfFraction
+                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * score_multiplier));
+
+                currentCombo++;
+            }
+
+            public long TotalScore { get; private set; }
+        }
+
+        private class ScoreV2 : IScoringAlgorithm
+        {
+            private int currentCombo;
+            private double comboPortion;
+            private double currentBaseScore;
+            private double maxBaseScore;
+            private int currentHits;
+
+            private readonly double comboPortionMax;
+            private readonly int maxCombo;
+
+            public ScoreV2(int maxCombo)
+            {
+                this.maxCombo = maxCombo;
+
+                for (int i = 0; i < this.maxCombo; i++)
+                    ApplyHit();
+
+                comboPortionMax = comboPortion;
+
+                currentCombo = 0;
+                comboPortion = 0;
+                currentBaseScore = 0;
+                maxBaseScore = 0;
+                currentHits = 0;
+            }
+
+            public void ApplyHit() => applyHitV2(base_great);
+            public void ApplyNonPerfect() => applyHitV2(base_ok);
+
+            private void applyHitV2(int baseScore)
+            {
+                maxBaseScore += base_great;
+                currentBaseScore += baseScore;
+                comboPortion += baseScore * (1 + ++currentCombo / 10.0);
+
+                currentHits++;
+            }
+
+            public void ApplyMiss()
+            {
+                currentHits++;
+                maxBaseScore += base_great;
+                currentCombo = 0;
+            }
+
+            public long TotalScore
+            {
+                get
+                {
+                    double accuracy = currentBaseScore / maxBaseScore;
+
+                    return (int)Math.Round
+                    (
+                        700000 * comboPortion / comboPortionMax +
+                        300000 * Math.Pow(accuracy, 10) * ((double)currentHits / maxCombo)
+                    );
+                }
+            }
+        }
+
+        private class OsuProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
+        {
+            public OsuProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+                : base(beatmap, mode)
+            {
+            }
+
+            protected override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
+            protected override JudgementResult CreatePerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great };
+            protected override JudgementResult CreateNonPerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok };
+            protected override JudgementResult CreateMissJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss };
+        }
     }
 }
diff --git a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index ecf55419a2..331f1bb9aa 100644
--- a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.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 NUnit.Framework;
@@ -31,11 +30,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public abstract partial class ScoringTestScene : OsuTestScene
     {
-        protected abstract ScoreProcessor CreateScoreProcessor();
         protected abstract IBeatmap CreateBeatmap(int maxCombo);
-        protected abstract JudgementResult CreatePerfectJudgementResult();
-        protected abstract JudgementResult CreateNonPerfectJudgementResult();
-        protected abstract JudgementResult CreateMissJudgementResult();
+
+        protected abstract IScoringAlgorithm CreateScoreV1();
+        protected abstract IScoringAlgorithm CreateScoreV2(int maxCombo);
+        protected abstract ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode);
 
         private GraphContainer graphs = null!;
         private SettingsSlider<int> sliderMaxCombo = null!;
@@ -121,7 +120,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
-                                            Text = $"Left click to add miss\nRight click to add OK/{base_ok}",
+                                            Text = "Left click to add miss\nRight click to add OK",
                                             Margin = new MarginPadding { Top = 20 }
                                         }
                                     }
@@ -148,19 +147,28 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
-        private const int base_great = 300;
-        private const int base_ok = 100;
-
         private void rerun()
         {
             graphs.Clear();
             legend.Clear();
 
-            runForProcessor("lazer-standardised", colours.Green1, CreateScoreProcessor(), ScoringMode.Standardised, standardisedVisible);
-            runForProcessor("lazer-classic", colours.Blue1, CreateScoreProcessor(), ScoringMode.Classic, classicVisible);
+            runForProcessor("lazer-standardised", colours.Green1, ScoringMode.Standardised, standardisedVisible);
+            runForProcessor("lazer-classic", colours.Blue1, ScoringMode.Classic, classicVisible);
 
-            runScoreV1();
-            runScoreV2();
+            runForAlgorithm(new ScoringAlgorithmInfo
+            {
+                Name = "ScoreV1 (classic)",
+                Colour = colours.Purple1,
+                Algorithm = CreateScoreV1(),
+                Visible = scoreV1Visible
+            });
+            runForAlgorithm(new ScoringAlgorithmInfo
+            {
+                Name = "ScoreV2",
+                Colour = colours.Red1,
+                Algorithm = CreateScoreV2(sliderMaxCombo.Current.Value),
+                Visible = scoreV2Visible
+            });
 
             rescalePlots();
         }
@@ -181,119 +189,22 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        private void runScoreV1()
-        {
-            int totalScore = 0;
-            int currentCombo = 0;
-
-            void applyHitV1(int baseScore)
-            {
-                if (baseScore == 0)
-                {
-                    currentCombo = 0;
-                    return;
-                }
-
-                // this corresponds to stable's `ScoreMultiplier`.
-                // value is chosen arbitrarily, towards the upper range.
-                const float score_multiplier = 4;
-
-                totalScore += baseScore;
-
-                // combo multiplier
-                // ReSharper disable once PossibleLossOfFraction
-                totalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * score_multiplier));
-
-                currentCombo++;
-            }
-
-            runForAlgorithm(new ScoringAlgorithm
-            {
-                Name = "ScoreV1 (classic)",
-                Colour = colours.Purple1,
-                ApplyHit = () => applyHitV1(base_great),
-                ApplyNonPerfect = () => applyHitV1(base_ok),
-                ApplyMiss = () => applyHitV1(0),
-                GetTotalScore = () => totalScore,
-                Visible = scoreV1Visible
-            });
-        }
-
-        private void runScoreV2()
-        {
-            int maxCombo = sliderMaxCombo.Current.Value;
-
-            int currentCombo = 0;
-            double comboPortion = 0;
-            double currentBaseScore = 0;
-            double maxBaseScore = 0;
-            int currentHits = 0;
-
-            for (int i = 0; i < maxCombo; i++)
-                applyHitV2(base_great);
-
-            double comboPortionMax = comboPortion;
-
-            currentCombo = 0;
-            comboPortion = 0;
-            currentBaseScore = 0;
-            maxBaseScore = 0;
-            currentHits = 0;
-
-            void applyHitV2(int baseScore)
-            {
-                maxBaseScore += base_great;
-                currentBaseScore += baseScore;
-                comboPortion += baseScore * (1 + ++currentCombo / 10.0);
-
-                currentHits++;
-            }
-
-            runForAlgorithm(new ScoringAlgorithm
-            {
-                Name = "ScoreV2",
-                Colour = colours.Red1,
-                ApplyHit = () => applyHitV2(base_great),
-                ApplyNonPerfect = () => applyHitV2(base_ok),
-                ApplyMiss = () =>
-                {
-                    currentHits++;
-                    maxBaseScore += base_great;
-                    currentCombo = 0;
-                },
-                GetTotalScore = () =>
-                {
-                    double accuracy = currentBaseScore / maxBaseScore;
-
-                    return (int)Math.Round
-                    (
-                        700000 * comboPortion / comboPortionMax +
-                        300000 * Math.Pow(accuracy, 10) * ((double)currentHits / maxCombo)
-                    );
-                },
-                Visible = scoreV2Visible
-            });
-        }
-
-        private void runForProcessor(string name, Color4 colour, ScoreProcessor processor, ScoringMode mode, BindableBool visibility)
+        private void runForProcessor(string name, Color4 colour, ScoringMode scoringMode, BindableBool visibility)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
             var beatmap = CreateBeatmap(maxCombo);
-            processor.ApplyBeatmap(beatmap);
+            var algorithm = CreateScoreAlgorithm(beatmap, scoringMode);
 
-            runForAlgorithm(new ScoringAlgorithm
+            runForAlgorithm(new ScoringAlgorithmInfo
             {
                 Name = name,
                 Colour = colour,
-                ApplyHit = () => processor.ApplyResult(CreatePerfectJudgementResult()),
-                ApplyNonPerfect = () => processor.ApplyResult(CreateNonPerfectJudgementResult()),
-                ApplyMiss = () => processor.ApplyResult(CreateMissJudgementResult()),
-                GetTotalScore = () => processor.GetDisplayScore(mode),
+                Algorithm = algorithm,
                 Visible = visibility
             });
         }
 
-        private void runForAlgorithm(ScoringAlgorithm scoringAlgorithm)
+        private void runForAlgorithm(ScoringAlgorithmInfo algorithmInfo)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
 
@@ -302,43 +213,73 @@ namespace osu.Game.Tests.Visual.Gameplay
             for (int i = 0; i < maxCombo; i++)
             {
                 if (graphs.MissLocations.Contains(i))
-                    scoringAlgorithm.ApplyMiss();
+                    algorithmInfo.Algorithm.ApplyMiss();
                 else if (graphs.NonPerfectLocations.Contains(i))
-                    scoringAlgorithm.ApplyNonPerfect();
+                    algorithmInfo.Algorithm.ApplyNonPerfect();
                 else
-                    scoringAlgorithm.ApplyHit();
+                    algorithmInfo.Algorithm.ApplyHit();
 
-                results.Add(scoringAlgorithm.GetTotalScore());
+                results.Add(algorithmInfo.Algorithm.TotalScore);
             }
 
             LineGraph graph;
             graphs.Add(graph = new LineGraph
             {
-                Name = scoringAlgorithm.Name,
+                Name = algorithmInfo.Name,
                 Anchor = Anchor.BottomLeft,
                 Origin = Anchor.BottomLeft,
                 RelativeSizeAxes = Axes.Both,
-                LineColour = scoringAlgorithm.Colour,
+                LineColour = algorithmInfo.Colour,
                 Values = results
             });
 
-            legend.Add(new LegendEntry(scoringAlgorithm, graph)
+            legend.Add(new LegendEntry(algorithmInfo, graph)
             {
-                AccentColour = scoringAlgorithm.Colour,
+                AccentColour = algorithmInfo.Colour,
             });
         }
 
-        private class ScoringAlgorithm
+        private class ScoringAlgorithmInfo
         {
             public string Name { get; init; } = null!;
             public Color4 Colour { get; init; }
-            public Action ApplyHit { get; init; } = () => { };
-            public Action ApplyNonPerfect { get; init; } = () => { };
-            public Action ApplyMiss { get; init; } = () => { };
-            public Func<long> GetTotalScore { get; init; } = null!;
+            public IScoringAlgorithm Algorithm { get; init; } = null!;
             public BindableBool Visible { get; init; } = null!;
         }
 
+        protected interface IScoringAlgorithm
+        {
+            void ApplyHit();
+            void ApplyNonPerfect();
+            void ApplyMiss();
+
+            long TotalScore { get; }
+        }
+
+        protected abstract class ProcessorBasedScoringAlgorithm : IScoringAlgorithm
+        {
+            protected abstract ScoreProcessor CreateScoreProcessor();
+            protected abstract JudgementResult CreatePerfectJudgementResult();
+            protected abstract JudgementResult CreateNonPerfectJudgementResult();
+            protected abstract JudgementResult CreateMissJudgementResult();
+
+            private readonly ScoreProcessor scoreProcessor;
+            private readonly ScoringMode mode;
+
+            protected ProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+            {
+                this.mode = mode;
+                scoreProcessor = CreateScoreProcessor();
+                scoreProcessor.ApplyBeatmap(beatmap);
+            }
+
+            public void ApplyHit() => scoreProcessor.ApplyResult(CreatePerfectJudgementResult());
+            public void ApplyNonPerfect() => scoreProcessor.ApplyResult(CreateNonPerfectJudgementResult());
+            public void ApplyMiss() => scoreProcessor.ApplyResult(CreateMissJudgementResult());
+
+            public long TotalScore => scoreProcessor.GetDisplayScore(mode);
+        }
+
         public partial class GraphContainer : Container<LineGraph>, IHasCustomTooltip<IEnumerable<LineGraph>>
         {
             public readonly BindableList<double> MissLocations = new BindableList<double>();
@@ -572,12 +513,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             private OsuSpriteText descriptionText = null!;
             private OsuSpriteText finalScoreText = null!;
 
-            public LegendEntry(ScoringAlgorithm scoringAlgorithm, LineGraph lineGraph)
+            public LegendEntry(ScoringAlgorithmInfo scoringAlgorithmInfo, LineGraph lineGraph)
             {
-                description = scoringAlgorithm.Name;
-                FinalScore = scoringAlgorithm.GetTotalScore();
-                AccentColour = scoringAlgorithm.Colour;
-                Visible.BindTo(scoringAlgorithm.Visible);
+                description = scoringAlgorithmInfo.Name;
+                FinalScore = scoringAlgorithmInfo.Algorithm.TotalScore;
+                AccentColour = scoringAlgorithmInfo.Colour;
+                Visible.BindTo(scoringAlgorithmInfo.Visible);
 
                 this.lineGraph = lineGraph;
             }

From 5eccc771c2f3a7b26536366f3766e7f1246ff73c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 14:40:24 +0200
Subject: [PATCH 1431/2100] Turn off non-perfect judgements for catch scoring
 test scene

---
 .../TestSceneScoring.cs                       |  5 ++++
 .../Tests/Visual/Gameplay/ScoringTestScene.cs | 25 +++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
index 7330e40568..44823607b8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
@@ -17,6 +17,11 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public partial class TestSceneScoring : ScoringTestScene
     {
+        public TestSceneScoring()
+            : base(supportsNonPerfectJudgements: false)
+        {
+        }
+
         protected override IBeatmap CreateBeatmap(int maxCombo)
         {
             var beatmap = new CatchBeatmap();
diff --git a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index c213a17185..de4688a6fe 100644
--- a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected BindableList<double> NonPerfectLocations => graphs.NonPerfectLocations;
         protected BindableList<double> MissLocations => graphs.MissLocations;
 
+        private readonly bool supportsNonPerfectJudgements;
+
         private GraphContainer graphs = null!;
         private SettingsSlider<int> sliderMaxCombo = null!;
         private SettingsCheckbox scaleToMax = null!;
@@ -54,11 +56,18 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
+        protected ScoringTestScene(bool supportsNonPerfectJudgements = true)
+        {
+            this.supportsNonPerfectJudgements = supportsNonPerfectJudgements;
+        }
+
         [SetUpSteps]
         public void SetUpSteps()
         {
             AddStep("setup tests", () =>
             {
+                OsuTextFlowContainer clickExplainer;
+
                 Children = new Drawable[]
                 {
                     new Box
@@ -79,7 +88,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         {
                             new Drawable[]
                             {
-                                graphs = new GraphContainer
+                                graphs = new GraphContainer(supportsNonPerfectJudgements)
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                 },
@@ -120,11 +129,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                                             LabelText = "Rescale plots to 100%",
                                             Current = { Value = true, Default = true }
                                         },
-                                        new OsuTextFlowContainer
+                                        clickExplainer = new OsuTextFlowContainer
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
-                                            Text = "Left click to add miss\nRight click to add OK",
                                             Margin = new MarginPadding { Top = 20 }
                                         }
                                     }
@@ -134,6 +142,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                 };
 
+                clickExplainer.AddParagraph("Left click to add miss");
+                if (supportsNonPerfectJudgements)
+                    clickExplainer.AddParagraph("Right click to add OK");
+
                 sliderMaxCombo.Current.BindValueChanged(_ => Rerun());
                 scaleToMax.Current.BindValueChanged(_ => Rerun());
 
@@ -286,6 +298,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public partial class GraphContainer : Container<LineGraph>, IHasCustomTooltip<IEnumerable<LineGraph>>
         {
+            private readonly bool supportsNonPerfectJudgements;
+
             public readonly BindableList<double> MissLocations = new BindableList<double>();
             public readonly BindableList<double> NonPerfectLocations = new BindableList<double>();
 
@@ -300,8 +314,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public int CurrentHoverCombo { get; private set; }
 
-            public GraphContainer()
+            public GraphContainer(bool supportsNonPerfectJudgements)
             {
+                this.supportsNonPerfectJudgements = supportsNonPerfectJudgements;
                 InternalChild = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -432,7 +447,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 if (e.Button == MouseButton.Left)
                     MissLocations.Add(CurrentHoverCombo);
-                else
+                else if (supportsNonPerfectJudgements)
                     NonPerfectLocations.Add(CurrentHoverCombo);
 
                 return true;

From ebdc501e5b6f3dbea0af959ca4fdbb96e3b3ba13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 14:19:49 +0200
Subject: [PATCH 1432/2100] Add example scenarios and configurable score
 multiplier

---
 .../TestSceneScoring.cs                       | 45 ++++++++++++++++---
 .../Tests/Visual/Gameplay/ScoringTestScene.cs | 22 +++++----
 2 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
index 36485b93ab..bb09328ab7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
@@ -3,6 +3,7 @@
 
 using System;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Beatmaps;
@@ -17,6 +18,12 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public partial class TestSceneScoring : ScoringTestScene
     {
+        private Bindable<double> scoreMultiplier { get; } = new BindableDouble
+        {
+            Default = 4,
+            Value = 4
+        };
+
         protected override IBeatmap CreateBeatmap(int maxCombo)
         {
             var beatmap = new OsuBeatmap();
@@ -25,10 +32,40 @@ namespace osu.Game.Rulesets.Osu.Tests
             return beatmap;
         }
 
-        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1();
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
         protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
         protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new OsuProcessorBasedScoringAlgorithm(beatmap, mode);
 
+        [Test]
+        public void TestBasicScenarios()
+        {
+            AddStep("set up score multiplier", () =>
+            {
+                scoreMultiplier.BindValueChanged(_ => Rerun());
+            });
+            AddStep("set max combo to 100", () => MaxCombo.Value = 100);
+            AddStep("set perfect score", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+            });
+            AddStep("set score with misses", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddStep("set score with misses and OKs", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+
+                NonPerfectLocations.AddRange(new[] { 9d, 19, 29, 39, 59, 69, 79, 89, 99 });
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddSliderStep("adjust score multiplier", 0, 10, (int)scoreMultiplier.Default, multiplier => scoreMultiplier.Value = multiplier);
+        }
+
         private const int base_great = 300;
         private const int base_ok = 100;
 
@@ -36,9 +73,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             private int currentCombo;
 
-            // this corresponds to stable's `ScoreMultiplier`.
-            // value is chosen arbitrarily, towards the upper range.
-            private const float score_multiplier = 4;
+            public BindableDouble ScoreMultiplier { get; } = new BindableDouble();
 
             public void ApplyHit() => applyHitV1(base_great);
             public void ApplyNonPerfect() => applyHitV1(base_ok);
@@ -56,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 // combo multiplier
                 // ReSharper disable once PossibleLossOfFraction
-                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * score_multiplier));
+                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * ScoreMultiplier.Value));
 
                 currentCombo++;
             }
diff --git a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index 331f1bb9aa..c213a17185 100644
--- a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -13,6 +12,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -36,6 +36,10 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected abstract IScoringAlgorithm CreateScoreV2(int maxCombo);
         protected abstract ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode);
 
+        protected Bindable<int> MaxCombo => sliderMaxCombo.Current;
+        protected BindableList<double> NonPerfectLocations => graphs.NonPerfectLocations;
+        protected BindableList<double> MissLocations => graphs.MissLocations;
+
         private GraphContainer graphs = null!;
         private SettingsSlider<int> sliderMaxCombo = null!;
         private SettingsCheckbox scaleToMax = null!;
@@ -50,8 +54,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
-        [Test]
-        public void TestBasic()
+        [SetUpSteps]
+        public void SetUpSteps()
         {
             AddStep("setup tests", () =>
             {
@@ -130,24 +134,24 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                 };
 
-                sliderMaxCombo.Current.BindValueChanged(_ => rerun());
-                scaleToMax.Current.BindValueChanged(_ => rerun());
+                sliderMaxCombo.Current.BindValueChanged(_ => Rerun());
+                scaleToMax.Current.BindValueChanged(_ => Rerun());
 
                 standardisedVisible.BindValueChanged(_ => rescalePlots());
                 classicVisible.BindValueChanged(_ => rescalePlots());
                 scoreV1Visible.BindValueChanged(_ => rescalePlots());
                 scoreV2Visible.BindValueChanged(_ => rescalePlots());
 
-                graphs.MissLocations.BindCollectionChanged((_, __) => rerun());
-                graphs.NonPerfectLocations.BindCollectionChanged((_, __) => rerun());
+                graphs.MissLocations.BindCollectionChanged((_, __) => Rerun());
+                graphs.NonPerfectLocations.BindCollectionChanged((_, __) => Rerun());
 
                 graphs.MaxCombo.BindTo(sliderMaxCombo.Current);
 
-                rerun();
+                Rerun();
             });
         }
 
-        private void rerun()
+        protected void Rerun()
         {
             graphs.Clear();
             legend.Clear();

From c6445a327b1fa76d40b5629a8fa72f7abf9c8836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 13:14:01 +0200
Subject: [PATCH 1433/2100] Add taiko scoring test scene

---
 .../TestSceneScoring.cs                       | 185 ++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs
new file mode 100644
index 0000000000..e065070822
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs
@@ -0,0 +1,185 @@
+// Copyright (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.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Beatmaps;
+using osu.Game.Rulesets.Taiko.Judgements;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Scoring;
+using osu.Game.Tests.Visual.Gameplay;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    [TestFixture]
+    public partial class TestSceneScoring : ScoringTestScene
+    {
+        private Bindable<double> scoreMultiplier { get; } = new BindableDouble
+        {
+            Default = 4,
+            Value = 4
+        };
+
+        protected override IBeatmap CreateBeatmap(int maxCombo)
+        {
+            var beatmap = new TaikoBeatmap();
+            for (int i = 0; i < maxCombo; ++i)
+                beatmap.HitObjects.Add(new Hit());
+            return beatmap;
+        }
+
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new TaikoProcessorBasedScoringAlgorithm(beatmap, mode);
+
+        [Test]
+        public void TestBasicScenarios()
+        {
+            AddStep("set up score multiplier", () =>
+            {
+                scoreMultiplier.BindValueChanged(_ => Rerun());
+            });
+            AddStep("set max combo to 100", () => MaxCombo.Value = 100);
+            AddStep("set perfect score", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+            });
+            AddStep("set score with misses", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddStep("set score with misses and OKs", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+
+                NonPerfectLocations.AddRange(new[] { 9d, 19, 29, 39, 59, 69, 79, 89, 99 });
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddSliderStep("adjust score multiplier", 0, 10, (int)scoreMultiplier.Default, multiplier => scoreMultiplier.Value = multiplier);
+        }
+
+        private const int base_great = 300;
+        private const int base_ok = 150;
+
+        private class ScoreV1 : IScoringAlgorithm
+        {
+            private int currentCombo;
+
+            public BindableDouble ScoreMultiplier { get; } = new BindableDouble();
+
+            public void ApplyHit() => applyHitV1(base_great);
+
+            public void ApplyNonPerfect() => applyHitV1(base_ok);
+
+            public void ApplyMiss() => applyHitV1(0);
+
+            private void applyHitV1(int baseScore)
+            {
+                if (baseScore == 0)
+                {
+                    currentCombo = 0;
+                    return;
+                }
+
+                TotalScore += baseScore;
+
+                // combo multiplier
+                // ReSharper disable once PossibleLossOfFraction
+                TotalScore += (int)((baseScore / 35) * 2 * (ScoreMultiplier.Value + 1)) * (Math.Min(100, currentCombo) / 10);
+
+                currentCombo++;
+            }
+
+            public long TotalScore { get; private set; }
+        }
+
+        private class ScoreV2 : IScoringAlgorithm
+        {
+            private int currentCombo;
+            private double comboPortion;
+            private double currentBaseScore;
+            private double maxBaseScore;
+            private int currentHits;
+
+            private readonly double comboPortionMax;
+            private readonly int maxCombo;
+
+            private const double combo_base = 4;
+
+            public ScoreV2(int maxCombo)
+            {
+                this.maxCombo = maxCombo;
+
+                for (int i = 0; i < this.maxCombo; i++)
+                    ApplyHit();
+
+                comboPortionMax = comboPortion;
+
+                currentCombo = 0;
+                comboPortion = 0;
+                currentBaseScore = 0;
+                maxBaseScore = 0;
+                currentHits = 0;
+            }
+
+            public void ApplyHit() => applyHitV2(base_great);
+
+            public void ApplyNonPerfect() => applyHitV2(base_ok);
+
+            private void applyHitV2(int baseScore)
+            {
+                maxBaseScore += base_great;
+                currentBaseScore += baseScore;
+
+                currentHits++;
+
+                // `base_great` is INTENTIONALLY used above here instead of `baseScore`
+                // see `BaseHitValue` override in `ScoreChangeTaiko` on stable
+                comboPortion += base_great * Math.Min(Math.Max(0.5, Math.Log(++currentCombo, combo_base)), Math.Log(400, combo_base));
+            }
+
+            public void ApplyMiss()
+            {
+                currentHits++;
+                maxBaseScore += base_great;
+                currentCombo = 0;
+            }
+
+            public long TotalScore
+            {
+                get
+                {
+                    double accuracy = currentBaseScore / maxBaseScore;
+
+                    return (int)Math.Round
+                    (
+                        250000 * comboPortion / comboPortionMax +
+                        750000 * Math.Pow(accuracy, 3.6) * ((double)currentHits / maxCombo)
+                    );
+                }
+            }
+        }
+
+        private class TaikoProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
+        {
+            public TaikoProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+                : base(beatmap, mode)
+            {
+            }
+
+            protected override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor();
+            protected override JudgementResult CreatePerfectJudgementResult() => new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great };
+            protected override JudgementResult CreateNonPerfectJudgementResult() => new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Ok };
+            protected override JudgementResult CreateMissJudgementResult() => new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss };
+        }
+    }
+}

From aa8aa14a57ff48bdc707d7221490482714380bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 15:27:35 +0200
Subject: [PATCH 1434/2100] Add catch scoring algorithms to test scene

---
 .../TestSceneScoring.cs                       | 97 +++++++++++++++----
 1 file changed, 79 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
index 44823607b8..dfdde0a325 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
@@ -3,6 +3,7 @@
 
 using System;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Judgements;
@@ -22,6 +23,12 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
         }
 
+        private Bindable<double> scoreMultiplier { get; } = new BindableDouble
+        {
+            Default = 4,
+            Value = 4
+        };
+
         protected override IBeatmap CreateBeatmap(int maxCombo)
         {
             var beatmap = new CatchBeatmap();
@@ -30,51 +37,105 @@ namespace osu.Game.Rulesets.Catch.Tests
             return beatmap;
         }
 
-        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1();
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
 
         protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
 
         protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new CatchProcessorBasedScoringAlgorithm(beatmap, mode);
 
+        [Test]
+        public void TestBasicScenarios()
+        {
+            AddStep("set up score multiplier", () =>
+            {
+                scoreMultiplier.BindValueChanged(_ => Rerun());
+            });
+            AddStep("set max combo to 100", () => MaxCombo.Value = 100);
+            AddStep("set perfect score", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+            });
+            AddStep("set score with misses", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddSliderStep("adjust score multiplier", 0, 10, (int)scoreMultiplier.Default, multiplier => scoreMultiplier.Value = multiplier);
+        }
+
+        private const int base_great = 300;
+
         private class ScoreV1 : IScoringAlgorithm
         {
-            public void ApplyHit()
+            private int currentCombo;
+
+            public BindableDouble ScoreMultiplier { get; } = new BindableDouble();
+
+            public void ApplyHit() => applyHitV1(base_great);
+
+            public void ApplyNonPerfect() => throw new NotSupportedException("catch does not have \"non-perfect\" judgements.");
+
+            public void ApplyMiss() => applyHitV1(0);
+
+            private void applyHitV1(int baseScore)
             {
+                if (baseScore == 0)
+                {
+                    currentCombo = 0;
+                    return;
+                }
+
+                TotalScore += baseScore;
+
+                // combo multiplier
+                // ReSharper disable once PossibleLossOfFraction
+                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * ScoreMultiplier.Value));
+
+                currentCombo++;
             }
 
-            public void ApplyNonPerfect()
-            {
-            }
-
-            public void ApplyMiss()
-            {
-            }
-
-            public long TotalScore => 0;
+            public long TotalScore { get; private set; }
         }
 
         private class ScoreV2 : IScoringAlgorithm
         {
-            private readonly int maxCombo;
+            private int currentCombo;
+            private double comboPortion;
+
+            private readonly double comboPortionMax;
+
+            private const double combo_base = 4;
+            private const int combo_cap = 200;
 
             public ScoreV2(int maxCombo)
             {
-                this.maxCombo = maxCombo;
+                for (int i = 0; i < maxCombo; i++)
+                    ApplyHit();
+
+                comboPortionMax = comboPortion;
+
+                currentCombo = 0;
+                comboPortion = 0;
             }
 
-            public void ApplyHit()
-            {
-            }
+            public void ApplyHit() => applyHitV2(base_great);
 
-            public void ApplyNonPerfect()
+            public void ApplyNonPerfect() => throw new NotSupportedException("catch does not have \"non-perfect\" judgements.");
+
+            private void applyHitV2(int baseScore)
             {
+                comboPortion += baseScore * Math.Min(Math.Max(0.5, Math.Log(++currentCombo, combo_base)), Math.Log(combo_cap, combo_base));
             }
 
             public void ApplyMiss()
             {
+                currentCombo = 0;
             }
 
-            public long TotalScore => 0;
+            public long TotalScore
+                => (int)Math.Round(1000000 * comboPortion / comboPortionMax); // vast simplification, as we're not doing ticks here.
         }
 
         private class CatchProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm

From 5640dd2f74b44b8a2a4c03b9eb22e94e3e7e4f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 20:06:59 +0200
Subject: [PATCH 1435/2100] Add mania scoring test scene

---
 .../TestSceneScoring.cs                       | 175 ++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs
new file mode 100644
index 0000000000..ae3ea861ea
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs
@@ -0,0 +1,175 @@
+// Copyright (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.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Judgements;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual.Gameplay;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public partial class TestSceneScoring : ScoringTestScene
+    {
+        protected override IBeatmap CreateBeatmap(int maxCombo)
+        {
+            var beatmap = new ManiaBeatmap(new StageDefinition(5));
+            for (int i = 0; i < maxCombo; ++i)
+                beatmap.HitObjects.Add(new Note());
+            return beatmap;
+        }
+
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1(MaxCombo.Value);
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new ManiaProcessorBasedScoringAlgorithm(beatmap, mode);
+
+        [Test]
+        public void TestBasicScenarios()
+        {
+            AddStep("set max combo to 100", () => MaxCombo.Value = 100);
+            AddStep("set perfect score", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+            });
+            AddStep("set score with misses", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddStep("set score with misses and OKs", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+
+                NonPerfectLocations.AddRange(new[] { 9d, 19, 29, 39, 59, 69, 79, 89, 99 });
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+        }
+
+        private class ScoreV1 : IScoringAlgorithm
+        {
+            private int currentCombo;
+            private double comboAddition = 100;
+            private double totalScoreDouble;
+            private readonly double scoreMultiplier;
+
+            public ScoreV1(int maxCombo)
+            {
+                scoreMultiplier = 500000d / maxCombo;
+            }
+
+            public void ApplyHit() => applyHitV1(320, add => add + 2, 32);
+            public void ApplyNonPerfect() => applyHitV1(100, add => add - 24, 8);
+            public void ApplyMiss() => applyHitV1(0, _ => -56, 0);
+
+            private void applyHitV1(int scoreIncrease, Func<double, double> comboAdditionFunc, int delta)
+            {
+                comboAddition = comboAdditionFunc(comboAddition);
+                if (currentCombo != 0 && currentCombo % 384 == 0)
+                    comboAddition = 100;
+                comboAddition = Math.Max(0, Math.Min(comboAddition, 100));
+                double scoreIncreaseD = Math.Sqrt(comboAddition) * delta * scoreMultiplier / 320;
+
+                TotalScore = (long)totalScoreDouble;
+
+                scoreIncreaseD += scoreIncrease * scoreMultiplier / 320;
+                scoreIncrease = (int)scoreIncreaseD;
+
+                TotalScore += scoreIncrease;
+                totalScoreDouble += scoreIncreaseD;
+
+                if (scoreIncrease > 0)
+                    currentCombo++;
+            }
+
+            public long TotalScore { get; private set; }
+        }
+
+        private class ScoreV2 : IScoringAlgorithm
+        {
+            private int currentCombo;
+            private double comboPortion;
+            private double currentBaseScore;
+            private double maxBaseScore;
+            private int currentHits;
+
+            private readonly double comboPortionMax;
+            private readonly int maxCombo;
+
+            private const double combo_base = 4;
+
+            public ScoreV2(int maxCombo)
+            {
+                this.maxCombo = maxCombo;
+
+                for (int i = 0; i < this.maxCombo; i++)
+                    ApplyHit();
+
+                comboPortionMax = comboPortion;
+
+                currentCombo = 0;
+                comboPortion = 0;
+                currentBaseScore = 0;
+                maxBaseScore = 0;
+                currentHits = 0;
+            }
+
+            public void ApplyHit() => applyHitV2(305, 300);
+            public void ApplyNonPerfect() => applyHitV2(100, 100);
+
+            private void applyHitV2(int hitValue, int baseHitValue)
+            {
+                maxBaseScore += 305;
+                currentBaseScore += hitValue;
+                comboPortion += baseHitValue * Math.Min(Math.Max(0.5, Math.Log(++currentCombo, combo_base)), Math.Log(400, combo_base));
+
+                currentHits++;
+            }
+
+            public void ApplyMiss()
+            {
+                currentHits++;
+                maxBaseScore += 305;
+                currentCombo = 0;
+            }
+
+            public long TotalScore
+            {
+                get
+                {
+                    float accuracy = (float)(currentBaseScore / maxBaseScore);
+
+                    return (int)Math.Round
+                    (
+                        200000 * comboPortion / comboPortionMax +
+                        800000 * Math.Pow(accuracy, 2 + 2 * accuracy) * ((double)currentHits / maxCombo)
+                    );
+                }
+            }
+        }
+
+        private class ManiaProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
+        {
+            public ManiaProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+                : base(beatmap, mode)
+            {
+            }
+
+            protected override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
+
+            protected override JudgementResult CreatePerfectJudgementResult() => new JudgementResult(new Note(), new ManiaJudgement()) { Type = HitResult.Perfect };
+
+            protected override JudgementResult CreateNonPerfectJudgementResult() => new JudgementResult(new Note(), new ManiaJudgement()) { Type = HitResult.Ok };
+
+            protected override JudgementResult CreateMissJudgementResult() => new JudgementResult(new Note(), new ManiaJudgement()) { Type = HitResult.Miss };
+        }
+    }
+}

From c2685da94c8c1ff329c6fb966de5035d6eddb98d Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 13 Sep 2023 23:38:54 -0700
Subject: [PATCH 1436/2100] Fix dummy beatmap showing AR 5 on song select

---
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index 8089d789c1..e2e541811d 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -36,9 +36,10 @@ namespace osu.Game.Beatmaps
                 BeatmapSet = new BeatmapSetInfo(),
                 Difficulty = new BeatmapDifficulty
                 {
-                    DrainRate = 0,
                     CircleSize = 0,
+                    DrainRate = 0,
                     OverallDifficulty = 0,
+                    ApproachRate = 0,
                 },
                 Ruleset = new DummyRuleset().RulesetInfo
             }, audio)

From 56b5f52e838f39aeabc2209e0d765603e7ebc477 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 16 Sep 2023 14:31:33 +0900
Subject: [PATCH 1437/2100] Update all dependencies (except for Moq)

---
 ...u.Game.Rulesets.EmptyFreeform.Tests.csproj |  4 ++--
 .../osu.Game.Rulesets.Pippidon.Tests.csproj   |  4 ++--
 ....Game.Rulesets.EmptyScrolling.Tests.csproj |  4 ++--
 .../osu.Game.Rulesets.Pippidon.Tests.csproj   |  4 ++--
 osu.Desktop/osu.Desktop.csproj                |  2 +-
 .../osu.Game.Benchmarks.csproj                |  4 ++--
 .../osu.Game.Rulesets.Catch.Tests.csproj      |  4 ++--
 .../osu.Game.Rulesets.Mania.Tests.csproj      |  4 ++--
 .../osu.Game.Rulesets.Osu.Tests.csproj        |  4 ++--
 .../osu.Game.Rulesets.Taiko.Tests.csproj      |  4 ++--
 osu.Game.Tests/osu.Game.Tests.csproj          |  4 ++--
 .../osu.Game.Tournament.Tests.csproj          |  4 ++--
 .../API/ModSettingsDictionaryFormatter.cs     |  4 ++--
 .../Multiplayer/TestMultiplayerClient.cs      |  2 +-
 osu.Game/osu.Game.csproj                      | 20 +++++++++----------
 15 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
index a1c53ece03..2baa7ee0e0 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
@@ -9,9 +9,9 @@
       <GenerateProgramFile>false</GenerateProgramFile>
     </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
index 683e9fd5e8..a2308e6dfc 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -9,9 +9,9 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
index b7a7fff18a..e839d2657c 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
@@ -9,9 +9,9 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj" />
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
index 683e9fd5e8..a2308e6dfc 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -9,9 +9,9 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 25f4cff00e..1d43e118a3 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.4.20" />
+    <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />
diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index 4719d54138..febe353b81 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.4" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
index 01922b2a96..c45c85833c 100644
--- a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
+++ b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
index 027bf60a0c..b991db408c 100644
--- a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
+++ b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
index 57900bffd7..ea033cda45 100644
--- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
+++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
index 0c39ad988b..48465bb119 100644
--- a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 59a786a11d..ef6c16f2c4 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -2,10 +2,10 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="DeepEqual" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index 5847079161..2cc07dd9ed 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -4,9 +4,9 @@
     <StartupObject>osu.Game.Tournament.Tests.TournamentTestRunner</StartupObject>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index 8df2d3fc2d..3fad032531 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -35,8 +35,8 @@ namespace osu.Game.Online.API
 
             for (int i = 0; i < itemCount; i++)
             {
-                output[reader.ReadString()] =
-                    PrimitiveObjectFormatter.Instance.Deserialize(ref reader, options);
+                output[reader.ReadString()!] =
+                    PrimitiveObjectFormatter.Instance.Deserialize(ref reader, options)!;
             }
 
             return output;
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index c27e30d5bb..9dc24eff69 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -635,7 +635,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private T clone<T>(T incoming)
         {
-            byte[]? serialized = MessagePackSerializer.Serialize(typeof(T), incoming, SignalRUnionWorkaroundResolver.OPTIONS);
+            byte[] serialized = MessagePackSerializer.Serialize(typeof(T), incoming, SignalRUnionWorkaroundResolver.OPTIONS);
             return MessagePackSerializer.Deserialize<T>(serialized, SignalRUnionWorkaroundResolver.OPTIONS);
         }
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d109345518..b247ea80f6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,13 +21,13 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="AutoMapper" Version="12.0.1" />
     <PackageReference Include="DiffPlex" Version="1.7.1" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.53" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
-    <PackageReference Include="MessagePack" Version="2.4.59" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.2" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.2" />
+    <PackageReference Include="MessagePack" Version="2.5.124" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.11" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.11" />
     <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" />
@@ -35,13 +35,13 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Realm" Version="11.1.2" />
+    <PackageReference Include="Realm" Version="11.4.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.914.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
-    <PackageReference Include="Sentry" Version="3.28.1" />
-    <PackageReference Include="SharpCompress" Version="0.32.2" />
+    <PackageReference Include="Sentry" Version="3.39.1" />
+    <PackageReference Include="SharpCompress" Version="0.33.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.4" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.6" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="TagLibSharp" Version="2.3.0" />
 

From be026f7ff16b95f85d8a47023506f00572fbf763 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 Sep 2023 01:27:43 +0900
Subject: [PATCH 1438/2100] Bump realm once more

---
 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 b247ea80f6..d88b568244 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="11.4.0" />
+    <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.914.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />

From a2df123c6d7271bfdbe867247f3d7064d6973d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 09:19:12 +0200
Subject: [PATCH 1439/2100] Add failing test case for fake (but still
 incorrectly allowed) protocol

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index f0dcd527a4..1baa737a9c 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -35,6 +35,15 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(0, result.Links.Count);
         }
 
+        [Test]
+        public void TestFakeProtocolLink()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a osunotarealprotocol://completely-made-up-protocol we don't support." });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(0, result.Links.Count);
+        }
+
         [Test]
         public void TestSupportedProtocolLinkParsing()
         {

From d3cc6dbaa09a1ad8396db068c3635bc18b7723d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 09:20:14 +0200
Subject: [PATCH 1440/2100] Fix link protocol allowlist allowing too much

---
 osu.Game/Online/Chat/MessageFormatter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index db4d0b1363..667175117f 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Online.Chat
         //      http[s]://<domain>.<tld>[:port][/path][?query][#fragment]
         private static readonly Regex advanced_link_regex = new Regex(
             // protocol
-            @"(?<link>(https?|osu)[a-z]*?:\/\/" +
+            @"(?<link>(https?|osu(mp)?):\/\/" +
             // domain + tld
             @"(?<domain>(?:[a-z0-9]\.|[a-z0-9][a-z0-9-]*[a-z0-9]\.)*[a-z0-9-]*[a-z0-9]" +
             // port (optional)

From 59b9a636d372b4167ce2475376bc31394c30fb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 10:46:14 +0200
Subject: [PATCH 1441/2100] Fix grammar in comment

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

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 650e25a512..2875035e1b 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Scoring
         {
             var stream = new MemoryStream();
 
-            // stream will close after exception throw, so fetch the stream again.
+            // stream will be closed after the exception was thrown, so fetch the stream again.
             using (var scoreStream = archive.GetStream(name))
             {
                 scoreStream.CopyTo(stream);

From 5c2413c06b5a79658cd245871654c7814c558e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 11:30:14 +0200
Subject: [PATCH 1442/2100] Implement nano beatmap card

---
 .../Visual/Beatmaps/TestSceneBeatmapCard.cs   |   6 +
 .../Beatmaps/Drawables/Cards/BeatmapCard.cs   |   3 +
 .../Drawables/Cards/BeatmapCardNano.cs        | 166 ++++++++++++++++++
 .../Drawables/Cards/BeatmapCardSize.cs        |   1 +
 .../BeatmapListingCardSizeTabControl.cs       |   4 +
 5 files changed, 180 insertions(+)
 create mode 100644 osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs

diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs
index d4018be7fc..fed26d8acb 100644
--- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs
@@ -260,6 +260,12 @@ namespace osu.Game.Tests.Visual.Beatmaps
                 AddStep($"set {scheme} scheme", () => Child = createContent(scheme, creationFunc));
         }
 
+        [Test]
+        public void TestNano()
+        {
+            createTestCase(beatmapSetInfo => new BeatmapCardNano(beatmapSetInfo));
+        }
+
         [Test]
         public void TestNormal()
         {
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
index 94b2956b4e..a16f6d5689 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
@@ -89,6 +89,9 @@ namespace osu.Game.Beatmaps.Drawables.Cards
         {
             switch (size)
             {
+                case BeatmapCardSize.Nano:
+                    return new BeatmapCardNano(beatmapSet);
+
                 case BeatmapCardSize.Normal:
                     return new BeatmapCardNormal(beatmapSet, allowExpansion);
 
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
new file mode 100644
index 0000000000..ba2142d28f
--- /dev/null
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
@@ -0,0 +1,166 @@
+// Copyright (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.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Resources.Localisation.Web;
+using osuTK;
+
+namespace osu.Game.Beatmaps.Drawables.Cards
+{
+    public partial class BeatmapCardNano : BeatmapCard
+    {
+        protected override Drawable IdleContent => idleBottomContent;
+        protected override Drawable DownloadInProgressContent => downloadProgressBar;
+
+        private const float height = 60;
+        private const float width = 300;
+        private const float cover_width = 80;
+
+        [Cached]
+        private readonly BeatmapCardContent content;
+
+        private BeatmapCardThumbnail thumbnail = null!;
+        private CollapsibleButtonContainer buttonContainer = null!;
+
+        private FillFlowContainer idleBottomContent = null!;
+        private BeatmapCardDownloadProgressBar downloadProgressBar = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        public BeatmapCardNano(APIBeatmapSet beatmapSet)
+            : base(beatmapSet, false)
+        {
+            content = new BeatmapCardContent(height);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Width = width;
+            Height = height;
+
+            Child = content.With(c =>
+            {
+                c.MainContent = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        thumbnail = new BeatmapCardThumbnail(BeatmapSet)
+                        {
+                            Name = @"Left (icon) area",
+                            Size = new Vector2(cover_width, height),
+                            Padding = new MarginPadding { Right = CORNER_RADIUS },
+                        },
+                        buttonContainer = new CollapsibleButtonContainer(BeatmapSet)
+                        {
+                            X = cover_width - CORNER_RADIUS,
+                            Width = width - cover_width + CORNER_RADIUS,
+                            FavouriteState = { BindTarget = FavouriteState },
+                            ButtonsCollapsedWidth = CORNER_RADIUS,
+                            ButtonsExpandedWidth = 30,
+                            Children = new Drawable[]
+                            {
+                                new FillFlowContainer
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Vertical,
+                                    Children = new Drawable[]
+                                    {
+                                        new TruncatingSpriteText
+                                        {
+                                            Text = new RomanisableString(BeatmapSet.TitleUnicode, BeatmapSet.Title),
+                                            Font = OsuFont.Default.With(size: 19, weight: FontWeight.SemiBold),
+                                            RelativeSizeAxes = Axes.X,
+                                        },
+                                        new TruncatingSpriteText
+                                        {
+                                            Text = createArtistText(),
+                                            Font = OsuFont.Default.With(size: 16, weight: FontWeight.SemiBold),
+                                            RelativeSizeAxes = Axes.X,
+                                        },
+                                    }
+                                },
+                                new Container
+                                {
+                                    Name = @"Bottom content",
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Children = new Drawable[]
+                                    {
+                                        idleBottomContent = new FillFlowContainer
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 3),
+                                            AlwaysPresent = true,
+                                            Children = new Drawable[]
+                                            {
+                                                new LinkFlowContainer(s =>
+                                                {
+                                                    s.Shadow = false;
+                                                    s.Font = OsuFont.GetFont(size: 16, weight: FontWeight.SemiBold);
+                                                }).With(d =>
+                                                {
+                                                    d.AutoSizeAxes = Axes.Both;
+                                                    d.Margin = new MarginPadding { Top = 2 };
+                                                    d.AddText("mapped by ", t => t.Colour = colourProvider.Content2);
+                                                    d.AddUserLink(BeatmapSet.Author);
+                                                }),
+                                            }
+                                        },
+                                        downloadProgressBar = new BeatmapCardDownloadProgressBar
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            Height = 6,
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            State = { BindTarget = DownloadTracker.State },
+                                            Progress = { BindTarget = DownloadTracker.Progress }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                };
+                c.ExpandedContent = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding { Horizontal = 10, Vertical = 13 },
+                    Child = new BeatmapCardDifficultyList(BeatmapSet)
+                };
+                c.Expanded.BindTarget = Expanded;
+            });
+        }
+
+        private LocalisableString createArtistText()
+        {
+            var romanisableArtist = new RomanisableString(BeatmapSet.ArtistUnicode, BeatmapSet.Artist);
+            return BeatmapsetsStrings.ShowDetailsByArtist(romanisableArtist);
+        }
+
+        protected override void UpdateState()
+        {
+            base.UpdateState();
+
+            bool showDetails = IsHovered;
+
+            buttonContainer.ShowDetails.Value = showDetails;
+            thumbnail.Dimmed.Value = showDetails;
+        }
+    }
+}
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
index 098265506d..0b5acc4a05 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
@@ -8,6 +8,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
     /// </summary>
     public enum BeatmapCardSize
     {
+        Nano,
         Normal,
         Extra
     }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs
index feb0c27ee7..9cd0031e3d 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs
@@ -22,8 +22,12 @@ namespace osu.Game.Overlays.BeatmapListing
         public BeatmapListingCardSizeTabControl()
         {
             AutoSizeAxes = Axes.Both;
+
+            Items = new[] { BeatmapCardSize.Normal, BeatmapCardSize.Extra };
         }
 
+        protected override bool AddEnumEntriesAutomatically => false;
+
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
         {
             AutoSizeAxes = Axes.Both,

From e57d7d1205c2e6914b352ddc451167138d4c3dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 11:50:36 +0200
Subject: [PATCH 1443/2100] Fix `MemoryStreamArchiveReader.GetStream()` failing
 in some cases

`MemoryStreamArchiveReader` introduced in
0657b551964986fc5504a202eaa5e699d1c72f00 would previously use
`MemoryStream.GetBuffer()` to retrieve the underlying byte buffer with
stream data. However, this is not generally the method you would want,
for two reasons:

1. It can fail if the stream wasn't created in the way that supports it.
2. As per

	https://learn.microsoft.com/en-us/dotnet/api/system.io.memorystream.getbuffer?view=net-7.0#system-io-memorystream-getbuffer,

   it will return the _raw_ contents of the buffer, including
   potentially unused bytes.

To fix, use `MemoryStream.ToArray()` instead, which avoids both
pitfalls. Notably, `ToArray()` always returns the full contents of the
buffer, regardless of `Position`, as documented in:

    https://learn.microsoft.com/en-us/dotnet/api/system.io.memorystream.toarray?view=net-7.0#system-io-memorystream-toarray
---
 osu.Game/IO/Archives/MemoryStreamArchiveReader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs b/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs
index 37ce1e508e..d8e1199e93 100644
--- a/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs
+++ b/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs
@@ -19,7 +19,7 @@ namespace osu.Game.IO.Archives
             this.stream = stream;
         }
 
-        public override Stream GetStream(string name) => new MemoryStream(stream.GetBuffer(), 0, (int)stream.Length);
+        public override Stream GetStream(string name) => new MemoryStream(stream.ToArray(), 0, (int)stream.Length);
 
         public override void Dispose()
         {

From 5fcd7363320485cf35d25715edaf057cf646f6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 13:52:45 +0200
Subject: [PATCH 1444/2100] Redo nano beatmap card design to fit needs better

Wanting to use this inside notification, it turns out that the original
design did not work very well at such narrow widths, and additionally
the typical button setup borrowed from elsewhere resulted in teeny tiny
action buttons.

To that end, slim down the design (get rid of thumbnail, audio preview,
make expandable right side slimmer), as well as change the entire panel
so that it has only one action associated with it at all times, and
clicking the panel in any place triggers that action.
---
 .../Drawables/Cards/BeatmapCardNano.cs        |  37 +--
 .../Cards/CollapsibleButtonContainerSlim.cs   | 246 ++++++++++++++++++
 2 files changed, 267 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
index ba2142d28f..2f46bc51d6 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
@@ -20,15 +20,25 @@ namespace osu.Game.Beatmaps.Drawables.Cards
         protected override Drawable IdleContent => idleBottomContent;
         protected override Drawable DownloadInProgressContent => downloadProgressBar;
 
+        public override float Width
+        {
+            get => base.Width;
+            set
+            {
+                base.Width = value;
+
+                if (LoadState >= LoadState.Ready)
+                    buttonContainer.Width = value;
+            }
+        }
+
         private const float height = 60;
         private const float width = 300;
-        private const float cover_width = 80;
 
         [Cached]
         private readonly BeatmapCardContent content;
 
-        private BeatmapCardThumbnail thumbnail = null!;
-        private CollapsibleButtonContainer buttonContainer = null!;
+        private CollapsibleButtonContainerSlim buttonContainer = null!;
 
         private FillFlowContainer idleBottomContent = null!;
         private BeatmapCardDownloadProgressBar downloadProgressBar = null!;
@@ -52,22 +62,16 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             {
                 c.MainContent = new Container
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    Height = height,
                     Children = new Drawable[]
                     {
-                        thumbnail = new BeatmapCardThumbnail(BeatmapSet)
+                        buttonContainer = new CollapsibleButtonContainerSlim(BeatmapSet)
                         {
-                            Name = @"Left (icon) area",
-                            Size = new Vector2(cover_width, height),
-                            Padding = new MarginPadding { Right = CORNER_RADIUS },
-                        },
-                        buttonContainer = new CollapsibleButtonContainer(BeatmapSet)
-                        {
-                            X = cover_width - CORNER_RADIUS,
-                            Width = width - cover_width + CORNER_RADIUS,
+                            Width = Width,
                             FavouriteState = { BindTarget = FavouriteState },
-                            ButtonsCollapsedWidth = CORNER_RADIUS,
-                            ButtonsExpandedWidth = 30,
+                            ButtonsCollapsedWidth = 5,
+                            ButtonsExpandedWidth = 20,
                             Children = new Drawable[]
                             {
                                 new FillFlowContainer
@@ -145,6 +149,8 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                 };
                 c.Expanded.BindTarget = Expanded;
             });
+
+            Action = () => buttonContainer.TriggerClick();
         }
 
         private LocalisableString createArtistText()
@@ -160,7 +166,6 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             bool showDetails = IsHovered;
 
             buttonContainer.ShowDetails.Value = showDetails;
-            thumbnail.Dimmed.Value = showDetails;
         }
     }
 }
diff --git a/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs b/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
new file mode 100644
index 0000000000..d17ff0d759
--- /dev/null
+++ b/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
@@ -0,0 +1,246 @@
+// Copyright (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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+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.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Resources.Localisation.Web;
+using osuTK;
+
+namespace osu.Game.Beatmaps.Drawables.Cards
+{
+    public partial class CollapsibleButtonContainerSlim : OsuClickableContainer
+    {
+        public Bindable<bool> ShowDetails = new Bindable<bool>();
+        public Bindable<BeatmapSetFavouriteState> FavouriteState = new Bindable<BeatmapSetFavouriteState>();
+
+        private readonly BeatmapDownloadTracker downloadTracker;
+
+        private float buttonsExpandedWidth;
+
+        public float ButtonsExpandedWidth
+        {
+            get => buttonsExpandedWidth;
+            set
+            {
+                buttonsExpandedWidth = value;
+                buttonArea.Width = value;
+                if (IsLoaded)
+                    updateState();
+            }
+        }
+
+        private float buttonsCollapsedWidth;
+
+        public float ButtonsCollapsedWidth
+        {
+            get => buttonsCollapsedWidth;
+            set
+            {
+                buttonsCollapsedWidth = value;
+                if (IsLoaded)
+                    updateState();
+            }
+        }
+
+        protected override Container<Drawable> Content => mainContent;
+
+        private readonly APIBeatmapSet beatmapSet;
+
+        private readonly Container background;
+
+        private readonly Container buttonArea;
+
+        private readonly Container mainArea;
+        private readonly Container mainContent;
+
+        private readonly Container icons;
+        private readonly SpriteIcon downloadIcon;
+        private readonly LoadingSpinner spinner;
+        private readonly SpriteIcon goToBeatmapIcon;
+
+        private const int icon_size = 12;
+
+        private Bindable<bool> preferNoVideo = null!;
+
+        [Resolved]
+        private BeatmapModelDownloader beatmaps { get; set; } = null!;
+
+        [Resolved]
+        private OsuGame? game { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        public CollapsibleButtonContainerSlim(APIBeatmapSet beatmapSet)
+        {
+            this.beatmapSet = beatmapSet;
+
+            downloadTracker = new BeatmapDownloadTracker(beatmapSet);
+
+            RelativeSizeAxes = Axes.Y;
+            Masking = true;
+            CornerRadius = BeatmapCard.CORNER_RADIUS;
+
+            base.Content.AddRange(new Drawable[]
+            {
+                downloadTracker,
+                background = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Colour4.White
+                    },
+                },
+                buttonArea = new Container
+                {
+                    Name = @"Right (button) area",
+                    RelativeSizeAxes = Axes.Y,
+                    Origin = Anchor.TopRight,
+                    Anchor = Anchor.TopRight,
+                    Child = icons = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            downloadIcon = new SpriteIcon
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = new Vector2(icon_size),
+                                Icon = FontAwesome.Solid.Download
+                            },
+                            spinner = new LoadingSpinner
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = new Vector2(icon_size)
+                            },
+                            goToBeatmapIcon = new SpriteIcon
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = new Vector2(icon_size),
+                                Icon = FontAwesome.Solid.AngleDoubleRight
+                            },
+                        }
+                    }
+                },
+                mainArea = new Container
+                {
+                    Name = @"Main content",
+                    RelativeSizeAxes = Axes.Y,
+                    CornerRadius = BeatmapCard.CORNER_RADIUS,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        new BeatmapCardContentBackground(beatmapSet)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Dimmed = { BindTarget = ShowDetails }
+                        },
+                        mainContent = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding
+                            {
+                                Horizontal = 10,
+                                Vertical = 4
+                            },
+                        }
+                    }
+                }
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            preferNoVideo = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
+
+            downloadIcon.Colour = spinner.Colour = colourProvider.Content1;
+            goToBeatmapIcon.Colour = colourProvider.Foreground1;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            preferNoVideo.BindValueChanged(_ => updateState());
+            downloadTracker.State.BindValueChanged(_ => updateState());
+            ShowDetails.BindValueChanged(_ => updateState(), true);
+            FinishTransforms(true);
+        }
+
+        private void updateState()
+        {
+            float targetWidth = Width - (ShowDetails.Value ? ButtonsExpandedWidth : ButtonsCollapsedWidth);
+
+            mainArea.ResizeWidthTo(targetWidth, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+            var backgroundColour = downloadTracker.State.Value == DownloadState.LocallyAvailable ? colours.Lime0 : colourProvider.Background3;
+            if (ShowDetails.Value)
+                backgroundColour = backgroundColour.Lighten(0.2f);
+
+            background.FadeColour(backgroundColour, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            icons.FadeTo(ShowDetails.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+            if (beatmapSet.Availability.DownloadDisabled)
+            {
+                Enabled.Value = false;
+                TooltipText = BeatmapsetsStrings.AvailabilityDisabled;
+                return;
+            }
+
+            switch (downloadTracker.State.Value)
+            {
+                case DownloadState.NotDownloaded:
+                    Action = () => beatmaps.Download(beatmapSet, preferNoVideo.Value);
+                    break;
+
+                case DownloadState.LocallyAvailable:
+                    Action = () => game?.PresentBeatmap(beatmapSet);
+                    break;
+
+                default:
+                    Action = null;
+                    break;
+            }
+
+            downloadIcon.FadeTo(downloadTracker.State.Value == DownloadState.NotDownloaded ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            spinner.FadeTo(downloadTracker.State.Value == DownloadState.Downloading || downloadTracker.State.Value == DownloadState.Importing ? 1 : 0,
+                BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            goToBeatmapIcon.FadeTo(downloadTracker.State.Value == DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+            if (downloadTracker.State.Value == DownloadState.NotDownloaded)
+            {
+                if (!beatmapSet.HasVideo)
+                    TooltipText = BeatmapsetsStrings.PanelDownloadAll;
+                else
+                    TooltipText = preferNoVideo.Value ? BeatmapsetsStrings.PanelDownloadNoVideo : BeatmapsetsStrings.PanelDownloadVideo;
+            }
+            else
+            {
+                TooltipText = default;
+            }
+        }
+    }
+}

From 47764b301290bb64a3fcf6c35466861cb3778532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 13:54:57 +0200
Subject: [PATCH 1445/2100] Fix `OsuTestScene.CreateAPIBeatmapSet()` not
 backlinking set beatmaps to the set

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 0ec5a4c5c2..3ccb795a57 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -265,7 +265,7 @@ namespace osu.Game.Tests.Visual
         {
             Debug.Assert(original.BeatmapSet != null);
 
-            return new APIBeatmapSet
+            var result = new APIBeatmapSet
             {
                 OnlineID = original.BeatmapSet.OnlineID,
                 Status = BeatmapOnlineStatus.Ranked,
@@ -301,6 +301,11 @@ namespace osu.Game.Tests.Visual
                     }
                 }
             };
+
+            foreach (var beatmap in result.Beatmaps)
+                beatmap.BeatmapSet = result;
+
+            return result;
         }
 
         protected WorkingBeatmap CreateWorkingBeatmap(RulesetInfo ruleset) =>

From 775f96f06187edb24bc4dbbfa7577c4545ddacc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 13:55:03 +0200
Subject: [PATCH 1446/2100] Add very basic visual tests for missing beatmap
 notification

The full-stack test using the whole 9 `OsuGameTest` yards is unusable
for rapid development. I don't really get how you could ever design
anything using it without tossing your computer out the window.
---
 .../TestSceneMissingBeatmapNotification.cs    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs
new file mode 100644
index 0000000000..23b9c5f76a
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.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 System.IO;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Database;
+using osu.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    [TestFixture]
+    public partial class TestSceneMissingBeatmapNotification : OsuTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new Container
+            {
+                Width = 280,
+                AutoSizeAxes = Axes.Y,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Child = new MissingBeatmapNotification(CreateAPIBeatmapSet(Ruleset.Value).Beatmaps.First(), new MemoryStream(), "deadbeef")
+            };
+        }
+    }
+}

From 2709c6cd6773d1e770589c22d1f258faaa8d9895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:03:55 +0200
Subject: [PATCH 1447/2100] Integrate nano beatmap card into the notification

---
 .../Database/MissingBeatmapNotification.cs    | 86 +++----------------
 .../Overlays/Notifications/Notification.cs    |  6 +-
 2 files changed, 18 insertions(+), 74 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index d6674b9434..329d362bc4 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -6,19 +6,13 @@ using System.IO;
 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.Input.Events;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
+using osu.Game.Beatmaps.Drawables.Cards;
 using osu.Game.Configuration;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
-using osuTK.Graphics;
 using Realms;
 
 namespace osu.Game.Database
@@ -40,6 +34,7 @@ namespace osu.Game.Database
 
         private Bindable<bool> autodownloadConfig = null!;
         private Bindable<bool> noVideoSetting = null!;
+        private BeatmapCardNano card = null!;
 
         private IDisposable? realmSubscription;
 
@@ -52,7 +47,7 @@ namespace osu.Game.Database
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, BeatmapSetOverlay? beatmapSetOverlay)
+        private void load(OsuConfigManager config)
         {
             Text = "You do not have the required beatmap for this replay";
 
@@ -70,69 +65,7 @@ namespace osu.Game.Database
             autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
             noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
-            Content.Add(new ClickableContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                Height = 70,
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.TopLeft,
-                CornerRadius = 4,
-                Masking = true,
-                Action = () => beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmapSetInfo.OnlineID),
-                Children = new Drawable[]
-                {
-                    new DelayedLoadWrapper(() => new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.Card)
-                    {
-                        OnlineInfo = beatmapSetInfo,
-                        RelativeSizeAxes = Axes.Both
-                    })
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
-                        Alpha = 0.4f
-                    },
-                    new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding
-                        {
-                            Left = 10f,
-                            Top = 5f
-                        },
-                        Children = new Drawable[]
-                        {
-                            new TruncatingSpriteText
-                            {
-                                Text = beatmapSetInfo.Title,
-                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
-                                RelativeSizeAxes = Axes.X,
-                            },
-                            new TruncatingSpriteText
-                            {
-                                Text = beatmapSetInfo.Artist,
-                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 12, italics: true),
-                                RelativeSizeAxes = Axes.X,
-                            }
-                        }
-                    },
-                    new BeatmapDownloadButton(beatmapSetInfo)
-                    {
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.BottomCentre,
-                        Width = 50,
-                        Height = 30,
-                        Margin = new MarginPadding
-                        {
-                            Bottom = 1f
-                        }
-                    }
-                }
-            });
+            Content.Add(card = new BeatmapCardNano(beatmapSetInfo));
         }
 
         protected override void LoadComplete()
@@ -143,6 +76,15 @@ namespace osu.Game.Database
                 beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            card.Width = Content.DrawWidth;
+        }
+
+        protected override bool OnHover(HoverEvent e) => false;
+        protected override void OnHoverLost(HoverLostEvent e) { }
+
         private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
         {
             if (changes?.InsertedIndices == null) return;
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 8cdc373417..805604c274 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed { get; private set; }
 
-        private readonly Container content;
+        private readonly FillFlowContainer content;
 
         protected override Container<Drawable> Content => content;
 
@@ -166,11 +166,13 @@ namespace osu.Game.Overlays.Notifications
                                         Padding = new MarginPadding(10),
                                         Children = new Drawable[]
                                         {
-                                            content = new Container
+                                            content = new FillFlowContainer
                                             {
                                                 Masking = true,
                                                 RelativeSizeAxes = Axes.X,
                                                 AutoSizeAxes = Axes.Y,
+                                                Direction = FillDirection.Vertical,
+                                                Spacing = new Vector2(15)
                                             },
                                         }
                                     },

From b2c98da3307a57be00ba7cb7ea710735f29a1067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:09:06 +0200
Subject: [PATCH 1448/2100] Reword and localise copy

---
 osu.Game/Database/MissingBeatmapNotification.cs |  5 +++--
 osu.Game/Localisation/NotificationsStrings.cs   | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 329d362bc4..e2c72f35de 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -14,6 +14,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 using Realms;
+using osu.Game.Localisation;
 
 namespace osu.Game.Database
 {
@@ -49,7 +50,7 @@ namespace osu.Game.Database
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            Text = "You do not have the required beatmap for this replay";
+            Text = NotificationsStrings.MissingBeatmapForReplay;
 
             realmSubscription = realm.RegisterForNotifications(
                 realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
@@ -58,7 +59,7 @@ namespace osu.Game.Database
             {
                 if (r.All<BeatmapSetInfo>().Any(s => !s.DeletePending && s.OnlineID == beatmapSetInfo.OnlineID))
                 {
-                    Text = "You have the corresponding beatmapset but no beatmap, you may need to update the beatmapset.";
+                    Text = NotificationsStrings.MismatchingBeatmapForReplay;
                 }
             });
 
diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index 53687f2b28..194a1fa399 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -93,6 +93,16 @@ Please try changing your audio device to a working setting.");
         /// </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);
 
+        /// <summary>
+        /// "You do not have the beatmap for this replay."
+        /// </summary>
+        public static LocalisableString MissingBeatmapForReplay => new TranslatableString(getKey(@"missing_beatmap_for_replay"), @"You do not have the beatmap for this replay.");
+
+        /// <summary>
+        /// "Your local copy of the beatmap for this replay appears to be different than expected. You may need to update or re-download it."
+        /// </summary>
+        public static LocalisableString MismatchingBeatmapForReplay => new TranslatableString(getKey(@"mismatching_beatmap_for_replay"), @"Your local copy of the beatmap for this replay appears to be different than expected. You may need to update or re-download it.");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }

From 27471ad170bfaf4e2df5e42520f9c19613bf67eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:30:06 +0200
Subject: [PATCH 1449/2100] Make missing beatmap notification simple

Progress didn't work for several reasons:

- It was spinning when nothing was actually happening yet
  (especially egregious with autodownload off)

- It was blocking exits (as all progress notifications do)

- When actually going to download, two progress notifications would
  pertain to one thing

- It wasn't helping much with the actual implementation of score
  re-import, cancelling the progress notification would result in
  similarly jank UX of beatmap importing but not the score.
---
 osu.Game/Database/MissingBeatmapNotification.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index e2c72f35de..07382a0e3b 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -18,7 +18,7 @@ using osu.Game.Localisation;
 
 namespace osu.Game.Database
 {
-    public partial class MissingBeatmapNotification : ProgressNotification
+    public partial class MissingBeatmapNotification : SimpleNotification
     {
         [Resolved]
         private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
@@ -93,7 +93,7 @@ namespace osu.Game.Database
             if (sender.Any(s => s.Beatmaps.Any(b => b.MD5Hash == beatmapHash)))
             {
                 var importTask = new ImportTask(scoreStream, "score.osr");
-                scoreManager.Import(this, new[] { importTask });
+                scoreManager.Import(new[] { importTask });
                 realmSubscription?.Dispose();
             }
         }

From 3bddf4bf9a1ba6f5de548d565ec260acd6035b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:46:24 +0200
Subject: [PATCH 1450/2100] Rename spectator-specific settings to more generic
 (with backwards migration)

---
 osu.Game/Configuration/OsuConfigManager.cs    | 14 ++++++++++++--
 .../Database/MissingBeatmapNotification.cs    |  6 +++---
 .../Localisation/OnlineSettingsStrings.cs     |  5 +++++
 osu.Game/Localisation/WebSettingsStrings.cs   | 19 +++++++++++++++++++
 .../Settings/Sections/Online/WebSettings.cs   |  6 +++---
 osu.Game/Screens/Play/SoloSpectator.cs        |  2 +-
 6 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Localisation/WebSettingsStrings.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 921284ad4d..b5253d3500 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.Username, string.Empty);
             SetDefault(OsuSetting.Token, string.Empty);
 
-            SetDefault(OsuSetting.AutomaticallyDownloadWhenSpectating, false);
+            SetDefault(OsuSetting.AutomaticallyDownloadMissingBeatmaps, false);
 
             SetDefault(OsuSetting.SavePassword, false).ValueChanged += enabled =>
             {
@@ -215,6 +215,12 @@ namespace osu.Game.Configuration
 
             // migrations can be added here using a condition like:
             // if (combined < 20220103) { performMigration() }
+            if (combined < 20230918)
+            {
+#pragma warning disable CS0618 // Type or member is obsolete
+                SetValue(OsuSetting.AutomaticallyDownloadMissingBeatmaps, Get<OsuSetting>(OsuSetting.AutomaticallyDownloadWhenSpectating)); // can be removed 20240618
+#pragma warning restore CS0618 // Type or member is obsolete
+            }
         }
 
         public override TrackedSettings CreateTrackedSettings()
@@ -383,13 +389,17 @@ namespace osu.Game.Configuration
         EditorShowHitMarkers,
         EditorAutoSeekOnPlacement,
         DiscordRichPresence,
+
+        [Obsolete($"Use {nameof(AutomaticallyDownloadMissingBeatmaps)} instead.")] // can be removed 20240318
         AutomaticallyDownloadWhenSpectating,
+
         ShowOnlineExplicitContent,
         LastProcessedMetadataId,
         SafeAreaConsiderations,
         ComboColourNormalisationAmount,
         ProfileCoverExpanded,
         EditorLimitedDistanceSnap,
-        ReplaySettingsOverlay
+        ReplaySettingsOverlay,
+        AutomaticallyDownloadMissingBeatmaps,
     }
 }
diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 07382a0e3b..9ae6ac3b58 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Database
         private readonly APIBeatmapSet beatmapSetInfo;
         private readonly string beatmapHash;
 
-        private Bindable<bool> autodownloadConfig = null!;
+        private Bindable<bool> autoDownloadConfig = null!;
         private Bindable<bool> noVideoSetting = null!;
         private BeatmapCardNano card = null!;
 
@@ -63,7 +63,7 @@ namespace osu.Game.Database
                 }
             });
 
-            autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
+            autoDownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadMissingBeatmaps);
             noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
             Content.Add(card = new BeatmapCardNano(beatmapSetInfo));
@@ -73,7 +73,7 @@ namespace osu.Game.Database
         {
             base.LoadComplete();
 
-            if (autodownloadConfig.Value)
+            if (autoDownloadConfig.Value)
                 beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
         }
 
diff --git a/osu.Game/Localisation/OnlineSettingsStrings.cs b/osu.Game/Localisation/OnlineSettingsStrings.cs
index 3200b1c75c..5ea53a13bf 100644
--- a/osu.Game/Localisation/OnlineSettingsStrings.cs
+++ b/osu.Game/Localisation/OnlineSettingsStrings.cs
@@ -59,6 +59,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString AutomaticallyDownloadWhenSpectating => new TranslatableString(getKey(@"automatically_download_when_spectating"), @"Automatically download beatmaps when spectating");
 
+        /// <summary>
+        /// "Automatically download missing beatmaps"
+        /// </summary>
+        public static LocalisableString AutomaticallyDownloadMissingBeatmaps => new TranslatableString(getKey(@"automatically_download_missing_beatmaps"), @"Automatically download missing beatmaps");
+
         /// <summary>
         /// "Show explicit content in search results"
         /// </summary>
diff --git a/osu.Game/Localisation/WebSettingsStrings.cs b/osu.Game/Localisation/WebSettingsStrings.cs
new file mode 100644
index 0000000000..b3033524dc
--- /dev/null
+++ b/osu.Game/Localisation/WebSettingsStrings.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.Localisation
+{
+    public static class WebSettingsStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.WebSettings";
+
+        /// <summary>
+        /// "Automatically download missing beatmaps"
+        /// </summary>
+        public static LocalisableString AutomaticallyDownloadMissingBeatmaps => new TranslatableString(getKey(@"automatically_download_missing_beatmaps"), @"Automatically download missing beatmaps");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index d34b01ebf3..ce5c85bed0 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -31,9 +31,9 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = OnlineSettingsStrings.AutomaticallyDownloadWhenSpectating,
-                    Keywords = new[] { "spectator" },
-                    Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
+                    LabelText = OnlineSettingsStrings.AutomaticallyDownloadMissingBeatmaps,
+                    Keywords = new[] { "spectator", "replay" },
+                    Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadMissingBeatmaps),
                 },
                 new SettingsCheckbox
                 {
diff --git a/osu.Game/Screens/Play/SoloSpectator.cs b/osu.Game/Screens/Play/SoloSpectator.cs
index a5c84e97ab..f5af2684d3 100644
--- a/osu.Game/Screens/Play/SoloSpectator.cs
+++ b/osu.Game/Screens/Play/SoloSpectator.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Play
                             automaticDownload = new SettingsCheckbox
                             {
                                 LabelText = "Automatically download beatmaps",
-                                Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
+                                Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadMissingBeatmaps),
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
                             },

From 4cdd19bb5a90c709baf08f322eabcd862ecb08e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:54:25 +0200
Subject: [PATCH 1451/2100] Use different copy when auto-downloading

---
 osu.Game/Database/MissingBeatmapNotification.cs | 4 ++--
 osu.Game/Localisation/NotificationsStrings.cs   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 9ae6ac3b58..d9054980b1 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -50,8 +50,6 @@ namespace osu.Game.Database
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            Text = NotificationsStrings.MissingBeatmapForReplay;
-
             realmSubscription = realm.RegisterForNotifications(
                 realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
 
@@ -75,6 +73,8 @@ namespace osu.Game.Database
 
             if (autoDownloadConfig.Value)
                 beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
+
+            Text = autoDownloadConfig.Value ? NotificationsStrings.DownloadingBeatmapForReplay : NotificationsStrings.MissingBeatmapForReplay;
         }
 
         protected override void Update()
diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index 194a1fa399..adbd7a354b 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -98,6 +98,11 @@ Please try changing your audio device to a working setting.");
         /// </summary>
         public static LocalisableString MissingBeatmapForReplay => new TranslatableString(getKey(@"missing_beatmap_for_replay"), @"You do not have the beatmap for this replay.");
 
+        /// <summary>
+        /// "Downloading missing beatmap for this replay..."
+        /// </summary>
+        public static LocalisableString DownloadingBeatmapForReplay => new TranslatableString(getKey(@"downloading_beatmap_for_replay"), @"Downloading missing beatmap for this replay...");
+
         /// <summary>
         /// "Your local copy of the beatmap for this replay appears to be different than expected. You may need to update or re-download it."
         /// </summary>

From 25e43bd7d718489c81c35ae115b72a5a50a3de85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:54:36 +0200
Subject: [PATCH 1452/2100] Auto-close notification after successful download

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

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index d9054980b1..d98c07ce1f 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -95,6 +95,7 @@ namespace osu.Game.Database
                 var importTask = new ImportTask(scoreStream, "score.osr");
                 scoreManager.Import(new[] { importTask });
                 realmSubscription?.Dispose();
+                Close(false);
             }
         }
 

From 83584519e639c6ce387ebcfb47155e1f5fdbefa1 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Mon, 18 Sep 2023 11:40:00 -0400
Subject: [PATCH 1453/2100] Fix extension check using control points instead of
 path points

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

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 34113285a4..05960ec416 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -328,8 +328,8 @@ namespace osu.Game.Rulesets.Objects
 
             if (ExpectedDistance.Value is double expectedDistance && calculatedLength != expectedDistance)
             {
-                // In osu-stable, if the last two control points of a slider are equal, extension is not performed.
-                if (ControlPoints.Count >= 2 && ControlPoints[^1].Position == ControlPoints[^2].Position && expectedDistance > calculatedLength)
+                // In osu-stable, if the last two path points of a slider are equal, extension is not performed.
+                if (calculatedPath.Count >= 2 && calculatedPath[^1] == calculatedPath[^2] && expectedDistance > calculatedLength)
                 {
                     cumulativeLength.Add(calculatedLength);
                     return;

From bd7dab1d86fdaaa7d13edc1464cc912e26789f92 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Mon, 18 Sep 2023 12:02:20 -0400
Subject: [PATCH 1454/2100] Add test for slider path edge case

---
 .../OsuBeatmapConversionTest.cs               |  1 +
 ...r-paths-edge-case-expected-conversion.json | 94 +++++++++++++++++++
 .../Beatmaps/slider-paths-edge-case.osu       | 19 ++++
 3 files changed, 114 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case.osu

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index 08eea35425..11e69dc133 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase("colinear-perfect-curve")]
         [TestCase("slider-ticks")]
         [TestCase("slider-ticks-edge-case")]
+        [TestCase("slider-paths-edge-case")]
         [TestCase("repeat-slider")]
         [TestCase("uneven-repeat-slider")]
         [TestCase("old-stacking")]
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json
new file mode 100644
index 0000000000..5b04027cd6
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json
@@ -0,0 +1,94 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 46060.0,
+      "Objects": [
+        {
+          "StartTime": 46060.0,
+          "EndTime": 46060.0,
+          "X": 160.0,
+          "Y": 208.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 46398.0,
+          "EndTime": 46398.0,
+          "X": 160.980164,
+          "Y": 317.779083,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 46737.0,
+          "EndTime": 46737.0,
+          "X": 268.887268,
+          "Y": 320.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 47040.0,
+          "EndTime": 47040.0,
+          "X": 378.995544,
+          "Y": 320.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        }
+      ]
+    },
+    {
+      "StartTime": 123348.0,
+      "Objects": [
+        {
+          "StartTime": 123348.0,
+          "EndTime": 123348.0,
+          "X": 352.0,
+          "Y": 160.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 123686.0,
+          "EndTime": 123686.0,
+          "X": 351.019836,
+          "Y": 50.2209129,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 124025.0,
+          "EndTime": 124025.0,
+          "X": 243.112747,
+          "Y": 48.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 124328.0,
+          "EndTime": 124328.0,
+          "X": 133.004471,
+          "Y": 48.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case.osu
new file mode 100644
index 0000000000..1b6cd0417b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case.osu
@@ -0,0 +1,19 @@
+osu file format v6
+
+[General]
+StackLeniency: 0.7
+
+[Difficulty]
+HPDrainRate:1
+CircleSize:3
+OverallDifficulty:1
+SliderMultiplier:1.1
+SliderTickRate:1
+
+[TimingPoints]
+-41,338.983050847458,4,1,0,70,1,0
+93648,-100,4,1,0,70,0,0
+
+[HitObjects]
+160,208,46060,6,0,B|161:320|161:320|271:320|271:320,1,330,8|0
+352,160,123348,6,0,B|351:48|351:48|241:48|241:48,1,330,8|0

From 57dc76b345c97b8ee76abdf8de1c596d757ec9ed Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 03:17:07 +0300
Subject: [PATCH 1455/2100] Revert "Update `GetTexture` signature rather than
 creating new overload"

This reverts commit 96f12cfbaac4cfc0d8782de0d2890aa8b63e3fdb.
---
 .../Skinning/Legacy/LegacyBananaPiece.cs      |  5 ++--
 .../Skinning/Legacy/LegacyDropletPiece.cs     |  5 ++--
 .../Skinning/Legacy/LegacyFruitPiece.cs       |  9 ++++----
 .../LegacyMainCirclePieceTest.cs              |  5 ++--
 .../TestSceneCursorTrail.cs                   |  2 +-
 .../TestSceneGameplayCursor.cs                |  2 +-
 .../TestSceneSkinFallbacks.cs                 |  3 +--
 .../Skinning/Legacy/LegacyMainCirclePiece.cs  |  2 +-
 .../TestSceneHitObjectAccentColour.cs         |  3 +--
 .../Skinning/LegacySkinAnimationTest.cs       |  3 +--
 .../TestSceneRulesetSkinProvidingContainer.cs |  3 +--
 .../Skins/SkinDeserialisationTest.cs          |  3 +--
 .../TestSceneBeatmapSkinLookupDisables.cs     |  4 +---
 .../Skins/TestSceneSkinConfigurationLookup.cs |  4 +---
 .../Skins/TestSceneSkinProvidingContainer.cs  |  3 +--
 .../Skins/TestSceneSkinResources.cs           |  3 +--
 .../Gameplay/TestSceneSkinnableDrawable.cs    |  6 ++---
 .../Gameplay/TestSceneSkinnableSound.cs       |  6 +----
 osu.Game/Screens/Edit/EditorBeatmapSkin.cs    |  6 +----
 osu.Game/Skinning/ArgonSkin.cs                |  3 +--
 osu.Game/Skinning/ISkin.cs                    | 11 ++++++---
 osu.Game/Skinning/LegacySkin.cs               |  5 ++--
 osu.Game/Skinning/LegacySkinExtensions.cs     | 23 ++++++++++++-------
 osu.Game/Skinning/ResourceStoreBackedSkin.cs  |  4 +---
 osu.Game/Skinning/Skin.cs                     |  5 ++--
 osu.Game/Skinning/SkinManager.cs              |  4 +---
 osu.Game/Skinning/SkinProvidingContainer.cs   | 11 ++++-----
 osu.Game/Skinning/SkinTransformer.cs          |  5 ++--
 osu.Game/Skinning/TrianglesSkin.cs            |  3 +--
 osu.Game/Tests/Visual/SkinnableTestScene.cs   |  6 ++---
 30 files changed, 73 insertions(+), 84 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
index d471a7ee32..9f99e3a586 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -14,8 +15,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTexture("fruit-bananas", banana_max_size);
-            Texture? overlayTexture = Skin.GetTexture("fruit-bananas-overlay", banana_max_size);
+            Texture? texture = Skin.GetTextureWithMaxSize("fruit-bananas", banana_max_size);
+            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-bananas-overlay", banana_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index f1b1b45288..63be1bcf91 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -19,8 +20,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTexture("fruit-drop", droplet_max_size);
-            Texture? overlayTexture = Skin.GetTexture("fruit-drop-overlay", droplet_max_size);
+            Texture? texture = Skin.GetTextureWithMaxSize("fruit-drop", droplet_max_size);
+            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-drop-overlay", droplet_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index 3c853e5d3d..e4d25e036b 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -25,19 +26,19 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             switch (visualRepresentation)
             {
                 case FruitVisualRepresentation.Pear:
-                    SetTexture(Skin.GetTexture("fruit-pear", fruit_max_size), Skin.GetTexture("fruit-pear-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-pear", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-pear-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    SetTexture(Skin.GetTexture("fruit-grapes", fruit_max_size), Skin.GetTexture("fruit-grapes-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-grapes", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-grapes-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    SetTexture(Skin.GetTexture("fruit-apple", fruit_max_size), Skin.GetTexture("fruit-apple-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-apple", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-apple-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    SetTexture(Skin.GetTexture("fruit-orange", fruit_max_size), Skin.GetTexture("fruit-orange-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-orange", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-orange-overlay", fruit_max_size));
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
index dbeae2a76e..baaa24959f 100644
--- a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
@@ -14,7 +14,6 @@ using osu.Framework.Testing;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -78,9 +77,9 @@ namespace osu.Game.Rulesets.Osu.Tests
                 // shouldn't be required as GetTexture(string) calls GetTexture(string, WrapMode, WrapMode) by default,
                 // but moq doesn't handle that well, therefore explicitly requiring to use `CallBase`:
                 // https://github.com/moq/moq4/issues/972
-                skin.Setup(s => s.GetTexture(It.IsAny<string>(), It.IsAny<Vector2>(), It.IsAny<WrapMode>(), It.IsAny<WrapMode>())).CallBase();
+                skin.Setup(s => s.GetTexture(It.IsAny<string>())).CallBase();
 
-                skin.Setup(s => s.GetTexture(It.IsIn(textureFilenames), It.IsAny<Vector2>(), It.IsAny<WrapMode>(), It.IsAny<WrapMode>()))
+                skin.Setup(s => s.GetTexture(It.IsIn(textureFilenames), It.IsAny<WrapMode>(), It.IsAny<WrapMode>()))
                     .Returns((string componentName, WrapMode _, WrapMode _) =>
                     {
                         var tex = renderer.CreateTexture(1, 1);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index 22111d4412..9582ee491b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => null;
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 switch (componentName)
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 29dffd029e..c84a6ab70f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private class TopLeftCursorSkin : ISkin
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => null;
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => null;
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
             public ISample GetSample(ISampleInfo sampleInfo) => null;
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index da959b6be0..09b906cb10 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -25,7 +25,6 @@ using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -164,7 +163,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 };
             }
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => null;
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
             public ISample GetSample(ISampleInfo sampleInfo) => null;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index cf91ac4596..45a18152c2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName, circle_piece_size) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTextureWithMaxSize(circleName, circle_piece_size) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index bf8f5fd1e8..f38c2c9416 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -20,7 +20,6 @@ using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Gameplay
@@ -141,7 +140,7 @@ namespace osu.Game.Tests.Gameplay
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => throw new NotImplementedException();
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
index 34ea459988..197e9404ff 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -18,7 +18,6 @@ using osu.Framework.Timing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Tests.NonVisual.Skinning
 {
@@ -69,7 +68,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
                 this.renderer = renderer;
             }
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 return lookup_names.Contains(componentName) ? renderer.WhitePixel : null;
             }
diff --git a/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs b/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
index 705fd19d93..11f3fe660d 100644
--- a/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
@@ -17,7 +17,6 @@ using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osu.Game.Tests.Testing;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Tests.Rulesets
 {
@@ -81,7 +80,7 @@ namespace osu.Game.Tests.Rulesets
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => skin.GetTexture(componentName);
+            public Texture GetTexture(string componentName, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => skin.GetTexture(componentName);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index 79ce4de720..82d204f134 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -16,7 +16,6 @@ using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
-using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -134,7 +133,7 @@ namespace osu.Game.Tests.Skins
             {
             }
 
-            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
index 5144f57f8d..0bbf4406fb 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
@@ -18,7 +18,6 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -101,8 +100,7 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-                skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index a433b67bfb..816834989c 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -21,7 +21,6 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Visual;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Skins
@@ -224,8 +223,7 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-                skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs b/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
index 4acd127a58..df314b56a9 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
@@ -16,7 +16,6 @@ using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -90,7 +89,7 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => throw new System.NotImplementedException();
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 if (componentName == TEXTURE_NAME)
                     return renderer.WhitePixel;
diff --git a/osu.Game.Tests/Skins/TestSceneSkinResources.cs b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
index 636f1071dd..aaec319b57 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
@@ -22,7 +22,6 @@ using osu.Game.IO;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -101,7 +100,7 @@ namespace osu.Game.Tests.Skins
             {
             }
 
-            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index 326e233e3f..c02cec8c75 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -297,7 +297,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                     : null;
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
@@ -308,7 +308,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup componentLookupName) => new SecondarySourceBox();
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
@@ -320,7 +320,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup componentLookupName) => new BaseSourceBox();
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 0071c7e2c0..3f78dbfd96 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -15,7 +15,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -164,10 +163,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => SamplePlaybackDisabled;
 
             public Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => source.GetDrawableComponent(lookup);
-
-            public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-                source.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
-
+            public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source.GetTexture(componentName, wrapModeS, wrapModeT);
             public ISample? GetSample(ISampleInfo sampleInfo) => OverridingSample ?? source.GetSample(sampleInfo);
 
             public IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
diff --git a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
index d04bb72bd9..80239504d8 100644
--- a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit
@@ -55,10 +54,7 @@ namespace osu.Game.Screens.Edit
         #region Delegated ISkin implementation
 
         public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => Skin.GetDrawableComponent(lookup);
-
-        public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-            Skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
-
+        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Skin.GetTexture(componentName, wrapModeS, wrapModeT);
         public ISample GetSample(ISampleInfo sampleInfo) => Skin.GetSample(sampleInfo);
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Skin.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 3d14df70ce..61b0dc5aa1 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -67,8 +67,7 @@ namespace osu.Game.Skinning
             };
         }
 
-        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-            Textures?.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
+        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Textures?.Get(componentName, wrapModeS, wrapModeT);
 
         public override ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index 5cc677ad1c..fa04dda202 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -26,11 +25,17 @@ namespace osu.Game.Skinning
         /// Retrieve a <see cref="Texture"/>.
         /// </summary>
         /// <param name="componentName">The requested texture.</param>
-        /// <param name="maxSize">The maximum dimensions that the texture should be.</param>
+        /// <returns>A matching texture, or null if unavailable.</returns>
+        Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
+
+        /// <summary>
+        /// Retrieve a <see cref="Texture"/>.
+        /// </summary>
+        /// <param name="componentName">The requested texture.</param>
         /// <param name="wrapModeS">The texture wrap mode in horizontal direction.</param>
         /// <param name="wrapModeT">The texture wrap mode in vertical direction.</param>
         /// <returns>A matching texture, or null if unavailable.</returns>
-        Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default);
+        Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT);
 
         /// <summary>
         /// Retrieve a <see cref="SampleChannel"/>.
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 1b0b1be585..cf51fa8f74 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -466,7 +466,7 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
         {
             switch (componentName)
             {
@@ -497,8 +497,7 @@ namespace osu.Game.Skinning
                     continue;
 
                 texture.ScaleAdjust = ratio;
-
-                return texture.WithMaximumSize(maxSize);
+                return texture;
             }
 
             return null;
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index bd38eda259..ad3b10edd3 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
                 if (animatable && s.GetTexture(getFrameName(0)) != null)
                     return true;
 
-                return s.GetTexture(componentName, maxSize, wrapModeS, wrapModeT) != null;
+                return s.GetTexture(componentName, wrapModeS, wrapModeT) != null;
             }) ?? source;
 
             if (animatable)
@@ -79,15 +79,21 @@ namespace osu.Game.Skinning
             }
 
             // if an animation was not allowed or not found, fall back to a sprite retrieval.
-            var singleTexture = retrievalSource.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+            var singleTexture = maxSize != null
+                ? retrievalSource.GetTextureWithMaxSize(componentName, maxSize.Value, wrapModeS, wrapModeT)
+                : retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
 
-            return singleTexture != null ? new[] { singleTexture } : Array.Empty<Texture>();
+            return singleTexture != null
+                ? new[] { singleTexture }
+                : Array.Empty<Texture>();
 
             IEnumerable<Texture> getTextures(ISkin skin)
             {
                 for (int i = 0; true; i++)
                 {
-                    var texture = skin.GetTexture(getFrameName(i), maxSize, wrapModeS, wrapModeT);
+                    var texture = maxSize != null
+                        ? skin.GetTextureWithMaxSize(getFrameName(i), maxSize.Value, wrapModeS, wrapModeT)
+                        : skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT);
 
                     if (texture == null)
                         break;
@@ -99,16 +105,17 @@ namespace osu.Game.Skinning
             string getFrameName(int frameIndex) => $"{componentName}{animationSeparator}{frameIndex}";
         }
 
-        public static Texture? WithMaximumSize(this Texture? texture, Vector2? maxSize)
+        public static Texture? GetTextureWithMaxSize(this ISkin source, string componentName, Vector2 maxSize, WrapMode wrapModeS = WrapMode.None, WrapMode wrapModeT = WrapMode.None)
         {
-            if (texture == null || maxSize == null)
+            var texture = source.GetTexture(componentName, wrapModeS, wrapModeT);
+            if (texture == null)
                 return texture;
 
-            if (texture.DisplayWidth <= maxSize.Value.X && texture.DisplayHeight <= maxSize.Value.Y)
+            if (texture.DisplayWidth <= maxSize.X && texture.DisplayHeight <= maxSize.Y)
                 return texture;
 
             // use scale adjust property for downscaling the texture in order to meet the specified maximum dimensions.
-            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.Value.X, texture.DisplayHeight / maxSize.Value.Y);
+            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.X, texture.DisplayHeight / maxSize.Y);
             return texture;
         }
 
diff --git a/osu.Game/Skinning/ResourceStoreBackedSkin.cs b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
index 35165c2e6f..f5c6192ba5 100644
--- a/osu.Game/Skinning/ResourceStoreBackedSkin.cs
+++ b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Game.Audio;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -30,8 +29,7 @@ namespace osu.Game.Skinning
 
         public Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => null;
 
-        public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-            textures.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
+        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => textures.Get(componentName, wrapModeS, wrapModeT);
 
         public ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 0e96feaccc..a6250d7488 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -18,7 +18,6 @@ using osu.Framework.Logging;
 using osu.Game.Audio;
 using osu.Game.Database;
 using osu.Game.IO;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -45,7 +44,9 @@ namespace osu.Game.Skinning
 
         public abstract ISample? GetSample(ISampleInfo sampleInfo);
 
-        public abstract Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default);
+        public Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
+
+        public abstract Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT);
 
         public abstract IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
             where TLookup : notnull
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index f0819211c0..51605c6045 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -25,7 +25,6 @@ using osu.Game.Database;
 using osu.Game.IO;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Utils;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -224,8 +223,7 @@ namespace osu.Game.Skinning
 
         public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => lookupWithFallback(s => s.GetDrawableComponent(lookup));
 
-        public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-            lookupWithFallback(s => s.GetTexture(componentName, maxSize, wrapModeS, wrapModeT));
+        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => lookupWithFallback(s => s.GetTexture(componentName, wrapModeS, wrapModeT));
 
         public ISample GetSample(ISampleInfo sampleInfo) => lookupWithFallback(s => s.GetSample(sampleInfo));
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 342d6d8009..2612e0b47c 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -128,19 +127,19 @@ namespace osu.Game.Skinning
             return ParentSource?.GetDrawableComponent(lookup);
         }
 
-        public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
         {
             foreach (var (_, lookupWrapper) in skinSources)
             {
                 Texture? sourceTexture;
-                if ((sourceTexture = lookupWrapper.GetTexture(componentName, maxSize, wrapModeS, wrapModeT)) != null)
+                if ((sourceTexture = lookupWrapper.GetTexture(componentName, wrapModeS, wrapModeT)) != null)
                     return sourceTexture;
             }
 
             if (!AllowFallingBackToParent)
                 return null;
 
-            return ParentSource?.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+            return ParentSource?.GetTexture(componentName, wrapModeS, wrapModeT);
         }
 
         public ISample? GetSample(ISampleInfo sampleInfo)
@@ -252,10 +251,10 @@ namespace osu.Game.Skinning
                 return null;
             }
 
-            public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+            public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 if (provider.AllowTextureLookup(componentName))
-                    return skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+                    return skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
                 return null;
             }
diff --git a/osu.Game/Skinning/SkinTransformer.cs b/osu.Game/Skinning/SkinTransformer.cs
index cd7755b854..ed5b04da1e 100644
--- a/osu.Game/Skinning/SkinTransformer.cs
+++ b/osu.Game/Skinning/SkinTransformer.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -29,7 +28,9 @@ namespace osu.Game.Skinning
 
         public virtual Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => Skin.GetDrawableComponent(lookup);
 
-        public virtual Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => Skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+        public virtual Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
+
+        public virtual Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
         public virtual ISample? GetSample(ISampleInfo sampleInfo) => Skin.GetSample(sampleInfo);
 
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index d1d094b301..0957f60579 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -44,8 +44,7 @@ namespace osu.Game.Skinning
             this.resources = resources;
         }
 
-        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-            Textures?.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
+        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Textures?.Get(componentName, wrapModeS, wrapModeT);
 
         public override ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 6c286f37c7..aab1b72990 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -207,9 +207,9 @@ namespace osu.Game.Tests.Visual
                 this.extrapolateAnimations = extrapolateAnimations;
             }
 
-            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
-                var lookup = base.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+                var lookup = base.GetTexture(componentName, wrapModeS, wrapModeT);
 
                 if (lookup != null)
                     return lookup;
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Visual
                     var match = Regex.Match(componentName, "-([0-9]*)");
 
                     if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out int number) && number < 60)
-                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), maxSize, wrapModeS, wrapModeT);
+                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
                 }
 
                 return null;

From 291a91be6687c214072b510644cd0b2436b630c8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 03:29:43 +0300
Subject: [PATCH 1456/2100] Change extension from retrieval to post-processing
 instead

---
 .../Skinning/Legacy/LegacyBananaPiece.cs      |  4 ++--
 .../Skinning/Legacy/LegacyDropletPiece.cs     |  4 ++--
 .../Skinning/Legacy/LegacyFruitPiece.cs       |  8 ++++----
 .../Skinning/Legacy/LegacyMainCirclePiece.cs  |  2 +-
 .../Skinning/Legacy/LegacyDrumRoll.cs         |  4 ++--
 osu.Game/Skinning/LegacySkinExtensions.cs     | 20 +++++++++----------
 6 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
index 9f99e3a586..c6f32e2014 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
@@ -15,8 +15,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTextureWithMaxSize("fruit-bananas", banana_max_size);
-            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-bananas-overlay", banana_max_size);
+            Texture? texture = Skin.GetTexture("fruit-bananas")?.WithMaximumSize(banana_max_size);
+            Texture? overlayTexture = Skin.GetTexture("fruit-bananas-overlay")?.WithMaximumSize(banana_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index 63be1bcf91..581259a9c4 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTextureWithMaxSize("fruit-drop", droplet_max_size);
-            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-drop-overlay", droplet_max_size);
+            Texture? texture = Skin.GetTexture("fruit-drop")?.WithMaximumSize(droplet_max_size);
+            Texture? overlayTexture = Skin.GetTexture("fruit-drop-overlay")?.WithMaximumSize(droplet_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index e4d25e036b..eacda1dc64 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -26,19 +26,19 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             switch (visualRepresentation)
             {
                 case FruitVisualRepresentation.Pear:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-pear", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-pear-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-pear")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-pear-overlay")?.WithMaximumSize(fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-grapes", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-grapes-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-grapes")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-grapes-overlay")?.WithMaximumSize(fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-apple", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-apple-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-apple")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-apple-overlay")?.WithMaximumSize(fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-orange", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-orange-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-orange")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-orange-overlay")?.WithMaximumSize(fruit_max_size));
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 45a18152c2..18010cdb2c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTextureWithMaxSize(circleName, circle_piece_size) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(circle_piece_size) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
index 33f85328fa..83f05fe6ec 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
@@ -48,13 +48,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-end", new Vector2(128, 256), WrapMode.ClampToEdge, WrapMode.ClampToEdge),
+                    Texture = skin.GetTexture("taiko-roll-end", WrapMode.ClampToEdge, WrapMode.ClampToEdge)?.WithMaximumSize(new Vector2(128, 256)),
                     FillMode = FillMode.Fit,
                 },
                 body = new Sprite
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-middle", new Vector2(2, 256), WrapMode.ClampToEdge, WrapMode.ClampToEdge),
+                    Texture = skin.GetTexture("taiko-roll-middle", WrapMode.ClampToEdge, WrapMode.ClampToEdge)?.WithMaximumSize(new Vector2(2, 256)),
                 },
                 headCircle = new LegacyCirclePiece
                 {
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index ad3b10edd3..dde6c1fa29 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -79,9 +79,10 @@ namespace osu.Game.Skinning
             }
 
             // if an animation was not allowed or not found, fall back to a sprite retrieval.
-            var singleTexture = maxSize != null
-                ? retrievalSource.GetTextureWithMaxSize(componentName, maxSize.Value, wrapModeS, wrapModeT)
-                : retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
+            var singleTexture = retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
+
+            if (singleTexture != null && maxSize != null)
+                singleTexture = singleTexture.WithMaximumSize(maxSize.Value);
 
             return singleTexture != null
                 ? new[] { singleTexture }
@@ -91,13 +92,14 @@ namespace osu.Game.Skinning
             {
                 for (int i = 0; true; i++)
                 {
-                    var texture = maxSize != null
-                        ? skin.GetTextureWithMaxSize(getFrameName(i), maxSize.Value, wrapModeS, wrapModeT)
-                        : skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT);
+                    var texture = skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT);
 
                     if (texture == null)
                         break;
 
+                    if (maxSize != null)
+                        texture = texture.WithMaximumSize(maxSize.Value);
+
                     yield return texture;
                 }
             }
@@ -105,12 +107,8 @@ namespace osu.Game.Skinning
             string getFrameName(int frameIndex) => $"{componentName}{animationSeparator}{frameIndex}";
         }
 
-        public static Texture? GetTextureWithMaxSize(this ISkin source, string componentName, Vector2 maxSize, WrapMode wrapModeS = WrapMode.None, WrapMode wrapModeT = WrapMode.None)
+        public static Texture WithMaximumSize(this Texture texture, Vector2 maxSize)
         {
-            var texture = source.GetTexture(componentName, wrapModeS, wrapModeT);
-            if (texture == null)
-                return texture;
-
             if (texture.DisplayWidth <= maxSize.X && texture.DisplayHeight <= maxSize.Y)
                 return texture;
 

From a373d71b3ebe021eca147a220f728ad8372d87fb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 03:15:37 +0300
Subject: [PATCH 1457/2100] Add basic test scene upscaling all skin elements

---
 .../TestSceneGameplayElementDimensions.cs     | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
new file mode 100644
index 0000000000..20e6e5658c
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.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;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Testing;
+using osu.Game.IO;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public partial class TestSceneGameplayElementDimensions : TestSceneAllRulesetPlayers
+    {
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+            // for now this only applies to legacy skins, as modern skins don't have texture-based gameplay elements yet.
+            dependencies.CacheAs<ISkinSource>(new UpscaledLegacySkin(dependencies.Get<SkinManager>()));
+
+            return dependencies;
+        }
+
+        protected override void AddCheckSteps()
+        {
+        }
+
+        protected override Player CreatePlayer(Ruleset ruleset)
+        {
+            var player = base.CreatePlayer(ruleset);
+            player.OnLoadComplete += _ =>
+            {
+                // this test scene focuses on gameplay elements, so let's hide the hud.
+                var hudOverlay = player.ChildrenOfType<HUDOverlay>().Single();
+                hudOverlay.ShowHud.Value = false;
+                hudOverlay.ShowHud.Disabled = true;
+            };
+            return player;
+        }
+
+        private class UpscaledLegacySkin : DefaultLegacySkin, ISkinSource
+        {
+            public UpscaledLegacySkin(IStorageResourceProvider resources)
+                : base(resources)
+            {
+            }
+
+            public event Action? SourceChanged
+            {
+                add { }
+                remove { }
+            }
+
+            public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            {
+                var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
+
+                if (texture != null)
+                    texture.ScaleAdjust /= 5f;
+
+                return texture;
+            }
+
+            public ISkin? FindProvider(Func<ISkin, bool> lookupFunction) => this;
+            public IEnumerable<ISkin> AllSources => new[] { this };
+        }
+    }
+}

From fc1a39ede3f713ff3bae8e5a556db9515042b675 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 03:57:22 +0300
Subject: [PATCH 1458/2100] Add size limitations for slider balls

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs   | 6 ++++--
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs             | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 2aa843581e..145a8a50af 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -7,8 +7,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -46,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-nd"),
+                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(new Vector2(OsuHitObject.OBJECT_RADIUS * 2)),
                     Colour = new Color4(5, 5, 5, 255),
                 },
                 LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
@@ -58,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-spec"),
+                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(new Vector2(OsuHitObject.OBJECT_RADIUS * 2)),
                     Blending = BlendingParameters.Additive,
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index f049aa088f..8efe77b510 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -20,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         /// Their hittable area is 128px, but the actual circle portion is 118px.
         /// We must account for some gameplay elements such as slider bodies, where this padding is not present.
         /// </summary>
-        public const float LEGACY_CIRCLE_RADIUS = 64 - 5;
+        public const float LEGACY_CIRCLE_RADIUS = OsuHitObject.OBJECT_RADIUS - 5;
 
         public OsuLegacySkinTransformer(ISkin skin)
             : base(skin)
@@ -48,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return null;
 
                     case OsuSkinComponents.SliderBall:
-                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "");
+                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2));
 
                         // todo: slider ball has a custom frame delay based on velocity
                         // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);

From f963a921dbc59c267c9028eef5a9473cc2af3601 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 03:57:33 +0300
Subject: [PATCH 1459/2100] Add size limitation for slider follow circle

---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 8efe77b510..d176041015 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return this.GetAnimation("sliderscorepoint", false, false);
 
                     case OsuSkinComponents.SliderFollowCircle:
-                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true);
+                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: new Vector2(308f));
                         if (followCircleContent != null)
                             return new LegacyFollowCircle(followCircleContent);
 

From b823507b2a96a06f8306d522530124494a5a0f4a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 04:36:40 +0300
Subject: [PATCH 1460/2100] Add size limitation for approach circles

---
 .../Skinning/Legacy/LegacyApproachCircle.cs      |  4 +++-
 osu.Game/Skinning/Skin.cs                        |  2 +-
 osu.Game/Skinning/SkinnableSprite.cs             | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
index e9342bbdbb..cdc61ebd9b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
@@ -5,12 +5,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
+    // todo: this should probably not be a SkinnableSprite, as this is always created for legacy skins and is recreated on skin change.
     public partial class LegacyApproachCircle : SkinnableSprite
     {
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
@@ -19,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private DrawableHitObject drawableObject { get; set; } = null!;
 
         public LegacyApproachCircle()
-            : base("Gameplay/osu/approachcircle")
+            : base("Gameplay/osu/approachcircle", new Vector2(OsuHitObject.OBJECT_RADIUS * 2))
         {
         }
 
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index a6250d7488..e8446d9ffb 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Skinning
             {
                 // This fallback is important for user skins which use SkinnableSprites.
                 case SkinnableSprite.SpriteComponentLookup sprite:
-                    return this.GetAnimation(sprite.LookupName, false, false);
+                    return this.GetAnimation(sprite.LookupName, false, false, maxSize: sprite.MaxSize);
 
                 case SkinComponentsContainerLookup containerLookup:
 
diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs
index 1d97566470..9effb483c4 100644
--- a/osu.Game/Skinning/SkinnableSprite.cs
+++ b/osu.Game/Skinning/SkinnableSprite.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Skinning
         [Resolved]
         private ISkinSource source { get; set; } = null!;
 
-        public SkinnableSprite(string textureName, ConfineMode confineMode = ConfineMode.NoScaling)
-            : base(new SpriteComponentLookup(textureName), confineMode)
+        public SkinnableSprite(string textureName, Vector2? maxSize = null, ConfineMode confineMode = ConfineMode.NoScaling)
+            : base(new SpriteComponentLookup(textureName, maxSize), confineMode)
         {
             SpriteName.Value = textureName;
         }
@@ -56,10 +56,14 @@ namespace osu.Game.Skinning
 
         protected override Drawable CreateDefault(ISkinComponentLookup lookup)
         {
-            var texture = textures.Get(((SpriteComponentLookup)lookup).LookupName);
+            var spriteLookup = (SpriteComponentLookup)lookup;
+            var texture = textures.Get(spriteLookup.LookupName);
 
             if (texture == null)
-                return new SpriteNotFound(((SpriteComponentLookup)lookup).LookupName);
+                return new SpriteNotFound(spriteLookup.LookupName);
+
+            if (spriteLookup.MaxSize != null)
+                texture = texture.WithMaximumSize(spriteLookup.MaxSize.Value);
 
             return new Sprite { Texture = texture };
         }
@@ -69,10 +73,12 @@ namespace osu.Game.Skinning
         internal class SpriteComponentLookup : ISkinComponentLookup
         {
             public string LookupName { get; set; }
+            public Vector2? MaxSize { get; set; }
 
-            public SpriteComponentLookup(string textureName)
+            public SpriteComponentLookup(string textureName, Vector2? maxSize = null)
             {
                 LookupName = textureName;
+                MaxSize = maxSize;
             }
         }
 

From ab5226832a70099d76ec6737e9197e5da707e74a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 04:37:09 +0300
Subject: [PATCH 1461/2100] Add size limitation for slider reverse arrow piece

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index e6166e9441..293df6b3a0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -7,8 +7,10 @@ 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;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -35,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
 
-            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true) ?? Empty());
+            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2)) ?? Empty());
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
         }
 

From 922f6f36f2d496b82f7550e02b997aba755514e5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 04:37:51 +0300
Subject: [PATCH 1462/2100] Add size limitation for hit object numbers

---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs    |  2 +-
 osu.Game/Skinning/LegacySpriteText.cs              | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index d176041015..2564dbf335 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         if (!this.HasFont(LegacyFont.HitCircle))
                             return null;
 
-                        return new LegacySpriteText(LegacyFont.HitCircle)
+                        return new LegacySpriteText(LegacyFont.HitCircle, new Vector2(OsuHitObject.OBJECT_RADIUS * 2))
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
                             Scale = new Vector2(0.8f),
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index d6af52855b..f021a99102 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -13,6 +13,7 @@ namespace osu.Game.Skinning
     public sealed partial class LegacySpriteText : OsuSpriteText
     {
         private readonly LegacyFont font;
+        private readonly Vector2? maxSize;
 
         private LegacyGlyphStore glyphStore = null!;
 
@@ -20,9 +21,11 @@ namespace osu.Game.Skinning
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(LegacyFont font)
+        public LegacySpriteText(LegacyFont font, Vector2? maxSize = null)
         {
             this.font = font;
+            this.maxSize = maxSize;
+
             Shadow = false;
             UseFullGlyphHeight = false;
         }
@@ -33,7 +36,7 @@ namespace osu.Game.Skinning
             Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
 
-            glyphStore = new LegacyGlyphStore(skin);
+            glyphStore = new LegacyGlyphStore(skin, maxSize);
         }
 
         protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);
@@ -41,10 +44,12 @@ namespace osu.Game.Skinning
         private class LegacyGlyphStore : ITexturedGlyphLookupStore
         {
             private readonly ISkin skin;
+            private readonly Vector2? maxSize;
 
-            public LegacyGlyphStore(ISkin skin)
+            public LegacyGlyphStore(ISkin skin, Vector2? maxSize)
             {
                 this.skin = skin;
+                this.maxSize = maxSize;
             }
 
             public ITexturedCharacterGlyph? Get(string fontName, char character)
@@ -56,6 +61,9 @@ namespace osu.Game.Skinning
                 if (texture == null)
                     return null;
 
+                if (maxSize != null)
+                    texture = texture.WithMaximumSize(maxSize.Value);
+
                 return new TexturedCharacterGlyph(new CharacterGlyph(character, 0, 0, texture.Width, texture.Height, null), texture, 1f / texture.ScaleAdjust);
             }
 

From 8e992de763c53230ef37b03a2c9b3807d81ff05d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 05:09:01 +0300
Subject: [PATCH 1463/2100] Fix crash when loading player instance without
 exiting previous instance

---
 .../Visual/Gameplay/TestSceneAllRulesetPlayers.cs           | 5 +++++
 osu.Game/Tests/Visual/PlayerTestScene.cs                    | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
index e86302bbd1..63fc4e47f9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
@@ -67,6 +67,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private Player loadPlayerFor(RulesetInfo rulesetInfo)
         {
+            // if a player screen is present already, we must exit that before loading another one,
+            // otherwise it'll crash on SpectatorClient.BeginPlaying being called while client is in "playing" state already.
+            if (Stack.CurrentScreen is Player)
+                Stack.Exit();
+
             Ruleset.Value = rulesetInfo;
             var ruleset = rulesetInfo.CreateInstance();
 
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 0392e3ae52..ee184c1f35 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -12,6 +12,7 @@ using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
@@ -79,6 +80,11 @@ namespace osu.Game.Tests.Visual
 
         protected void LoadPlayer(Mod[] mods)
         {
+            // if a player screen is present already, we must exit that before loading another one,
+            // otherwise it'll crash on SpectatorClient.BeginPlaying being called while client is in "playing" state already.
+            if (Stack.CurrentScreen is Player)
+                Stack.Exit();
+
             var ruleset = CreatePlayerRuleset();
             Ruleset.Value = ruleset.RulesetInfo;
 

From 8f5d1b57a38365fdccad24db4206955375e9bc27 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 05:21:19 +0300
Subject: [PATCH 1464/2100] Revert "Make gameplay skin elements in
 `special-skin` awfully large"

This reverts commit 2c81fe5613e79e2e9370f19d40a1839e28a20c45.

Not needed in favour of `TestSceneGameplayElementDimensions`.
---
 .../special-skin/fruit-apple-overlay.png      | Bin 26684 -> 4677 bytes
 .../Resources/special-skin/fruit-apple.png    | Bin 26685 -> 4677 bytes
 .../special-skin/fruit-bananas-overlay.png    | Bin 23898 -> 4949 bytes
 .../Resources/special-skin/fruit-bananas.png  | Bin 23899 -> 4949 bytes
 .../special-skin/fruit-drop-overlay.png       | Bin 26684 -> 4677 bytes
 .../Resources/special-skin/fruit-drop.png     | Bin 26684 -> 4677 bytes
 .../special-skin/fruit-grapes-overlay.png     | Bin 26684 -> 4677 bytes
 .../Resources/special-skin/fruit-grapes.png   | Bin 26684 -> 4633 bytes
 .../special-skin/fruit-orange-overlay.png     | Bin 26685 -> 4633 bytes
 .../Resources/special-skin/fruit-orange.png   | Bin 26685 -> 4633 bytes
 .../special-skin/fruit-pear-overlay.png       | Bin 26685 -> 4633 bytes
 .../Resources/special-skin/fruit-pear.png     | Bin 26686 -> 4633 bytes
 .../Resources/special-skin/hitcircle@2x.png   | Bin 295339 -> 245645 bytes
 .../special-skin/hitcircleoverlay-0@2x.png    | Bin 87032 -> 26595 bytes
 .../special-skin/hitcircleoverlay-1@2x.png    | Bin 119975 -> 40858 bytes
 .../Resources/old-skin/taiko-roll-end.png     | Bin 2095 -> 0 bytes
 .../Resources/old-skin/taiko-roll-middle.png  | Bin 140 -> 0 bytes
 .../special-skin/taiko-drum-inner.png         | Bin 1926 -> 0 bytes
 .../special-skin/taiko-drum-outer.png         | Bin 3749 -> 0 bytes
 .../Resources/special-skin/taiko-roll-end.png | Bin 14570 -> 0 bytes
 .../special-skin/taiko-roll-middle.png        | Bin 4791 -> 0 bytes
 ...ikobigcircle.png => taikobigcircle@2x.png} | Bin
 .../special-skin/taikobigcircleoverlay.png    | Bin 66280 -> 0 bytes
 .../Resources/special-skin/taikohitcircle.png | Bin 12374 -> 0 bytes
 .../special-skin/taikohitcircleoverlay.png    | Bin 66281 -> 0 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png
 rename osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/{taikobigcircle.png => taikobigcircle@2x.png} (100%)
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png
index c6e27996b92328a0c6fbcf3fb9f4f6b6598bbdfb..fe567d158d0b47f06c39eca9d055b9c8361b040a 100755
GIT binary patch
literal 4677
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
Hu0mjfgVw2;

literal 26684
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png
index 6a862572faca191c265bd1bdd76283c08fdab790..17f3be9c262953cac52da794d601bb853d8dc276 100755
GIT binary patch
literal 4677
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
Hu0mjf9r&r4

literal 26685
zcmeFZWmFv9wl3VbyIX+9-8Hy3?h+(4(6~#0KnU(GL4y-KxCL+A-3cDtoj~C7zI&f@
z_8#B;bH@1YzulvIRMlE@K6B1z&9$nk$E=D_SCz*=B}D}Q02m+z8BG8H=5-eafDHe-
zx%DwU0RWgDKWgi{Yl1zgoL!wPZR{ab?%vK2Du|bjB>>>HT$yF_fubof_{E&S2_-G;
zm#Ijx=j6y4hq~;$T5CgJ$C0hVksl@GKpNZ#?#ItBducCEd*b7}xGKs;yI<;lbuOA+
zedQ?o^n7$zP<P??bU)Ef`T2Lt!_)MY(7BMvi~7~0A*HydxN-lFalL~uw7G}pp8E&N
zcfMkezl+h@o$%{{6GTVt>OLI!Pghu{?Gm3IM|O2b;+i;bue?94T7P;b{e=9><napl
z`B{vxq6t?VeeG-`@RvFA8EoJ)BA)R3`o{#>i>V7fj;#W;2V)e(hhf#67d~D0`q}$m
zQGO$al<(8UeOP|q(QT^9jpyWaKDD?U*i{+Lyqu5M_=OIsiBC)|#0mZ$`u*Eyyliic
z$8*ZOfA*ohG|sT){l$-N!~M!~u+0+TGd;V;X-<ERqPALF<8ghE_zd5k%Yw@k+rm$m
zN55>x+TQ)9ix7^s9I;i(d3E2btB)Lqac?^|<_MTovlmXd?k5_W9~;M1-PS8F$44$S
z&zjS=^*a6x_}&qXYcLC19TivVr`~b%kHqg?C!}uTc$yS^v)hOh|NN}xhvCIJG_05q
z3LbEaNLZy*!2VtU$D!=&H{F+VV*<dtn2+dd_D4F;KpTQsMcwrYp&PiUTOEkWh@bl_
z4RH`2m?M*{YgaYx>P5D4+zefr_e{X>h$Kj1BCN-I3bOReJSFQ#<Yh}mG8JVhmX#J|
zOUDZR%2Fa^yv3CmOjKkqnw?gx%InXt{a!S`Z0pp4Ai>kHs#spxu;x86p7OTyr?=!;
zPaNl#g5{2e9EHO*=zdgiX0&cpc;$Gcs=6yKMbE&aVXkQ<cslm&N!!Tx))PPE2E5S-
zhOfTErNv*L4;mIKJD(mx7gmq>K8qF+eNn5rn9&qt--KrXiS>ZjWWolbj3gv{9!7PE
z3R3rWcvk#7<3*yBFPB^|iQh!8Jh-ohokf2ZVV?NI(wUC?`7-mxNz`iRhttPXz0Oa+
z8j84is|K=JlQkTu9`EmrTdR!wPE#jBN0HqC3Vj|@cBV?tXkvkq%?xag!kAlDcMYPq
zX+i@DD_c=2AELiXlcI=3_Wk%`=J5s(&gCutdAp;!({97zx8a0vZBU|X5sB6=Cb<)S
z93`=P*pDqvYILIDIY)lVxbjbN+&zLHQb?r5%^P-|Q%8E(vvQ=(nd;6+ua4>V2>3Tm
z?-P`oS6d?~+P)tiiohjq^)%vHE%1GKOLxQHy{$OOmt$7P6(U9!we=0xh1ZlnS7dx;
zNNu5KXP$oEwe{*}X;E*-u}S8yE#1yG7LTR1cegZpta?wp-;+0WLwK6oY-5<EWR~Wk
z=gCR~A13)8Lv0X84q5Bu<KVbi2D`uWSPmoZ+(Be=7^Q<Tn&eb>=-0T>rq;%<iH{2<
z(NBZx1{A>fzECyYG(q|mgV8mc>&Akc_Il$8ShJO|JY?#OMp6E+8JAF~pbdUod`pdY
zwPkmUhuWC|4qx)HZi|ChXv@{$ouRTWbDs3McJ%hA`Z1<OTi{7H)UO?54CLsLG;Vtz
z%sPPRV^|?@N3Ze4xo~GqaqS}Bl%^TaAr7f4&B{R*32`Tz#@UJx@zC5NFats;#kZ1X
zOnw`^-9GQ=LzQRQ^^5^aIH)bYD-=BP!8>U^%xL8fi7kZy`e*pAY=SRFE@F=*5LGT=
zI^yXvb}RVZQaj=Mjs@=D^v90{apj^5zniDqG0*;(L{yzN@MlSUJ1(ei<EIUr+fytI
zbVxw|4$I*Mh8HL`)oH8<tG<qes~&kk7?l{8AH`5B7D_hy2I0J=Ctv3izjh%4xJ=Zw
zn}f5pF9*(QJ}Nqog`8|1vSA=Kf6%lW+l?M{QUYfuOCgMq?<XuLa<sZ(F797K$|YdV
zFu-ipCUJ%zSc%9{bOGq5XbH2-u6uaUB;GYBOX8$xM;o=Wr4_(kIwo`lkdtMQ*Ja8@
z=i>@<tdJYW_k}9O-BX6|eklVf{+sw?Gk*mv0ctntP&Fo9J>aaJN>3n)vjMUzfk@68
zZtQg-)`$U-sqzj0?=W7VDgwe-ukbx#cd$NAZIZ=?kQy!KN7osct~7c;bTs)&MCXl|
zOUZ{~BTLEnqBZ4d-xsTHL9%1fl(<&KbmEZrt<Y>;ZDyyIU2$h=7db*SO(pH|nq<)D
zViVO@zqoLAfkW`BT#)>aVDsg(__lwDevM-dq%$yMTtHORFmxged@qBqN{O>bZEXh3
z>ERc`J#L=-#RJ#h-_y;3z-1}|U-zV&j<*P>UL!wF>~U+(U>yhsCZloN^#fa#wr}+L
zl>^^hi2COC--5~_H`$)0fV!O_=oq(0R##V83RPK#EO~MDRxnvqxWo-?1MjV+@OXJ?
ziC`n4g<HCbnS}g63#w)&DlTV3S{@zSKnW@g5R5rCZv%O^KJz5~3Sw%?+wek6x9*%u
z6Q;=01gutBFyQ!eHwx2(&qMo^ze{w141%DXiP6LaYF$87p+xSr5NCcjIvkSncWqQ}
z9sb7EWZpnrv^YeE<w>ku(U1Gs;+M2>$fye>Kk;zIzF8{B{^7P3<=O4(3t}!(Aj8RB
z&-8I?ma>NCd@t9~gsU1F={721^~<pb#LJ)<REL!(3A`x!McLqamU9qP8XlwNBV0Ta
z`ndM2Ps{h0<C8M5(}n2-nyzo<EvtTM>w{y2QlGyVid=iN^udj0oG?<ijbMy^6F$;~
zF*zqS3C985^CA#x1x75N^k)I#3q#Ia3H7#hFyafoM5j-1B~C(7Hja*Ufb%DXC?FYj
zp#?XDEZu=enWf&ZNzg=r?=`HH@buq}zRw5Gwd@ObS;CWdU(_+yBMlt46TQO?%$zq{
z$`14*<@JvzFt*0oQ11(qz>r4ld8ZkmMUK1)u}xC%?d+w*%xZ6f3)8v%F6ZIgDuXnP
zOzg0>U{aJxbLEyw*L{gdxlwj*SjH(JAp-5B?zIrT@E}2>j6}k8{w2eoL<7D<H$QR?
z+0?U8nUqBpI1+4ecC!mfx-yB1LmSTSm5j7wI3FI1QI{B|g_{whWt)a!C!BJkl@elt
zt@7tb-^X87O-EFVYQ~yd&&C`vCcFJ@rR&qV@vTiz2jRPJ43CAp@3q`1UZ6xxASl0(
zg`I65!<Djcj;h08)kTIsKmsB99>o$C%@VSTweDI3+o_IcNhpcdaLfxu>DOEMrMAi+
z?y?Fi7rvh-ULH_Xt$eSB=A*ljDRH+?a#`(wiu7Z2o)4yl2^IbWts-q7*_B+K-9Z}8
zWHbhifYRvb_b>XS)nCJvHIShFf{e$jl}HB6ek0D);3!4w+(2So1Y&kYLhSt{=jB7x
z$vcc7=3Jp4>}8JfxGi1n?xn!J4<1+J{#o@7>|6mwT8YymO83V4-PKqe8lNyyQ{%rm
z&kM~o-pu}L4p2A!nXV)o#HIk9(YODJCM2II328PBQcKKBc(RYz8eLJ)x<A;$RA<0p
z2vYN1b>oP}n8A*sBYvn6rQ7-0ay;5Lu|pcna)_c{1p;*=jJTD5z=_!qagw*d8;05X
zR4ainOiiJf3l}#_n_96YkmEk)KHRP)Q0C}YONau-2E;lrj#+hc63(JZM49!G%pXoh
zM*I%{B>a%HfSnJGql<@0^y6#@kEt|39c^=`=2cdEC*~edpIa^BzPbF-WO$2W_F1>R
z`PN<&AFCx-DpMvL$}(w(a!!(O27+*u;UhOb<k&r|#pjcR(@NrbH4W@TF4nbkaQR`a
zD1aQF66CcF%7uS21lw#>W|<mR|1_dJ-+bG9Djd*e4|gj?C@C`NzNipfR`jhx&Ll{j
zU{Qh}Q=_Exu>wYKPR!JUQz5xI<CCLM8Z{s*dt!GREwg0nCK2bpaF4%>6S+ihN$xR9
z(2Wn)MTDTW1bM?ekZ&&Xo9r4v9-Z!SGa8mcmrF68Rjcx$e>TA%c<oCaixf;bu2pNL
zG+1G+?5qH~%^}4IOe$D9YXc}5JLnLQLX-5{-%gueGFB4c8x!Vlb3;VdPm}q9(^%0{
z@5a*&Z$awg7S<>D=hActBg~MG<M&OvV4}H1RJE@j@WEOSMll4k^$1l+VPQa**s-tD
z>v|&9@D=cs^MTFU3T1<Jc*WJ`7fOp%bi{#X8<Zq*AeDgjbK0ZcjlR+joh}uH$6*%v
z7J`MqXB2u#NA6O=8tOFsfI~MbHAQEP+wdY7{KBY$Hz7fa0>Lvld>&c^sb;+DX!ng9
zto2-lnOR}}(RQ3DMFD-b^{t1lcqCh70DENnjVxN#<|b*!fPo<=rnS<jeMYD#&YBFn
zy&Y;9HQtZnU2ym`f}Pf53r#NJ&t#}dm=Z%UthL2jgpwo;!g+@)nm(!S?(755m#ru+
z>O>(qvrrUP_D(>I0ZOnrJy-(~4Oe#0pvG2F48V3uP+(nyHO9tXgj<5qB;-R}&A?6~
z{Eiw}^#<*I`*XT~oWTxb^CGIS=5#3sDy5D!jwI(>>pSa~(X!Y<kN7nBW#s0(-vQi4
zY9G5xa@?L+sfE{19N1XBNXxq?%0k*20Y0#^bg~%?ZJ3D(J3SSMCXFKqGiLt#%OuMo
z(zTcnkjELm(q*u#5#zT*E69#5S(<#fbTC!?ELs7rWM@;U%~*@$!es51Bn9Ks`^vCW
z7!K!<T1BnSna_pP%lL%zjw`USp!s{mSxvhk=^R$hHrpf=WSqs^IO9bn($Hz@N(mYZ
z-1-1g@CZ7IA#${#Qh~-P4$~kPKA#6liHa&fyz2$7T(_v<$LmEap@NA{;>H%GH7Xun
zuM-?VSAl>IE;s<of22zsN=Qw@OdL+GGtlVHu)!EX8kY6l*8LYC%2pvnHej>~4>q!l
z3~(h4zkLc2?8=lI#k2BC=1ge?Jb{eiwFmMBgSgT1fI%p63QA=eS|i`C1j?=$rewd$
zvYf6(@Gc5>R8KhIV%_tFs3qu8ed+P#<>{#!8*LV@ht&qoF(M%7KpSvWwe7lK)+SuL
z=_S6yHBj7*2#Mtu<z0!bzzdK}8#kq<&F$h0yq7=5iTnyWu0ZJic|;p29PJRok6pE&
zi{e}QlbJ$HzStVdOKuyu!_sPd7Z3@5cby-p?cD-P<801Jw4GSC{4;#D$sx3ix#>>-
zkcPRW)dY<m_D{P+Pj;ghbX=p(c?{Z!7+Ywfh|piI&5l3^mcp7~oPh0;h6;9~HID%U
ze|f*G&`v)JNPkr3I~tbw+`m1yAnV>GNd|*FtMSnpkvIr($R*d5)B|U$yj}c|y~970
zVjJmL1d7chI4C$&DEkourZmTZ&G4j<t+tK*+H+K+GF4DLofAjI#PZD~X(U2w^>ddc
zh#rMhfnijX9UJLKEPM2pp#)L@>ZR=FK!|;j1q~}0bH+4s-cv7VHv{-QDWJ6{;r*1h
zwe_cP?WI?$!<44;(E!658TW$dy>{U=#nqGx0n9Z0Ib2jP`W$9%!j4e&Eop$@oz!YX
zdLkc!3!ZIDc(_Fge>X-05&*_a`|aV+Luk}8zjhv~ki-w%H9Tc>3nWF<6wvWF!b&A7
zSlV(iBEivz=}YUI8d6)nZ;tTW8Y{JdEZVN%g)t{)Nvn&GSU>$U<picQtiI+0(vjXu
z5J~P<n>WFimoC=_sP@Ai-Bz0mmVU*Vwd7OaJI52`oaK@MEgJev7}|NNeWK=TfV)pl
zRSL|wh0`%PJkdWw)c&=?v`<6hIF~yXRSmteNSO{OF=8YtAp`FOW(+G3-0*GSS)g`1
zYf}t%WqHU4Epw<uVMvCerjCvG;8=+dA{*cpl)NAiZjb}alKdJZ_#|k;7DL|!aIcY0
zlE?1#%WJXvPT~6iFdII?#KL1Udgs6h=8~XtZfo8VZ*DND(eAxjW*F{RqY%u|yci5n
zmq=CLWSu0c`f<4fjZ#u$PkVr!$wVhgWzW;X8Y<`1FT~fhoWo$y^`QonYvO*FHM={&
zd>1b$rNW2KGNleMkd?LG0uqi%com30)xpSI93UwU{6v`kz*vGJ<eE~!O8_TlVLRW5
z+d$)jC(*oIWt*7L3w1#5X8w$pxvRALM8MBQL4AIVIQUMQjP{=7hFn7d(~ozq@3@*x
zTiCx_k%NXIaW0Pu3{34o(7~av!eluRnwa4y>m$&8U!k#noQQ~Ue3JQde&QrEf-s@3
z*8wN9?VH+VH{vxp7_D1l5N=bZagY50fi*Mv2G<6vy{M)YKzK(h*urW;=y0q8h~)B0
zlJ!PVorIE<q%;Q!5>}8Vw6IIaVus4x(%%DsOfQhI+qj9{9Fz08y_6d4iVRO@=QDPA
zP7IwXVcpufd@h}VOs|L?!XqG}W9tvYL3P5sP@sk+U4eSHbfW08M%$+4S|ixOrK}Y5
zJP=4&?gF7KY@8k^d_&h4gV8sIEbsmX2!I#4Ih_UMPtrGIUy7BAicsGgjee8%kdi<L
z;%*X)JY>5{_+y?R;w|nVve2)&HOiSCk~t8b9_wh8$UvxeJU6<{E}NN%U5G>IP=O#k
zDbLN-P?H}kYx>G>5rUb|tF4+dm?O=hzw5v9Mwcb^(@)ZaFvvQNuz6X0231XMZ_UqK
zX909<T^dG>+VykdIJ8lvBm;jE)G$cjT`Wxz3IQ`c5zq$LQB>X$rf``egnJ{u{S62e
z6Rm~=&~Wh3EthcF74sV*(jCW6u#O$&J|w{0|JsVAl7yN_W14>y*~P3%!qt<*R!77S
zi{({PSjej+Eko1aI2X3ld6`<V5+6B%`-QS>Nd|id7w+P;JUp;YUvA7auP8PjoUgcS
zIU7nCa5%4yv1dHXvU94ye+sXRJ6k2n12N7dkljkFaMK<uePHj1^4Zi~^og1k8F(x(
z4xyI8MH75>T=LMT$An91PUMG2@6-+a*h^jhIk+wNcL8kttTieYqN$9A+oHBK2{J6e
zE6yJOUTbp$TF0*SmUC@V;S)g!f@QzG+xkO^e{t)_LTgLOqjlQa2glvdf6^0Ue)eLu
zNV+b4PphI<562LT^$33p8^isrCKMF-3!mw|j7VP{<J4`uAm?gLlJGh32F?J8gBWk+
zpx3R!dhRS>EmerWRl>^>Ok`S;ue9xW8N-c1zqWivfTTa&_~xd+oZ%oLw)b3rq>h)-
zHblx{I^uALFIE8TPIuSFVIH*XQMOa>|1=xg#*$tVBVB-kQdvCK%Ja5*x2#d5Ax4Qi
zL5A^D%uvYzZj5gGyZi8Ee1ZlQ4YU+z+kvqoo7xz`Z_dTPz($0L{K0`Yh?R@s!bJmz
zel_F>SlFK!zciOgLw6tSRcZPgkhUl@=<NM1Ya$Ez`46ol?!Fd@I;_1bTD9tC)0^~F
zJJay3#nwBNgobWh94u_YUd7EIXv1IsblAtcoW(@uTWsP^#!`?Ta(8%6$1#Z2=Cx$v
zD}^a=!Gf?0t2ihrY@0Gs7$`f#AeEO1e>Cg;f<PJY^k7yJdSma&xUcVq9TBCjv|I?i
zNFj}2N?wzX(XATSTuGmv<g8DT!_m0?S+cEG6pFaJ`68Q`w*G<uOCDsFko42Vp`mx{
zzI6eX1$`<^tt<#Zs~3}djV&cJrTTi8pBBCwJLGT(`IB;qjj(NogDpW$<q!dyl%~j2
zuvQr<4x9syB)E^o%GA?>n%Xke^u^+g`3ItS6aEzlVrz+S?bOdNQSN>mLa1kl0TB@q
zQ@dSMzMxJ8uf%LHCVyX4!W>k;VFc7;s?gHTn$zG8Iv-w6jT8Nj^GzC;M{+|ew`M76
ztc&`9S^H!ETq1#`nG+@qpO6x3MC7NyVa_n;l0ry@MH7GActn(hTB{hx{jVHJK)VEd
z-wP4y^q;p(hpNKK^;XNWm8))yzZW`ZBN~wvGG`wG(GPUa>?+!;KAIGy`mVmb|7pTa
ziFnU~W(@b#Upw{^6(Gjpj&Y79;Q99Riz$td&c({s(@)I3@#Q{~<ey~Th_Knae$r0Z
zyJ-g~?f6q`TS<e+%>h)1X~@1|e0ixhT9&+01&&z)E(ji9r;){ZxxU#FM_xptB;)7S
zQ{M}0$G0$EGHh?aq$n0g^HdOWrkz@5$+@c4Oe8BeFYX4E-IyBAH-EF-2zJ2y4vci1
z>&#syRx!QF4^R&m0AdsVV()_L{)DTZX&@dCRDiAKtRZc9jOho<!hK+ANK&5aKhll+
z^6r`A$;t071gl=MfEV30ud<)Su6-?NoRl`dOdC7Co6O#+D~ecHiXwY;ZYRv80W%SL
zP3!xq_N42DFFc}ODG%Sj5+m|kPScF1uC6D6=qJZ`*z%^l8*Se6Skh<h`c+4qP67uR
zeMR0|-TIYFVed6elPc%wHw_FiQ$ZgLXS1`Y*yfCU{c$lrhb}RkIL;w2@Op~b8N(d=
z;ElfV+$y+(S>~=cl-FsNSb2-yv$rVwb$ACC=Asj~-q?+XzvpL$+=gNT`C4ol97ZLI
z&a{<PCHz5b33*m)d8Blb?fhW3-@Ddj5h{&vWef5ja^_Z??-ubA_Ms;erANg~j}<68
z5+Noj`A!TGB`Q{EalhD<4di>!Gczi{hDazV%T+`1(ck}=ZTOd5vDn~a612-cX+lX<
z%%u+J;E_`_xJ-3$2-YG)#Vj{Ez&ENi09M;_@uofjLk3Ty;9xs{rEP^poD+DmETs&>
zT}PbPKNjkOb~=+{s+~FpH+BdU77Blc3c#SO*op9#oNUU?`|!@@O<nim%YQjIE!loQ
z3jfk$b(P5xy!>WUZH(kkd_z-|b&{WctLc=PTx6oPw?3;%myBZRF7nsq8*h2mQ&~oJ
zyj7Y&dXEr4!&PDfydsH&QaCnPm7c8G&5A})FZLH?anKBIb1oo=)B@GkV+5fCr>5ET
zSLG>Az0itGWO6ug;wBW7jZ(kal#4m}rzAZ(rjXjNeti$#qav1DXD&AMO<~*HyBK^r
zcHT)upQRJ`nC`P+_Kf{Ft%gq3^MG*}v2re1(`qVy!j>rX6E56EgqY^&PB+^_3*C#V
z=<m}Vl{42Ar?S-LaPE#HdzcI#4-!j35*Mx}C#X+0X+v~&vogS5;~0a$%GJjAm>Kce
z@5qGx?~<^m;e)?b&ee}bAjj_6yd&kKGS|x&H69^vabHtgsBQ8v1QNen83a&jTd!qz
zuZa5@B06Tit$VsfcYL`wclAo*A|NF>k6Ja7PmYaI$T>avTHJH?)+0@9S)KvQmHq@M
z^c@E?UMExD=nsF!X3(vh|JK<q!)P2FzQmkh#`U~6ETALqt?+D=9Jc=S$)ao-shkD_
zgG7jE@+bdy^mQ_PFyW4#fxl#>3my%BP31AQ6^0|jx{7H%8P?dwl;@Go@n01pquI*U
zQQu=9qPZ{mrPD!E^pEjIVdxt=%PS$N1@H2SZJYCleh_ZidwPX_w4oXuWMF`^HBmpE
z_hVOI^UhgE0$j265|ef?{#2v>HF=v`C2S$7O>(nE1uL&HSBg$*QWv8ppE&$Qb&!Eh
z)s9rE(~r^CM&eRuYnFAsIetnAW-k+wL?hH;t#m>7?sBA?VI$S~rpSb}quFiYy&7Fc
zC#ljbPB0^%^P34KuW0~neMFv6DX~>-!a9q^dLuCzVm!+*zXI(-#b=GP4%ES-KeN#t
zNj9Y&qSl0gKUSTvNI8R1$lm9?xmGWxE3?Ua<E~qx72N`6s;?APurHhCu>Pn(bXOG0
z!&v&|vvW0$O3M04bE&jV!77_d@3%(7-#^u}KJYsvEqFT~YOt0VYXnP`3h>e+%|bQD
z$D8p-%2wphg%0W?EoFBdsg~D%n&_Jzk-|~i)dzhTkSKxoD)YJ;4G^TLyXYJ6ygRWm
z7DhE}4aa~W_{ZOAyB3lUVq^vYgY>&tT_;I!O|3G?lub9@9_5^J9LZ<fE+hhIXaJ8T
zm1w#Eo^U$vT9cl!LLVXwu4R5(QlF3%k+EU9Met6OK`Ehd;pvIaw{PD?GydE%xBl2a
z)Cna--_742g?plliINvIF~JU!9imsI!p^t_GBJjic6;)%k(=6>GEM2CI)RXhi>c4W
z6lSg+2=cCIn;5S>q7gzhb?gvaKg+vq7$~4m;|!tM%jq*jl|4E0=Ic=G%i=hk`-EXG
z_)jwT@j3wK>gNzKmklU;H-F5a7`PGjLO*yiJY>sk7#j<7j+$@(l)1JmvBit`B)V`Q
z@5~Hua`8Qrj4_|Zw43}e{Bt<DZ?kXH5u%##wFJlR$`KN)`@j-gTsbO2dMs_2&LkOG
zQ$e~#dYU}!GO>1epZA_1!}|_Cr+qFbL&xKD@!X{+hDr?S?@Uaml|z-VCcC+8`)1?v
zZ&OzkwEVH-PbiWNnHlE^y9nVsXgZPw@Z+}81ne@pw(M$JK{=VF-MzJ0h~0>!2bjhF
zLf90w)Q9)x1#1>%QLyo!-4&W(aHdJvP4Wq!DT*$~t^Ib#H6>5?a7_Y!ytNr!A91a#
zM-V!7`2iWwW=R~BXg~E43)4q@n1tO`C++kRVYKbPQ7f_O2pn6N8oR&p&v^KXbA@-C
zo&f|pdsGy%?{|<&o<CH$P%5BZd)YiIXsbWkuHofrHH6Ks3S&q_AHfrMdU^y<Iqp9*
zq3t^sFYO{5aQ*h^I0reLRDL2kjUfVKvD>u%7|YLxbv(h7!w4FIH^|{}g|2V%x(Ps9
zr5v6nw_zmd6>iWsM6T2?`o*b3){f7fVvG=#mDk2un>8P@IyBIlSsip0LPq@Hh8S>K
z>eCzD*A$r@N{JMV=}BOwl!;yQFlw?Za#mcF$V9QX0$8N=`pB0(1ckjN(qh~-i=8nH
z8@dAcnT0i)!S-6k6+hDW%BOZ}KkTKn!(LIjl%wd&bOVmoQ5Gw-mRW27x<eDwMm!Vn
z6_z5UqMl{>zu&_9#I@VB9SOe0ZkY}J_SHXJU)Jy_Fk?=uC@#`oT}O=|+*ua^_alaO
zpt;)st8Zj~T#+6XH(Nq|FV>sjpq&6C5Hiu=GZ14uBs-wqtZ94*(W`NHD)0l@nMlT)
zx_If_XShj&w?b)2!$DReqivZuA}OkwqQXpRyocvq6&b_fJ3R9fdn3<VUg-}9zUhrb
zd}Rl@FQf?9UMLjT%CNDy6xdcdpf22cI1aAg%CMwJZ&^qY>J@^!oJuv}KeyPwH~TYD
z0et!xcOT7+s=#}E7tQR-hus%%<f-d2-dapL>%UO3<@r{8_d#k}%~0Yj%kq+x&~KMF
zL@9TNr<kPjOU@Bb@d4k22OUL!s1NOyMX;4BuS;u5oRunmkgD0{c!Zf5tnRkToqBvM
zm-W$44J&H;x1?=(qT*wv1nb`eN}-nrK{aI`^p*~W;J;%x84$OYlxO$KUWyfD><TM{
zz&yi$6s@cOgdH`qWcB4sE3G%9@<V#j&F$|nA3}&DEj;Y3?-^@c5@K`ag1}2|;)SRu
zg!^zx6sc;%$~L*>ZbL_LBD(KsGr8rA_@Mw~KOnk6!`;ya(+tw0xPWn>Ln~O+nbS8X
zHp#4Pi+cA}eiE@KB-;kyCgO(5-zgm<cU|5?o#!p7GGbLylR&f)(aR$CIh1tsj{!M`
z_JYf-=9zkd-H0P#e6>_Az;^n%R8P~+RC-(eqo4mb_Cswy3FQ(EE$J8^lf%c0m+2Z;
zH!QSI%9UrnNTGcMDf*_rkS8WBRjYqBeq%V~)i(9$f9FP@_odS&8t%;spD(h;oGBx#
z|4~#3&a5+RCWj!R$~v4JsUX)QMd!i?b2#Z{weqE*J=RQjf-lWhOPpki_d+Azf+%pw
zjAS`W3ZTs^#U%OllrL;T6?s7qm=PIjXlW<u0bflk=}*tlD;jY}-om26+Pp9H9qpoz
zS$#XDEUL6os_qGAWB(XefVUe(!yI<3A#V`2`ayqFf~(cJq+-4Y=BL%d&S$@Y<Aldp
zMKm(Q*}-ovRt`uSA*T<{D&gzWnZl@OwjE*oVMz*(lwtf0Upohp?c8nghAht*=h?Sz
zt<k<(PCqEtAWF8!7TR4OiOB(U@=i9a3{iP(?D13DEhJqlptBys8nj5$(gAEb7{ZMF
zlE{W8)`!6H;7sZTXHIcF;$_Ahf?)VSo^j7R=Zesg+HpDFF>`#1H?TjRWiC5+?st(A
ztAP87u~aR0<kRy^wap%wD5HbliP%z_uWVyb-@%eAu<4g0A;^p^Qr}NB8y+V{Yxv*_
z8+nEy@sY#IH>fal3%~P!Z+mMUCA3fo($tII?wDgMOaA!OB!;<gP;WT3`2#da<S`Yr
z>X&WsBfq9`sNs~CDBV9sKcUfl_6_N?Ehh_-xYahfLeSl|8$V``-L7q?)%KHEsdclA
z)i!#GqUhu;BH)HRmWJN^5FU&3)9gWnSvPVd;E{g4WKPw*Q8=NBKBD9i#x^4JcRBtP
zmp(?P`jOtTw!P>Ww6q4dK#|xbfcTxKJ}$q53XTw}{J_(|N7aF)Qmw@OKp#O&jqs0e
zHbu!7!XaM?K4T6T_-Tc04|5t|yeLvkJ=7iD$xPOvd*gLB`7DB=c#`{tU#(F&e}VS;
z9_Ldwp4)-cwYyy7^%JExZ|}Zb5IQZ*=}wX-w1xIfY1i?cF8<VoO9=TchwRj_Fgma)
ze2=0>A6$<zeVV{=8ECfu)e<7Fy8_sS6okUHVzxs`D&Nf;nnU|pJ~>{cK#}2ACR(OS
z#~Xw{+^v=@R~If1v}kl-K%bto$mX=j0|PGjMFYET@(N1g$yu_)2<c_94=mPaxV7(i
z9iqLP6b`3B8lI1}<<Rw*><iO5VvS6IX2)r+<78Tgl5~*~6~WCUCUSD@gXz*9m-5{K
zt5z`#3ibA*r&UiLI|MJzOSf3Iek`GXDxFjp_WL_vdhHm56rv}Od@6@iBahKBVeY)_
zvc%ZgT5es`CXu<63rbPUBxj<hnrBjQ&(7GotR7Tl?g&n&9-__G%Zv&vhky-=vzRFv
zs+yL7uVqhmqKbe<`Ie7yCJds)a)6_=DLdRKTZqSHhOLL1N%;%f<$l`0Ud?&B`>Ac;
zo_=#InySOXxN>`JJ}ugBPptcEzv3y(Ep&<&I=y+`yR>x6gM}I3Ouzap>y+DQw7p(_
z<6fG9sJL_3ywAh9-%DtHhiJ`{teU;M=x(lZk4l@>Z<Z;2=s>z3-?cQ#S-RiU4qD<w
zx}P?;KodT6nSr>j>*=f}-Qybm3-+w3(nr`Re$3ng<kn+e#9&q>(nBOSP+UFFO)h?0
zU^b9eOJEivrGO>wlhbuMhWe;sIz~xwt4%R5P1wB5lgi5L;_}|4c7u25T4Z-e$Vl5g
zLm7!v;d22u0u6cMIX?basb`_-WRa>|g{3=%0#@3!0xjK1?&63+iFWSEl|P_w>gPE8
zMbk$%X;C%is#pwp6_~NSQ);v&T9+w@K(4z30^uizn`_jaz>{ymm374O8F6Ld=rXWM
z2>@)R0y*X%oSGEd3`r8nrB{}TJQPC-1=(dVReaC;_=v7Gw$fT5f<HA*j@?H?>}8|k
z+biC<B2yphCjvAB$wj~9icH{iFS0MZUOHM(VDuG;od(IsRA7P&U=Xi8VN^-A^(N$d
zego=n=htAax1;yQ{k$Bp6^>r^zuI8e{ydmDn(Q?HyjwoB^dK^eFlu-!7E&ZqSN{=K
zr$e~+C=a}Rc4{lI&mw(K&KV#wXQV)J@TPbc|Hk{x?YYrO%ltsf+EJTcODg9__I@{l
zlvDBV+k9pAT%^@4vrTP2EuQk%F5lk43D-KoDA-0Ekj}P_%eaH+Y&)}S!x%g?KOXjy
zXOojY{45kJW%G|-qa19XDeV6W=2D;;)A)QBfPRO<%VN!Y<7S~>kLPv2ZNT8^_Eh()
ztPW{M$BQ;nwfVq(60g&_kU0jaKr75x+A@{zwL}f%(=UmRFA5)#AsIZz1`77m$xtwF
zs4zD{8>$;bxEWA^;}V`za-VX-5QM9UEK9!`ML+;~+<`%9@UkX+qfcUlaCrrZE|gK=
zl8k$qV$GaAvtVV1IcbtpbFTV^`~frT@0|d^vgwo<+8c?xu7pQNm11G{+{<if<V8~~
zQL?Ti1no5yAqiSGX3RM_5{}`>u6kL9G!|uclz{1}nnrcT__M2;w%9SL@T*7P3fG){
z&RyR(akAZWAc!cv6ddfp5tG;i+>h)YBug>1ecQ9mpo@pL+_!S>rzSmb@<nYEN(YGC
z{g497x9Pgzn{wIEl6EsD%%Sf*Bp;!#TWlk)BQ7u}zGiioWmD+PjR>Hc)P1H79eO2F
z?XEWat8>L$WDijAf^^`w+uiL@`C91-1GJHrRtHH-|5q94Yw>5+*Z3O69(DZCPMIlY
zVI~S0+912`K2>%dYGeYl3R4foB>X54I!N&X!x!&U8fM@IOEZh$<NE%FDIo{>b6k(m
z%jYwM6%e%EXf=qp9ChIggCk6D{F01iv3@C!AQ-ZC)g~6RcSSI=uQcGrH}S{&OMWwY
zk(&<Tt}McQK=a#j*B)kmC#2_ud&y%N8^Va3-c}7#68=`d4CNk5HMh(L!B#<mPjme2
z3|U*7oMywp!I81NT6<~ikD950{yvIQHc}O9$~*)D`I@TiVfg_HO*VroWmh6a(K}oT
zsi0<>l;WYDr?b1|0fTm%hCOd}cn>>CNZi2rGxCx2qF3nLQE0{dSrgx=`%(JmjtjIO
zC+ezH<weo2#kAx$uSK)^D$2s<P7dr~3nw!OyO)FWYf&u#AR_MN3^uoexKo)ytZW=b
zfoH9qKq?yxQJ@~53a5&*G{o9Q;iD@=>!Yf+`A0i*Aq$|m7^;Yu@GF1=#2rlK<zVmV
zChR2&{2N#Jb^ots4j|RvBJOsgKz$W;DrqNI2o*0oFFPljte4FPZlD+{m58f_rLd-q
z+&>{+k3@mi?(WXQ92}mWp6s4H>`ty$99%*|LL8jj9NgS&uM%u--j42IFE&Rvn!h0a
zfguBNGk3LdcDHeIr1}dJZ06+QE(!#`_EY_re-6$nD*p}d==M(*Uio;fh;!!PV&~*=
zaNzh?4L5h$53eBqbm;%8;immsd(5E;adYx;HHXN4fH=C-{40co`G4y>d$`*F9gc-L
z2gDxY@G9!|YL)BXOv-~))c;%KFAA(|9Gw5wdL{ecB;9Q+|A(x9^X;#mzr*=gM_$$c
z8~5L&|10*tg<qvqRD@-m%su{c4<sWB{L8+ug_F6Bh4A0I5U`L1HxDNd8^1X>KO3)w
zg#a6v9}HoGfCVhLAm+ThoaQ|L0tIq(a|b(`L;iw#1!uQ;#o^}W6R_kG<YW`%;uL&^
z0CTc|Ey3n&5CLvph`FGdnYkeMzd)$D+Pr2Z*#2L=`U}e970QAWV!>r@Zo$TH#v{PS
zYsqKHX2vOC#%9h9h6o8*@Nt8=x&DT-Fc+3{a&-W|4yTO+*b2ho>}d6O$6tgCOR9rJ
zf!yqz|I?yw4|cbFRS*TLfX%7YwEm|@+r|N+<qrOfPA+~Sp4YG7>z1EKNI>X+gmfXU
zZm+5M7bq7eJI_CW{~8zJ*Jxgu1^<<(uK<5*yappI?Fs?AJGp8*IoXQ>|MH3IFU`O6
zn@Z##qoQEr_A251SIYl0>9rs(|2X=`9I&_fyNinI@4OWToBzXz8~6jn;%`H*djIG$
zw+1^}L0%{LKQrpT+HL+Xqs42^FJvjiZN|oFX2$zUF|QDt89xs<8$=Ld$;WRl1m-j2
z{daUXCrfuvuq#B;>NV2WXkIhu?`WtP|G_2Gzl(cXL;fO)lbeT)Q;3a|N1KyNn1@rC
zi=Ty)N0^fn$nnpJIsTg0{}r+b$Nz^Ek-r80Wg&Rg`$yaB0`t0Fas2m!^-t3N;_?6C
z=bwY||IorK^nZ-}ulW5BUH_r$f5pK6O87t7^&h(aR}B2Gg#VLW|G&|N`aick5XaZc
zAkWtu8ni*>sMnhzSTiMg833RxhKBp~2*p{!zzqOE!~5$81IWlCer-f@2dT&+?V-RD
zzQL}US|I@dr~n`tNo}v?ldm8r!=;9^&tZj&0=P^Gww3*f4xmOl0jAXQ#4^-GqBa1Q
zr?a?34ENv&V+qI~{d5BpcD68H!vv9J4yidP3TbDJ%Dc3XR6vK>&~Znu_TvyPou=8k
zTW7bBJncl@FV#fQ11k(7D@9_aPvy<~6BENN{R9cAMVme~B)?_rf)rg}FXzqP06ZlA
zcbw+XKnxyrpnL*19qP_tJiT-zKG%nEY;dMSV?;a^3jxA(%`%tL73)pv6HeYs0}2a2
z`C^TE4|9d!#a2%k5|*P#v-4(GfXahScOVL$Wk@QnWo|Ue>xW18SkPtbTgrzY;W#v^
zk<o(*MBc7DgNfAg*|i@eaXWY7RO-q#lk8d%ki>+Mar1*dJk@V?M|>rGS8b~C%xB&o
zjlx48GDQWJf`x~`Q(-4FY2_<N;L1kgGsYK71i%VS(}vebC$sUR)X7FGyA?<URXx3b
zz?wX4CuxP<RTa5EKSPlKh&wb}cl#noF(uNKB6l?c0UBns3M`>CN}$%3O94*!ja=S0
zqs=JOvRI<-GavxRhhGDs7)R6@4cxMqJ3~o2ep@n&reFEyy%f`E=^`wpf)R}mFdZ5`
zI`s#j2{^98@8@Sae%z;5AiEW4o@9L+Y+x1RG4HJyObbdZ9Mmod=*4sh1+>-9XP!^?
zp&;(>!Atr!J8$(yP#lq&m}RrtOc#Q1Xhyk}SZhbMaFfX>F$zO1yy)a=w)=wOs6Jiu
zbOGA$Yu-f0d^ToIU>IhOVy*2(1)I@^Cl%>0oyy@Mmj>{4A_#m%cZ&pnv>6B^BVw<>
zDAx`YVbY|Hs2O8+6S0iNNYu>JNRY6V7!v^Z#KZxpe-nd)!BWj8(=9A4-G%}Ams*;z
zZMC@P5$$ow$?@u%u(CXstix(ixau9`yZE4*A@aJ>S|~k^8SPN1K~TSBpd2rZY9Kmi
zzfI_VZxj*MZK|b21})bXEhvFjHUnMAb%#+sUm;-H1a~0V0PGr-$m+V$8$w3p2tmMn
zXEIG?0m5b&N4yd-3zdaxE_1>>+H~MyIYh3-aY<2j5WUOG%?*YK)$R->P=m6FBSfo2
zR6eKyw3XwzB&5owJq-ZIk$`5G?d~ul0Ze=S8gs3{@h?P1hS3C;=^E9hVekikdB_d(
z<_F29Nbv!U0?QjCj>0=S*WM+wC{9CrJaCvGQ|%6cB@sRx6<I*78K5kwnZ6G>?XN=^
zzEtbJSTqg?c<bUIDhl@v9b1%%_wOU&TZ0W=pH5AK7%R5@qNfV0e0O!?bv`qOZJuQn
zPBp%#sQiKBNimUXm=G)r$d>^nrYIuS4Z)&-`(w$({bT`w?i&L^J{;r?;&(mM!RdRL
zJfn50$?!|4xcKYp2H$X${iCpHl(~li#`T;1p$9@7N_d-0b``bbp;<}mJg`ES_=j^b
zCT_*=s+o7YV~tBC-KSMJMBQ<^9<qM2CeaLGsu}FSG^Ind6x$*68+c*`%uVZoQU3W4
zM8x#rM?#Xiay5q<{Q6cYeDjO6ili>ux7rtmv|0BkQ_@)N?lTeZFNnz}P_(sz)3?6_
z!sBS-Gmpl5?l02#<L>#8Y~bz*$x`~QF5b;Ov1-g4m}b+>N8r+^WT2C{-dr1R*{zBD
zH~5V`-fYT1L*bBAv+mDlRK%sxr(-^^U%RKXg7PcQ)86_{z@jj{e2bS5Hv3loQZpqN
zFDBPAD#&ntdc;W!il>5V>84o)&_QF8jFyz%Askr6Q~%xv=DO1?-g<+h2~K(X&{=|)
zsPE{3a0eLnglPvmtVzn;%JK7`+CE7JAft_PjR22)`o0*^wKLDq&O8NoQgnOXqkJ|G
zTv>i^SbaiJ{)5Cc7>tN=jK}&#p++f9$k8p+$G$B>aSO-yUChtd$sr%EWwZmk9b7G9
zjsfBBU8IAOs(FpFvd9!Fn-l55<3c4(If9mga`=4(v%#zIvivO*Y#ml#FwEwbpzD{d
z=2oy-@IpO0<2(xC^H$5lKoWkhLG(C%dMLZgbVFl@hGNB!>4snx8zr>K0h@l}BD4XX
z?Kaj{``SU?1#josC8-e{PUAmu#`RM@O!VHVILp~!$`OlKH|WtsOhX5PhvwoA$O@oq
z-{xo}buEfYIKkT}cJ|fX*wnD~^RlpSzt&HI07wp_kvbn_ZcCnE4#IgUN8P!G=-9cX
zuqSxz%_CUtR`=MkZh6HG6Y}J$s_cfBa6gFD<L2gQjB}|@@RX4T!lFP&FGaPKuadW>
zeDy|f>_cf;y$;NhJ)3)pyRCeySh*UPHc&iU2Fx276{T8HV%AMG8l<SXHRbGUx^T(t
zYx+RKHUq^xpKx_y?=QBygOZRcq6B5BF%9>NXeN<aOjNIE*tw(xI(~?X)bjB5P@Hm3
z5Wel5t5z`CegD8TCjBzhIr|%dzpZ|%8+%V^Vv*<Tx(L^NIwX?ATjuHf3NGyY6i->N
zqm6_?GPI>PEPBdh;eaL4ELCMUeHZg?iK=ShX_r1AIKFy%NN_LRG#tBfV&7%3b`1T+
zG*Sp!IJYJhf$}XA1tuBwJ!O(_FZ`!^aQUM*7h%hUr-+5l(4ijNnU>#7Z}dy@`YbTO
zNOJ!ddMb$(;Qh~-k(wUV8Q*RPUCbs|udcHvLqEL-sP5CXTdb#7PWKOlY#>vkzFFvs
z?*y>4-{Gt9WJO*S3_JG_F<kxj_ie&2Lp5Cst2^vUGDGFZzdfHTr*KTG^l{AsJ)5B<
zQq70HnhCU5t2=~P2GojWKfEv1p0<d&p4Fc68<*xna>T}+16a`K_z(i|Gevd~1=20A
zsw0h&?qfgi?xk=X&<--5U19DWef%SfYhTlA{M{{XuHWXh%%1jqa>U@fYb>7oMkxzC
z_|!ScDUDkB9b_rz!MgzHpZ|yOw|AUp%OI75NBc9yZu1zQrPr`(LqVO&BbVh9|49R;
zE17Zh6?+o;!kFE!C2)YD(H<Eg7L9<jgttEvJJWmRwDZXxT1w}1n0H6|O}vJqJY$}|
z1GV$pPU7<!>n25R`LuL0i7NRP3fNZRm|silaiOskEV3095%7?f7?((;m{7p$LJ93h
z7T*=^Kd3Zc8Q#&~5ngwRlWiPgYyqxG;pMt^Nxp^4`o(?5tv+DDo@f^1W3+uHLeG$b
z<ywUafcdho*RUQP2jkZjri?p%bAxgzV*t*mY933(FMkF);XT@Mhe{O|L2%4dX=QP<
za#dzDEV|{<Fy9TDT59w%4l!2Cd@i8!pB6mWKo{Q@l{=`I`I$sF{ONfd|0)=ybNsyL
zJGvsDbLG+?z5yJ>PQB;a_7IL7wpiMLSwAOwlPFXYy09SUPiCaiur5U=ZL}GtJo^AE
zn<(;&OW*-1E_|W?(TV2qmy_`?tX|nribRD%Az7kR(zP__=@<$;(CBCsMI<-s>c()U
z8~~yj7RBY)|CmLuUCiW~>fN!IvkFcTl<i%yy30AjQqVu29`P320R{;py^FU>lJ^~Z
zpGNJ$nFKO{gJDL%0)LAEf4`I-pD9CoygcTdxHH-lR+=La3;Hwn?2oM}DHD+-6;D@;
zmPcprZYB?e8I348L~Bzu+2DiUc%Q6;g7*ROfkb=<z0yN<^29ln%y$e9ia)zsz1s07
z(TQxRm3pVc-=hNvW!DpwSGY1otIUECNmfWo7=|@rVY`lmJx9sW*?QIu^-8@vvi<yp
z?aevHLc@Xbt9c784FF1lWdth(HJPNSpg$+E8n-vnG>rSoOm7UW?a(`LL1MGL`E&Bi
zP#iHs;n5{i9TemH1)EwK8foX=0^)?nwU3{%p~BlCtma{Y-@F&exn1;k4~Z{Z-AB6!
zCNMBNW%VL@7y^Hu{O{7bs%D;fGnKFC1kzJJlo8ofcfR@aLzsC`iA+jtz`m$rsC1Cg
zG*2cOs00iREU%j8I7fx$RME+Kk0rhfCwElc*{jvDYu8~O5Da7wo1Jy`EtyuPq3ULp
zz3hE`9!6zoF)~Nva`9dX!o74oMdhzvL7*y}zQIhiKbwAyf3&)#)B&mC-?plL@g8mn
zgO#<BAH-8RPCoc9B)}vOkLwNHS;Rg-wTfj%jo;s3rgZ+IYP?+BEBvy<(qR>myrDyM
z_hAoFLLyQYUKZE4EB^Hfm0&?7a=iC7Pi4h<Y*o#iEPnmX!;p_2LNB~(Eq!{vBd$f`
zPSr0du5hwU^n{EsZ<O8VjvG)IM2&!I$>bUdp9y5^+Mb{iQuSQjK1LSEO}h!)WWIf=
zz7yOw(vMgGglSgue&tX~uG|RZRrCb&RPLGSP%ng6rPV-qe*;014J0G5LhAQXY|D(Q
zhc9%mI>-o$no_JV^lfP<TP2(CS)^%)YFMTVWey-($6xd&{TM!FZ5xlz9e|g1h2L{S
z7N6nn5WaBENX6dm&)D0L?J=Dv7uvhNSKU<RxLsrzoS97sPN7O_>miZKn5>dW3p3iL
zN7IbXFBD}kpJd7RhnHpQ2MV<GOE=CYFPkV3@9^rS(K1#jT<+JYVG_cKX*H||rh>(`
zK1m6$ojS+aDRVIl{0Y6K<V2<Q3XA~|j^oY_g2L}`?D1&m33}fQU@oHIZ~Wp-O|wwI
zdmsYUcBwd?7bf2DEPn37>5fg?L)10W=lcW8jtHt%NDKqIBCF;?HF=DEyTYyyn4dv}
zX<JH;IDGXl*cw#BY+X@0GaOXlqBty^-o>Kptw$&C2&|@=ZpKvN;)Z@t?4898pYJ?9
zp+*-x^)DM509u(?3`=CjCR!cJ2A-*5L6qI_8oCK0FC6OXw%)KNuI{(!c#~b9vl-*=
z85WQ!@7=|Mu74BnlH#6t@nu!xn5MB<q$ke5*G9>~LwM4?c~*gfI8vKsnk?xp(;4qt
zhIo|<F;+g`GfHI8eQO!|l+U;ANO$b+mY{Tv%s?+hdVg|+(seeA)qrCW92IRdUiW%x
zg04RV>O|T$O$2vWO6Q`?;e-LpeY@8UN~4oC2M36Wh^fO>%C<IGGW|s#&&-oSp$C)U
z${7UT(zkFf6svMHF5aSRvV_2b!Uf};dBVdwGA!CsFhkQV!YT&a!YR+qBB;>58vSCX
z{(1F!0%6&W7;zXr_X*MpQ|Q#w$W_Sl?$|;!6pjsT9@Y_l&k9}H%i~pj=&`TofqKiG
zTbsSWU-=F=KvTp%7p&}Yf=)<rrI^Fn9Jll0bjOCwuxMnOM+jGddYd~+H2zu*FO^xp
zfN(!z*Wuli-KrArCP>JIVTVf@<1HduSHZC|V{mNs++DKc)66<9mqj=dH7{)N=@yCc
z>~~Fl4jtvE_guoC;sS4l!<96ZSuZIZeffx~z%;$ItrbxvtKl5&u5Y>mMSks7d^<O!
z9l~9>k9DBAx}#5oiFE52Yg#0sDgj|MxqdM|t(7x+tMd?|++|{(pDEc-Jm2uCC~c3O
zhc$`I>_s3AZ?Jmw(<!%F*)Gi6ujoAeRE`>bQ$%w9?Z-JeQAWTLGV}UAmG4){Z3&M)
zJ?im$ObaPXy>k}ygLG!c3ayV21hz+sXprDOIMC&toe4+J3)^W84GPWKOQ?oKIK}By
zKk^Bmr9^&;3s3|<)52?aGvUuA;DZ#pOC(-Kl#wQ@Yfe~2nds*nvQ;m*>lV}#8(r_g
zPlUXdU41C3Tr$?3k4mhMg2Zp+h>O+W*a9g|=P)^+7B~9Ia^p%5NsKo6{g%&lnSPK^
zeu}P>JY3pCRDPBAW9N)`f3+t<<~xF)@aHR9P;5Vf`g6>=s8+DYo6Z~%`^M+S0>_X2
znHj-hj&dGLo#>gP7x8qOp?B*NQ?KdzhI;_<^_?Cf(VU7+=ceDQDkd&rvfO!O#3fZe
zF!X;qtu{$NH&>UA7XjI4JRaND%1I&$f;?4t9_kQGu{2-R<cP*I7!>W@!rt10WThX;
z&=FAWUBceV*lN!NC#lK_g%o!T@r%M~E~jm@eLL$^4#ha-mR9!5q%*%G^KaDYKXuJ%
z6`?CQz_H#I*|RBksy(9ir_Bl$>;sL}RG}Y<fCE%&FITR~TGs)y-(O!`M1Lg$uKc(m
zwy{h5e_A;2aJIYmk0%i$s1<vrh+TWcC^3p4Myb-;LQ&OFT2u*Adym?xYSY$gi)zK*
zn+gwY>|LXMv=sT}`Ch+&&*whZxvu-1&pGFQzhBp>q=Sf8YzpJp$WJDWUV0)RdjY9W
zeQUXjcxSLSE(M=7bdVdHkRqK*4x9i7)gq&!p5-H+fb<7H2IqCUFV(7qV8mtZ-^8~N
zT6iIzyLyJ2?O*B=^s`#qF~zslm)XWmos6mR!w-*X-RJn?E=!~y7WR+STjh1UwUk~>
zs=WXfpMgq(<FA1cqj4Lm-(~nHngXZ#DLUL^FO+KXoz41aL$6|D&@r&PPz-jbIUV<v
zww@$50C<+Knt@0SHVz~&H0oYSXN@~fGwM+ZDbl8a?7S<t1e4r3sP+P<jKsg?gRpr5
zf`@6juH*s&bKDV*c5en8?b(h;=!!F0^&VXZ{&9H5AlIEVlf{lXP!u-JK3}m&Uh+ep
z+1y&;P7N_OfWAQm^LTQn+VuJ-Ls&@bS!0)*agBWe@Jn)X!#`JyJF3TMWtt2PrptFd
z@T~26?ms!cnl>VWdA`DN88Y%l22bdFOZr50Q|KQ3a;=R&zs}f{#0*_G@g~~1i)(?m
z%dM>u#`66#pKcD;lhG@*Sws)pIaxn(137`<nu||9K<osH8CaOlL;yF9)SQqR+;jMH
zFYgS}jwsf~gGXAtDpTM3P^)#y&2p)4mkT+M9x?02Jm9pqvbYS#>;+IwTioI|Zt7xV
z{rBeE>(K|VUqV~foWq3~2tu=5tvoJBck<7@`p&koSMpU2l1BI-RpKOLR)Ep~z|THU
zCzHBlhmiod$fuc5-j#u-D;~q;XjI~bU}cP~FYK)k_?Do!a2hNFYB?mE*`===;z*0l
z2;ns5y@(iP2TPE}FyCg+Cs9J;hc<uw7Th}u09ViRGh8#M{}+Phf*=#9H&j3_<;k!}
z6H%812G*#+m0BK6aFnR2jQ6*mk_}k)lTt$s-{5W0s*}*%6Fq`osIuBTgQ7u*2@wk@
zm|<o7nI++kJ{?CtfwL>`&&LRcDxc`|s}>j-^QsUk%7i6_eOV^6VmzEQYr)8>j=E8R
zCq*7>v60`4$UFm5uhjjt5dkpS0}O5eL{IsVA1i2Kqf)gyzfuL<Zx_U!Xgr^;+tJe%
zzaF?+S3^z5;HSsYUt$QzVst5Js6`t*E$Z_AYBx)VD`L{{XGoL+i17zQw%$H7YpTc;
zjLuI~tZR6?{3@GLSYll=s0j(oI!?)#ImV5h6@B5{GrpkuK^hb~u}XkB+<qC2OJ)){
zX9y4_3j5%3XhC|zd0}1i%)a-~tnp{L03(6F&M@<=7O@!Rs(IryF~h8u3f&QN%Z*l)
zKYcSO4Q`g3Gzng4SFTP##>l%SOTJ?T@CgKZ`2glM<P@u_z3wD~8-u7zikN)$ba9Ut
zc7>6)edL$ipXTwupekHx@R1jW0N-XPLDrSc1zu7M@|^cH-3MJ3G!&qXBWhuU#{$4Z
zC_zdd72rUu7zC~nRoieWXwmx74>38m3tqi37`DfS!C3DU#`QRE5Y`ur95-c<ZAUZ|
zc=aY)E73aqpq@F&<e4e7d6{z!aX97EmCF37g0&r)kAS$d_cWA%AS-1mi^}f(Mg)V{
z3RZ_=>NL^vVL?g{(SdZ~>H?mLsMN<$U^_2RB16>tD*`fe-u&dIgsH<EaXKmo7q2>6
z7BT=8G4K5E%dhA83=%Bj6-QJuE#4}V33p=w5H|LtOysDAP&L95rmGhVki7+v;jO${
z{gha;Q6UV;;8m-q2g+y&!MqIs{W5IEJ7ItufUq`E%Scg4Dqso^NHoaxvoJt#$^TGT
zQXh~~1Sm7UAMDc?*^h@(3Lz6rpu%h2QS`r*rj%|x^pmHZL%fVVB`^<w8T1bJ>56I6
z2CW4$^UdsmN;a!`_{<s19pNQrW88E>BUOSHqeKaNtZS`1h!Knkr%Rj718CaSyUx-f
z=jDO@GvF*0&;*F{j{GjT1ldVx83AvFNVx(tQ!Zc<R*EK_{Y+Ftyu~KD@&#$~-acPI
zuJz>HbfnG-stb?lx@iO$q5<)10w-R#;US6C(i!FediE<qq-%%3J1m?_y@xT(hbJ&x
zGkJfR<})?s6~0UX#O66-s6=Wg4b|eH!#~#&yQ2)6i0UQ8xZe=F<289`V_D)`YNw;E
z%tE?`#3|l@mZkuVY5t}b0k$;HsXg#}R9en=7=0cq&W-=JlYq^}GgHQUa0pCbmstx0
zx%AaYvr<xV_HNTV4`dJZZqxwQ@3!G79l#Smo6S;^o-1!?e0F<GNgxl1xTAczW_;Ip
z@@D1j5hQL^0<iFHT&DU=jNl3*G(Z7Qm%fcR#|IYqS;hXSkJBBM1%wvA7|2japAg`#
zCrt@(DOI%&Mln>zRKgWS&3Xd+33sr3AnYEPkX$(iOLK&N3bIIU3vz$W=;P_r>G+#H
z*b(T}ncR=WxyJyCHKLIx;F6N3MEyjEt7o+hA!sva0IY;M)x4UajHuG^S|1>--QGNq
z9sQE`6S3zPD<DIQWvDWbrWS@YP&54&#V7aJ)wZm^qyoOqYp?XUJ;)H)8=p%QuHd`6
z)st-fD6vX+)Pzmdp(Q8;2U7TeHi+L&x$=S3Q<=#fov#8qoZ+E$5Hm`Oi(k@kH(2+c
zT3|h<Q4zQIo<>K<YI(2h<(J8Lv$bK;k^w+Ux~OMYJ<{1BQy4VpcyFfyHLPYr`6C^`
zC63*uAyL6ht{E^3gD2Mu!zz=OS`;fnybp%BH3izFBLfWL({kjmI!iV>l5HhdhjKT{
zKTErx_|es};vNWN)=ggr_%@X5<6ycRKt>;*8gan!bv<<s;D;Rt>94x9kJX_rak@$w
z8Q=`;3<qFcN*#K9(RhcF$XFpECJ~;Q8PVmQMCT{s2FZZ69T*OOMNYs_wq#obpd%0*
zXutIN6Bs?fWnh5vG9V-+n(Ogy$yd$qMZ}pe=8IxqfUO=64udSk^b6yD7(%$N|5{Og
z+z>yAV!qBRxDn5K)i9<}5vC`VAzGIRF8nnWZT(p6L-MGv@Ph3U@}2;EjLkE%%m#b|
z0LIvDN_rRl`n8gkZ1m~BZG7K{32C*Guj6TVFS)snD7N0Iyjzz(NlcY(J4)abVfUS4
zsi&4(3iLj2QLe2^e<203JS{f_fCAa%HSh&lGA-;(KGZI6y6#(FkrDMd15tG9ZDB8b
z6q*-Av)z^2BnFnr#1vIZE!+mXWCppd-LH4*LhD?#Bro~u-3$?*CC2dkt4f6k-2#}1
z#?@DU@>m#UiEaVM2u)y4gd7+Z%dEa>Y2xE;>c81gU-5ro_w^6ZkA|m9q}r)m_lm{S
z_G9@0%Aqt>S8rAtz)x)c4bsiH@xpjVuM-N!Qw<_<VtN1+f({$yho;NL#NWusu)NU=
zepw}F+Bi^Z2&kioupcJ{W&)X9aDHuv_d|i1GWEtcZPzU@z&}Z!9SBmUJw9zzaDMPs
zrNt;6ulRG`yvsVNrcCWKh*wSP4L6wvGn32pdoyG7WA&Z9tT*$;{N+TFNGj&^D%uzA
zZsb^=&bvSR*(5*MSL1PB;1YwVYqs+<Gt}#9_y3DQgI!9qS!0f7&J~8m?)%PqJ~f*y
z7V&T!Q83cuf-pkm|BK;v5h2vef{YLG_HF@S*sLx<G)`$)#=l5^vKyl3lS-=W6H|jd
zt8v2>v50TYs{f#Wc>lc}D=u}GOFY*-rG;kuE*&<;`p+5{xsSL{Q}(^eWN%&hHCP$#
z5`}0QNoTpm{~d}OpXItobjd@nsHBv{s~Yn3iYJLp8h#|Ry-89uDd_7+Y#LPL!<0#-
z>^@|a%z%x6r1O(Xa;6JAAI?zo70dil@AgK6(>$M3cZn(+0cxp{gLIs6hsK+93)>hR
zG|(jzzR%oetHyGn+e<l|3te#LXb7T{KQ+$yxeu+S2mtag`f=;{v&Z+p5t1^^`w-<D
zRR4b&mO3G`y9e%g0{0ZV89$XKOltrSs~%=xBJEXCbKFlE_6t1<RlAwJT>gIVL)`Oz
zr!X6(?CNQ6sf43kvg?i1yJVV#e<$Czl3p!*y~GWhtDn)++~lsjl?hmId+xC`pBf5+
z0kg`L3$!-kE9BQoVlx?SkAbFrFVp}JZ2HO3g=Mrxqg1Gkke-UH(mJ{Af*n1`9yV5U
z&#O3SVo<$rCJfop@b?O`sAlJkdzHTkq3p1<%=9Gw>%*PuSb%XFNr9ONb5uetnrUvT
zTg29Lha;os$($OwB&~gwAI^Eod|D)h_%rnN@iuO;ZVd}N(K>I|p9*6kZT>vdJ$y1}
zPbRy;_f$@FjB??{TX!yhLjjNyQMlbEuqi(b7tPXL`0D!>)EBl-D}Ip_(CBxr)19AH
zV$)GRe)9kgKSjS@?6VN+%-6XK@y|m*BxU8#z~5!6DJ#lhjqR#{&g;dM$Gw-Pa!G(1
zA^Gl_3R&3lrVQ5>RB!~O3xDT3VKucmFh_Rd6g<nt6n@}k%86?l8fn@mhil{bb^MO;
zMlzW-r=Jsb`w(bmrqgRWsx3z}TkhG_OreNT?&uaDLF0xI_u?(yu;P25nq#13!<fLr
z(MmO&5W^crY^1<V;pbJ%*JuR3T;y0bM%-&9;QB70l$loEz3HQ4{b2t0=+!QEC-bQ{
zA&t?}W%gI=)J-uHR+>QDw$>pI4dn<)){VOraa#Xe>M#S-SWujF3P$1rDi?6sm^kc9
zx?SPV-)Xr6;}$3tH}@v@6d@wzL9u){2o-<9LJHyP;Y8IBJ#Y+~h)RUE4|^;mTkAg@
z`&(Hw>`?BkMtrJh&T;_&FjH7pU7MW0W=%Ek$Q>|{%`;<Nd@EYIsM+n!$|D9{F;u;*
zo9GRQXh7d~x=0DX>ikar^8%o(5-PUhEazVI-9<4Oj$*Ew0}+6Cp~MC7_o0GGrRPR-
ztSj3{({O1aRGt{Yj<FtXN(>)Ue085J%i^AX&|3SIJpGq3bfF)NxWzxvIOzUkt1*i6
zoY6lI5>-l#8iSmFBTZbLI+!Iovnhg{J>yi9dBuZA1O%IOZEIF2+6ppRyuMRq?~lrx
zm;hx<mrQ{b#l`al($v+dcenOGl04#sj^B>`m4j|*%n`$i|BbjRjvb$;)QNXT*uExZ
zJW?cpa}de5jS~VDU9meXUV5|Pczn*ZgIg4EiLOPyX>kSkNp7Q1#|RK!8_cmrr!@R~
z#H$nteQbW{u3gHNc;-J%^N}gCLYndY#IVtMuJ%&);inP#UiYpw0}fi}dGNXUsj=0I
zDYs<F#Xm<gVRaClRm${wtbtQRPo7MThJ177kGS%8c+Ku!g5=k-=Ar2CpNj!AVTVl9
z2yPhC2t7HO@X|UgjwJmesh#wy5)jos99uY5bTQsEDnoHx?veMto6-}UY~_co1r?v?
z{KVH_EV|6OxCU9_MmB4V><H!kk8CbkwGK0AvUF27qqWwWWcfu?gq#p{)x%pWlFn{@
z76lu1^#!^Cd%`X72i(s<wC_$5*v|4uu?{mu=NxPH>o3E4ty_c1r4$XZ)q|p@9m(Sg
zzU0I0ygcIAsaJ%J^w@P3ElGrCXMi0(Hq&95UO#_GsLXCz)mlqf_H!18>Sv<+(?|G(
zo{%n`Kl$jT&E|j?wGJy~3b*#;n}yW$9oA~z9x#Io!bWw1^$JU?R)~>T3HN-IVP);a
zHC3iI|NA$)ZKDdWnxtn)WKu>#zW?3}JHTcufmQD2--|U`B&inMbXqzXXZi--Qy2EO
z#ZKQ~*o1iF-$&OHB`n=g2|Qm2k@MkP7Y-W{Sl#~c)&sJ}6MHLhTu0KBy_25;8_eXU
zgN#3v&(AksuPj>Iq(?H^4tDJ}<O+N6wS6@P@&6S3JQBXoiwmVVj`nL5?WLA`7<x^v
zL!#V0m>2qn7|0YKZyp{O%?5u_j*kSrdvjrKj!l2*A8%eX{sL2caGJk;p%KAs2{_@*
zzL&{!Zr9-2>(nGKPL+iMcs7)s&~r;14t?l&nRuSY!05%anl;$a$3B<q3O!nBAm67$
zj`DtNG2{`F)yrRv^K3f>Fnh{}Mb3S=&>`J(D7pKDQ`#t(=W^^y*Sq3~_w9WvQ!=h1
z_-shq{kG?8#kx=)GrOLsLasDt71ykUlUI-m>Gozi=4gkNXR_PP&OgptyHzUeL-R(y
z1L+9hX(?p3-R1$N!EJ6y-m4-}Xt_7$xxKd$cXk(7iTCWJp<XcehCp~1xJYAv9J&r9
zkE+#K-MmJwmB?A2<*dFFlun}9bh+H(2Byg@8axCuL8WVMDFW%Ytw`4H6Al7r*E`;N
zb=+!J81Z-;kglD)D=xvZq3!%Ax_?dTa<*1tPC9?X;*XhQT|C9JNhSA+YNMagEBYSc
z9=3Eg?^JPrBRne7iD!X2EK_W;i9ffGKSz8#?Fj4E`n0n+ZsCOZ_YusTbdRG-D$!BU
zr7JaFDbUN3petl+*6gwZbWJyGu=QRw9Fj6wt<&D-!({z#=~CC@ea6a8T)FxkTSSW~
zJ0AADWRj&Pjh{O>Ve@1d&eb4<8hs!{XVZV$5VtF1m4ydHU#OI+lIS4}OYOs-95BX@
zh|sl^@3H535A9&4_BQ@21JtBV4t9xn0Z+=#I>s_%0Jha5*1PI=4d%za4y@(dC=uJp
zIXK;2*Al`unD<(wiI3=iS?2RJM!|!~;g`HGFY_~X9%8A>O>*5*6g9KtSLYnn_dV%o
z_kSHxGo!S~gs!{XKR=R|m4%L&Dz|DLS>G*|_<bt(R>{KT&DkJ-usaA_9tFC=3OD89
zf*WqnU}&#3yY<IHBNM4v#o#78G+~#vg7W0TRB5LU`xZLI0T1mpUjb^VOpi?3ux>Ri
zQOC(kX<Fg%cQ;Ib)jIc>NmH3@NL4BQjMB1t(b}D3Hq4_(Ma2#!y?zM^?+Gy{&E;Co
zn=(F1>^QuZxL0#s$COsSavu<*^Ly?L#FIdjR5VZBn6iiPUA=SU)~R1>hq;T%GJX3^
zF`~rncRDuiF%4qa<C_O^ZtGgXoXU@%SLSlzcaP4Q-ORoN(c~}PrzQsV1I|R@F*wbU
zx1h4?Yi3Px?iI~1?$6u#IociVV7J=CrLQ||C_))0tzs|I+|ng4g+AKV245bhs3idk
z-;FW!7^nA}70c*1`*i6+{TBZmk~%vXEqYTH)nE??Pa3{dg%_Ood^#vgmZdmZqTS82
zA-ctmoGra7e)Yx;QCXYJHtfv!%OMMC=P^{8!naL<|Ewgd1GwFW>|ASqO;#`i8W-y{
zb}YNORY_$b;K7b>9Y%lgjHwTej_z@0KK${4svWRWX~Us7C6oTzEJdplvOIM-r^n}~
z2gXkI={M*Zlu7sVz%P5`QdqmmJ#sbDA2<tzkwW)c2%3z`HA=X<X~HA=e%MTJ)tc!o
z+K`~{z}lsbpAWO;d|oGqkNH3U&C_$Izl{Uc(95Q@xbc(|g?hf445s*7j*QrJRNq#m
z{;E_h^M)Piz8^LRUb@FIby*al34XYC_@ypKTkJFq6&e(avRUv*|7&)HQ~5xABk1#W
zFT2~~6#d{`Op&d|mTQ)2(yrLkTe%&>QXfyF{;9JGy<i#_xNceF?IXV`+Jln)33PAX
zW#gA(+G`wy`YDZ4sjd$oHT?4BT;V+uP_uvxmN!8`LXEyk-8y-0Dd?#^^?}$)vqy9}
zNc8Q&YzY*EV)co_R~V<?B+?V2m?=fsq#=%plgOsobK~tDbMk^s&euzE^3B>))#dVJ
zCK~nrkiPAno431u?lq3_TZavbtWZ3epnC-XVBjDVgu$r|(XHv=*6wEmGrg4k$5*l6
z@yE~HYpnqiDjgelw@B=(h3>g5`xIJ5Z+^F9oLwzsz<Py!eFN9M7_Hw<<9EOxnMO}>
zmp@^QGcb6VAo@GbS4eZ)1?NOT1l{tgh;Z3P4iBGSNv^kIES%mt27AE?kUqpP;yPl7
zX@QH~n8ovjWJRv6#UH^-R?TfXwVs%lg695_Pt>0u@aXprVc13ONI>Q_Z?5bWBdGTm
z2%oMYw@0Dwjh_PJh~zwxKKHke68q~|Z$0!zghlGCCBn*mB4FazIVjZ2Red~A!~2a0
zSj?e?PN4_j7&zIj$l74)P&PPQGZz!!I8;!6MdSYdXZ)4Q!xa&vP$iE?mLLE4;x7Lu
z-}(W8w?{avM_WIu*Opb)tlX(c#~Qh6@BQ-YOjg-|$fh8%#abI-(<DdXI)#3BPkXqq
zM?L|Jpqm(`t3*&VYs!<~RDaeFT05`%9bIqoWf2j7a(eObazO5M_0>DOP%1vKr-u44
zwHS|B+{2d)USMkB5v6{aL@l^p6g#R><q0<+)9feo@-g`PviNy2#P5E@0}7kQC3qgF
zM4;<tWGh+EGdeUai)-lR|Jc%dUA1Qa(keZ0ZR8yW5?$z$WSTTtS<CxX50e3=*hwCF
z)SPyhTK~qFr}LkgXt*(HPzsBdNc;Osx3znnd^fw24AgUTYwwcJ0GE$$TJgXo7H%qk
zZrgSb9b)k)qTaA~E0XY^DjQ6z{`ZQM^FD*N28AH&H2T-V2}Q(`2=P$4@HPqorW<;=
zd#CmO(jq^kwC*^L!jP4!e$%O-14u0GKK*AtDiN?$h)F^j?gX;VnxKo7Q5mA~jh*?&
zO{lD2lSS&p-K8fh;s&Y5)A2$SSQD`u_{%0UEPeNZXK<Is{~)(NYuSA51@u54)#)2?
z*8c%`MHB$<vM>lT<=fQBTU*!E$*G`-8O(qirD#2;61puu8O6b;x<_nSB^c2b1x}kX
z7d5Yj{itaYop+7CA&4#L_cf_jd(ii-3{nLSf7~0SG045Cj{5s3^-2~6Xw=VFMzI+{
zpkgDOtipR~h?d1jq+V{r@+*qcL|NgYaYD>~g$RFAaLQ?hN<@M9qLs3aNmO0vwao%k
ztctN&xw3KKqXdZgq*0o!R-5U>%XRc-oHVF@RF(B{T&A#TB<Mdr_U6s-p)A&+j@iF1
zU1jI@`|vyroOiM!?$)n%neqV_yl;aEiTl)ZIl_aouC~D=%Bl7b3u$r<<$>AAp-5Vt
ztLE}ui0)r2&t7rR(<cBe(G<GVe?^r2<<%Q^PVf3zNSF-mc|agP1)Cla>sJWzrVZPI
z?ZF)XI4J;6GzRz1?k6@3@hgoqj)+;YVWc>|e4GJm^^4Of_HbA7!0=phf_riyw;n_)
zqug$RU`7m$fGi0KP|1&|Jc=4C4RYyr5&>xcH(C38?|$2}^~5)If>QHbBM%Eco+kT(
zYMz1Av_W9?PI(bVXsF?Sm<|p5p!A`$0?@-G0m7m(=QeyOx6cDm^6UjSyL2Y3!>Q|y
z^RH~=dZc)C84%&KbgCVltjJ7<qls!dq})E`WD505``0t4NF1F2RuHaJ9F}?HJ7BcT
z`)D%R3nWE;Pa;Iq3hAD0-Ae<OzaN>wJ+&9>XR4KHB(O>2IpjpGm-c*eakp9Npn`3P
zP8ij%$w+1{*+N7^N12Cquv8ixou8F4@9dgR{UXF9Dq!_xu+PLS{BXuIU<AQlIiim<
zZ`*#A<D^kMe;ccuCDO-PTi4j9!Dqn!QR&vvuk{D!UT;qn!KB#<WEZ{w=J;#Ml=<p;
z@Ciss9k1Cg82dj^`GC3zQtI2-CsnHjH_Hfk^u9smj|n-O40vEWm*gnfi8vzlzH3ek
zVj)=Yy=}Y4;`A~BgJN@!mH5Y(%`;KLpRFvrF{{G(+Ws>teE<^!s|?~$GOv|s;b=OB
zR$TRtmsN%)r;Le<IBkenS&h)Cl<dEib>IZJiAh@(vKT~7zh<0i33f3Z)an~B?)CI@
zcu<;s8!h%)Eb60e9za^PF!*RHfx?O}wqPaaL+6c~CAwTXlOPh-rB(8uktzK40T|<S
zm~Ik6!L0|CP9enGkIi1loaXyRHI^GWPChkdCFNDQRAvJN!2iS7pYniPvF_ILuWq0Y
zva))x>B8#e1ku00G!5eF-`H@oVG8d4vpY$qrN{kJ)T#}Tqwx3u)D3fkw|Xv7{|91h
B13Lf!

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png
index 9d1d6d1177b9e36bcef557251ba3914fa5acbae2..2c94ea78bfdba901614472a3215401d7b0a2dd71 100755
GIT binary patch
literal 4949
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
TP9|;Z00000NkvXXu0mjfQL*|-

literal 23898
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png
index 88bc33b592a04625c97fafdea8040090e64d5cfc..2c94ea78bfdba901614472a3215401d7b0a2dd71 100755
GIT binary patch
literal 4949
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
TP9|;Z00000NkvXXu0mjfQL*|-

literal 23899
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png
index 8fec652ed51a5cf6085cac0b208d3efba4112b2b..56bf4a92fb295a63fb88ac81e8ffe76e83710444 100755
GIT binary patch
literal 4677
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
Hu0mjfi%6-N

literal 26684
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
A!2kdN

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png
index b3d7e39dcdec42cc39c96f004690d7f6a7337be3..f259684055ad3ce25b2c3cdb5c3a53062b60a8e9 100755
GIT binary patch
literal 4677
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
Hu0mjfQGBVH

literal 26684
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png
index 2529b5cd1928637c69a512b292d5533fee42a48c..17f3be9c262953cac52da794d601bb853d8dc276 100755
GIT binary patch
literal 4677
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
Hu0mjf9r&r4

literal 26684
zcmeFZWl&_zvM$`XyE`=Q+PJ&Bd*kjpxVyW%yTc%Z4LZ2npaTqpGlL8aT;6x@v(G;9
z-9IPdyZ`oz=;&HinNMaul~rr4j$9q1sw{(oNQejk08r#)CDj1{i1#K003Q1N>)y}w
z0sx@@{XtXLLmli*?&9WbW$R!`?&0fVNp9(5YXt!KY&PWEdXaRchQFEPI3r|7eKQrT
z@}8f*VpWyWZ?!S-cS50(GFp}ThE9+oo4)b(EHeIbBJ$?Son>Rj0P4zT{$v(6<2_J)
z|Fm)?V}1DN@n*W8Ea>;Z)63!=-!-4$o7&y82HCE+h|$=`S)K1uNGngT<Bv}w`u@Vt
zzpIe?ow3`2b9g`cRsC48U+%~*`$dDCrjNC!le*aM?|cKcZ312i1K__IKi>g^UcH%g
zov8;1`gVt4rpM90!a)B)q45~7d7z9tC_A+Ob9SY$W1ie}{`0A>rL?SKjMe0)!Pno9
zQ!g6^3!hjKf;ik>UtYdFBq*5pean4~@=pB4sTlY>FmWJobU|fxZP#5}=%KJDj+C=<
z_DU&0U&-Y9<B-8=Lmk+51NW7NMeXux>`Go!rLXh6J#2RgbmF?^y1=})<N6#}=+ruT
z+I17b+E*mJ?Yye$e|PtR^{h)^U~dJ7LAh}4g8gx>qx-pYM%jJ0;dXZVM*XTg`%q@!
z&zAoK+^iY{ul0|r2HmU&4({pXlb<PB`xxHFWtH}ONxMO>)SqAlvn?zuWJj70dq!n1
z(Wv0p7DDi7ghjp|OnqPtj`8_1YGybH<uem;)Y|s>`G7dGp0~QqgRGRyXRzW3FYYIM
zc)WA%n!z3A=bfzIM^Bym&%p$RvJ_FF&JzOpIOf1W`T9{+6^hU4>dMqB%j$C!<N0p0
z)JWKV2;>%W)LH6wwiRot=1QP7b$iDSo?Xb|9DS#Xl~w(#KI@aIf}+d5;)i`1d{-*Y
zTe`AD?%!1YR{6HadR7IF_uq7M_r|B{>OXFtZ8?hDju&`+wOrfr5((c#I37(?7XG%p
zr2O`C^T(=5V9<#D<*(dNg^NhjRcnt<^ki8sp=ne_`)tmoBZpEf<i-8|R&{X;)9$x9
zj)Nw$g;F$64t&1IXk!=t{Ffu%V<My(C$Aa1iZLQjGjCmmoNhZjLJxJj1Gk&%1i5SG
zD!5bC+{pniZ;d-^jb;zi))H3Xe1P%;{t{3#^{3DzQ}j!@xV*%$$Bh8TBq6I=*Q3ry
zvosR(lVoYgB(s*r3f+S7QPJ&06#pio<vibpk2P*oK&{krL))?R9;k7m&xdfZJ0*?0
zitr;a;EueR@k6`avM+3jMwVmqbGi+D+uv@RkxowLb*IjI#{~T*eIt~3@dv(PvOF}J
z!8O%=<ev*Je{8-O-SAA<QI_jhy6(pGn5kNKP%N1nEA6h4Bu2?bp-Z~+x?TFk*3%Kw
zv3>dSV_DtI#H(q>&9%<tYsN<hXXfV=#!SXQLY*m>x?uuC;|^&Yic$xAu+LP5xxi^|
zzzA2ErDx_w**HWF&XMUF0jDL@?K4NIN;<`GqyZ(Z8<ulUgpITH2V}2Ba#-)-4fAp~
zMB#k_Mn&SZ3nr^8t`A!azl}E=B_UcaMpVPmm9|Lpl$CtJ;CwDb<B9EcLEW~!?T=Lt
z_0fd#mUY|QWFy<YN6#vX+6*NU*P8K%0qryN>vq74!r{Pvlo>fE$Fy0y$8e@`SU-b$
zo(CGWOqcSbukv4Sl1(YQu^f}&2D7alrQl$X3MpNzabeHQEkbiGam7Jf*+#_o@rV7Z
zPJZMiR)eo7khl|?BFB8;(_X%5yHSQ)4@ArvIKzLY9%|=63DPkqjG>6qDT^^L*NF$=
z`WyYYCIf36zh%}R49Il+8h^P~_>p{l?#DFQv3KMRQQVNR^>vhmuA9q{h1miU7{VA|
z55qgD57j#8p@F~Sz?o*<A!Uc;CuI{AD!bG5C{CN6EAhUryv&aq0Y-)9?h_+?)hEe5
zji1pEf$%!x>bkgy_crAkKzW?NPt5OQh&W8{#WHpZ1Lw1Rre)Jv4UjN>JmDRKAB3DX
zS`1yNbRpP+nI+ZhCJI#GRTh1anq<Wv9&aPrata{kQ9y)FQ2uUK5ig;i)6XYinkhqs
zS9L=*7k4mL_N?tmMRQ-z4>y|;HR+)3sYdwI=OOzZLJfDAhL<yQpa@)=$-VYJKd*DA
zWAq=xM5dIDGSWd1w|>#sMo1Ppm5Ora#kF$*$8pSBg*a}lW@yQ+6yNK**Oa?a2{2ST
zEwjm!r1%%`$7K2PvoL*jdDavH78fyBPgbbO*iXx;rkQ@imJfkxQQF32*A$Q!cQqIr
z0z}~`_l=PN8j+$&U036O+<OSO!e?5<lo%4xNjdiG!3Scf@dikmMis}z_@ize$u=K~
zXU!qw6QRL<!X6F2LH}~AVX172Ci<C_&wP0!sh}7kGDekUqMjh`oF!q+e1i?a?(@TS
z2;mlO4MSwtBT|g+A6yQu^`@ekxn1&pH>ZYh;l)B2mrz;L<xb+D5(K6B`D8;`TEw(i
z134%C_2}e~y~^OxLC2IYnl%WJAzV~2@nZAKZqVj6qInKPhT50psr+AHf;vA`&{awc
zpW{YAG{3>nmLFYxdys}2V^74y*~9mB6%t|m0?U#L8M1gX7!AvbOw87!PJg7evF@g^
z2rthhNZ4*GArgFlS|Z^;ohAsRGqm<lk$ue0rNH?$QvB;nHWVIOZ933VGC0ura%LZ~
z1mRO}qqH1K9}O#<dr9kKKr4hOCbh*7X`}Mj7uF}{N~P_F0nK)&7S?Fo(PxA6Nt7T3
zGJ+;`oBZx{Vr_)bfVe0-0liyXv|{+E!8hld`L%DjXl(YKW#QK>JZyPq^#(9LL-sxt
z(p39P*t&`cG<ID??y=~}xC7IAh6y?#(L{X?E8%fjaU|N{rZ$}z-L5nmDvX{Z!#Nxm
zeUd9IODu0?M1`;2W3B$^+1+kE`dHd0r9S|97%tG`bEWg7#BC48HgfPz`f-+ihzGXw
z0C8=P5~*Mb95P4{G6Ax^9E`Fnd3aWhk~qd2W)QE-{Z~|C?Tuc-m7xnv5;{uLc3%^}
z45!2|b4Hoa(?tHkb;Hgz!`pxx__s*(v|poZmQ4P1q`ZR}SR0Co;X9o14I?;_CMh5>
zJo@eW!=vGu1{~#CKW1STIzLP}`o@AmMjjq<2>LW+#pmR9S-5Up$xkWp-^$_pAUD~H
zHCzNN2?d!Cgf)Zw_?f&N*MAi0UHl2nyFJjv>DC9$CX?JO5cR0QLw-i2iAinjZZGDU
z2*B0}d$e*L$Jl^|#9=$2%|>9#&TtiZNn^x$jL2ncgV(RNtin)c8~Df)bkHdle~8N_
zE{XQX7=<aqayUqTy$x~~`lHNTa+IS6@4RJaBf^A|8hJCN8j${LHczgR!gzeJl>>f{
zo|%<b$LM14g``C+KRWlA82H3VXhQwQATkZrKvNtFXSA7N&_%5^ShOg7Nn0m)z!_f?
zVrIcp%~K$C0_L(p0f(=vF3%hGsNB&#27##{HQm^Fcy1UmGQcP1%)YxXoGYSjHm9?p
zie(%n9P-DkAp@a<7-r#^*$?9hzEos}5f~!>ROEys>#%&YuhO~0DtO+({4u-){s)JJ
zeqe{}NL{9(iLMKJimO>m>*D~LHF85WmEaFb@`x<Dg$5mQHqa-&0>C^~RP?Jf7zS0;
z@2Zd_KIJq$7C4`t%IzyPE(<=YdETXU$ijyKTpT29g^?m#inRgy*o?Ey+ELny%QELn
zlSO@z=s1B)A;`%;!)l})9A?x_k1LQ$z#kTGOOVQ8BEFR%t*zdv<6aftcb$Fiuud!W
znSjCBq!PzA4lz~;o<qk`VDM9`5N)0zYy9RX5o<-B3azxaLt2*gxv55&+5vi&U()zD
zFsZs#+w-Fe{L-KS-%zJ%Z;$Za$S3sPAJDh0DC<ai&^P2uU`mYI%-mK&UzAr(Q>YDI
z$&$*;HdsTg=irqga<v1y`<`#6kpPzu!g)!o4yCbc3etONg<F6T@?v94q6^l8FDvk)
zH=5_Az~Cf=RZYfRTwk5=Ox>147C~}|@dD-i3yvD7586MmR3~*(wD|EqyOc455l<C;
z-C#4rX&I^cgW=PQEfJi%scN7!6BW;(8r5>3`CuWgL8OqCD<%&3Ne-Js9`rj#658W>
zhDhIIM1EpCR#|11KvP}y^h9Q%8*3^s2zst!peuiK2Wew3;P#Oclg5tnaeJc%nA{9v
zHe>qhA|0qx)Bxv{^M?~Zvx39YP2pohf-D4SKrr{iY4uoPcvZi(A$TY*7@LT{X&WN_
zrp<=#nJhmTjWkt<uAK`Je81$aQ)a@dCbJ}dz(!@*L06VpURKgFj9n0A-rEXon;%Pd
zawCQ0XdI$ShsCX1xU8L4vWRvDG*dK(xTo^&e?{$qA*B_m@Tp=cErWlM^ug+BZlJG@
zR6H%rjiQjpt5>=>NetHa&_LuNVJSdIEKc#IWr0b+9(<l+Hnr8w(Kv~_?noDA>7-P1
zO1+22-r0T3ht~;Lpd8QqMb5Ec8!5^~4<p_u1#Iy_@(>d>MYDjD)mz4Qu@_g=?`D7>
z_`u}<>$f$euvJRgo*Cn*tX$Oqoxf&@6!g$}@lM${jyitenwS};4dq_s8QheM(07=!
zz}cI&@KgV;u8!tC+j>}$I^5e$$a4hMENt7tYkpbjRJ1lipA8l~#W;vkdutm!)Jgty
z>Xm*Crb(<R*OKhoqKuR}M^jP?RE$tjb=LS)=s#a8D?uk8jU=XH;XI44tMt)!pp5qr
zEi)<utKMWK+Uc3<cRFE+)9P<fsw-AgqlEQLeO73&(1FcjWWCK<T*ws?`XSO2R5nnc
z;Y<RKPIUaPOzE<1O7&!OI=eGW)x3N_VDKB9c7wdV=Pn&7b8=rT)zD{=d2AY*=v`Pq
zeKLbQEIbq$AS)y&oLQVhlMS7(Hqr6B@}L?f2$j!h<#Y-HcO@Ay4l>7?78+ZN2XGt(
zKehwm63mm3O*?x{2WIewcue~UU!5qC0{4EqCIyQ{nv$srs>)P4an?LhDUIWg)86jK
zvTgSC2N!KokzU&)76F??nWCO-tRhYFa$G%aV5%i+)esSD!|f^at5<`e`ij1VDg_(D
z*$G@`x%-PMNSp+8A~<oB_d2n%*UeBSeo9=Y#1=?f*Fy^JU6aH1#NR@6BsX3V!+KQj
z)#CS0R9*<T<z0rJ)bU!mgu+3%{4Rx4bL$2py*FmcGDfY{(TmaJyoIc#<#g4uETgIF
z-H)pX{o5}jQpoWpyr9f#KR3b=g;=gX9Wh>~#t>0{IGnUltq>+SD%>>?&m~U^diw6Q
zORoIEIr3+=-D*b2Yy5a!Q`~8A7&jz(b=l87WHwlo)I-rBt~21Mj$hESkv{~Az!=)P
zZ#adzOR{UKT-;AWNOh4m{mxA}0}EfH)2r+<eOA|E4lvNC?~7nD2pfq7{3m24RS}ab
zSvlL!kQ~*6#0dX$S1>9h&QaWO64HkJq_plZape$p!&M{f3`pvw#JO@d<o1#M^XF%|
z{<oM2{~_tXhc?1_bgBc^foj<bf#b462FP-yJviJLf?5($%1L+A3lOC1Wkfd?C$&A|
z0nM@-2F9eSV<?dw8UXUT+H1LYB?7O*v05C*E!cy)k2V{B0yQ0*A#J??snY;wIPyy~
z7Uj;pI+M4M8EDx~aR+{^tkV)kr}}8PF>hBhboSsE=|>2j1gFxnS$-)94m7V|me4QY
zaVG?AjSgF=f_RwK3-Gv$x&USMj9s$b9<7UMwRv=EbJu-g*Xm{AZ*e<2xNCaWENIXL
zTy5X-R?8|%^;DO}yo~gAtymr&IO1fIp#n;+N0mjDXLtezl##-4W<N+ffgQSE&7T~?
z_ahOu!z34%C=?loC9fcgayBp-qm@Ql?G1@(kPk3Q^T#g4E?6411*HShvJX_uM?9C1
zRH^$|N`DU^w)+K1j6kk>D-7i#%86|{R&mKbJfu-5J1f+#k{-}6;38ackOEZ_%u+I}
zSIlbc`E4=+FRRdy?GC1rhk%8}NW6+PRR`QGOJDw_mPon&UVNChoXRk6^m2)$o!m7%
z*A8F1v;@!^8#_NL#grRzEgke|4HbQ`gqEJzi&TE0s*2@y#Gq%(02@ECT<=J2Cv!j(
z?9ySfLPZ%9v4tM0^@__qlhysi=wQY#zPEvr+!4twd(C;qSDH-xVpAKp0XC@i0EA^2
zODj{=NoWj9vP2=(0u_x(v=`kAs~ovw8S4jh%LX>6Q4rU+czPR(ws^3Zfz~lwKyF{9
zqN6aBQ@&x`(6VH>;TVTGqgyClZu%e8i{UlRMU{}umvSy{dVNfr>v;fd^J|*8Tg3e0
z2u@W-S2$NDT@cXSC^(iFIp$pH8bVV2bsF`8tY}80f3I$i(VRjTbhWql)d=2{u(s5*
z-l9&*yf%^N26K{mRSJ3A%d;!Fgh?Dlsx(wyx+FA;%CEi5XJn?&ab)vAQ-fp=Mv6)M
za7tL#v7&%kP(GH3D7FkE@l;R}0Pl0QQv)GcqU1tx6rk?sBYxhKtrT?@9*i$ZHO%gF
zEA%ZGK(dKK(>#fyt=M<skTAN;v&po*QCF!NGbK84H5m5!$W?>wfDKUrTQZd<{BpPl
zrQf5gza`rX5ngK#Jm&(^!X6L*Wh-EduSJ`nRIHRr$o*0$F<*a9ArMltk<>q}29@3p
zka68mU(kM&OlGRIB7Tq&2HDtrww5tCigx&l!$clL%Vn#lITnmVeoS$G3Wfjs=O8K|
zzVA!AP1#s|!KMpAdb5CV8&^}<u?*~9Rvcp}G=d)rU;Ou*Y=J&yc|!s*Q36$B{zWDV
zqo_{1Y8KOwkstM1e`K7C{xEf+rPJEvIl^zFk&pG;GLi-5)q7RwGCt{I#WL9DsS)Wz
z*BVHG^1aoXl6xsPy0O^gR6pH+N%wTr#*Q&>omB%>t@z_r__1yy`Z=fMp7;c{*Rh4m
znn8^3GWViRkAjOabrvIo_s8W`lXxwDB_-o&25ACP36=JT0P%EosCjmDP+|bURZ0S6
z5CgHH&#I*z+!zsIO;c&};FoO2O93*RYY&|y>=`DTKY5beyE89MA{wnNd5;u4vMgIT
zcOYoQmZ9+$R9Bf|wK1+$Ho4|};J3KwDj!_xO;Sv_NC7W(IOFm_as{ekz-|2nLw5`e
z=_RaEbh<ckhE>EhB(j!=?Y7c@TIJBF!E^rsKw)#W?5oc&Dxt*`d{TSgOjxM~)oLYv
zwSvB}8=CmWqrwME2i0EXjC|bWqRnJ)YOD@d8!n2HU+uo$R&c9^E16ZDu5vV~@D)w$
z1R$f*g<2gXGPS(Y(oTB25=`ZbZeJm#PK<Hv%XY!|Y4OEK)#k6oI7DhyKXrFlGt2fM
zO3^-J>Uheo3l`1Tj&|RRzDTr%qs%jDr!0?2lQ7>5w6#~w7}TXdGj)GM%)R<96sv-J
zATK1ljxH$thu_fj)%9a=Z16xYN`QFbCPWGBvv%Yyge_f8<BSL=a5^P+jH!YKWXg3}
z@<pnu#u34mn5lv?4uNIQR7*=nC4Rkik1|=r1bL;o@B$Tv#2yvsieV?0r^!2@PRSmz
z_*}hkwxVYzpg~9&*||suoEjkVe5qNU9~6A~B#U|XEFv0guFB-rD$v-FsY@L6pl=#M
z@%viNv)MFuU2Lqk!mSN6^XqnGI5~c)st`d*5&}p`MyXAy;h+uFV<sjW8&%{YuSIEA
z%nYQf_xXl=p2$QsdX9NsbZ#WIws(?gCS0R96AyVYvkq&Mk=Q?fVAoI*A2oh5Nt#D5
ze8l0<i$NT*h~qa2K~PHy6TDgy6CVD-K@yTc*+_WvN&GFvdGYDg)Cr8^2(#klwJ<BD
zjYmRC=LUmEvzI)4a0t$+dY1m9K|n)PlbmtBdc45rig9YYb^`P1g$KSEFS_{gO<e3_
z5UtdXTvY14VsCYZAF9;b?=1cWTnO7Vev@R1{<DCDjt8wd`=6;v&u?{G3dbXWAj=Z_
z;9cF$ry%zElZZx$*ZpIslPfX@izbFZgZxih``dcG>v64qlyjnkOWV$;D8s~@LM2(i
zO#^>S0tg=TQ2<s*5LoHdax<MEVZNH^M9EOhsETVCO)0*HFw(5g43Zj#&Jq4~hS!26
z_GOaSN3>#*{t&qi2D!4Apekis<D8Qki>1@I*iL9Y6VzBkzzfa`tBWo*_{CbyEsdqy
zZ$plKkN_Vp)q~XBtn~mm_h61}BToe|Db`D01eUq#E(Gt$Ur=eZ-+WvttH^vqddu4l
z*oShQr$Y%dw5f9)({FkxZi9`fX25~AxQ5*#x&}rjsz%XzgPy>K4PoVMLI@^B4g%Lf
zC}yQM>U1!s_F<*pPcD8IWULrTsT2{F51u*N2;rdgl|_o+Fn1Y@I!h5@WMU@t<6Lz1
zDHnEytuf}e%UsBr|193Y?VzQVRRH0U6^D-$f$!yd4M4-7nSwce9l-Nf=(h2K$J2n|
zPUMSKH5``td(@F@J}<Q@jvh(TmnLY(we9E`m##{TZgr}tuCg;x348I3pBs9NVjn3P
z;7%@U59Z5rL2k`OtBu@fve-Z@f~dxYb%J=@dr7K~F3;{~zip?4?IHP8OLQtux8#6!
zOB=)HzDOFY3v45mH1_MOV&b9q_8e4Y_Mh;1$<JQo2_qz=oH0J7yGSo(Cw~Azh+AqR
z>uO0xbd{DQ5p+B2_AkK$;x^Cb9B*b;CrR)q_6heEc`>~t1%_ZxQY#~R3`TQSzMhjm
zU0G0`=dp6|_DCIpY`gZAM2GJQ(NOICx>J6UqIlYH39)}pvHU1-_K3$h^me`Ra*R~c
zDf6h|E-hklaRJ;cCtGFFZO=|ArP3$GRls6PQLp6_uks4`iV^3Bfw&C)5M3;1RI-c9
zBfTm~uWE578YjBMM(fF2=ZMK3PCcx$*bdD?H&_gt6RN-C7UC?)#G>n4=LhXL%bfzG
zE}d}i2d7#?IzG}@LwShU(U?=(Mw4AU@QIPsl__d<l$F5IU(E(kO2r_dv=1432^g7Q
z3zWps{65sYXu|R@b`PGjQ^de$icXNa1WNeDLwku)vK(IJ=kn)hy)c&5wLAad3W)Mk
zn>Yg$Y~A*Z#2A0Hu)|dC%h&0J3?j60n<NCKz`N?0XPPp0U1WvPlvk}rqVD~n3g?0-
zv9$*=y8}ZHeRDIVQ6|<iY*f}bWLOFwmO9QIcQWB4SGhR`;c#-htgr8rb~8h^j%S%Z
z359Kmyk--BwNQ+ZhJ69@tYK7`Q!ZBd`JH^fepV)_OuAo~49l16l})q{hq72X#?bkc
zVD(u1hq(B$_X*+d5CEeJN~G!cECd8!9VVjwD#d`#^bqh$sf|=yo<vXuqgj#_XHGJy
zDFI5i3QT<$=1*U>eLZXtS?PhH!TEF8Z`$?xhj!J{9W#RT!=bqg4)DU^zafn}O{`*E
zsBxd6-Gk*WuI%hLzEx+^MG`jJv^GZYZjlt07!$&C-cC*i=i;UJb`&9{dw)H7fEe^g
zVvmeum4DEX<!cu@twYsA*OKn%jUH6f^kfK&Tyr>FN-1xxz`B)-S;~!^Zz7A;CrtLw
z;048jSS&o02cIg%q|?E9-e(=N{V#6U2#?f;0X12Xte4xr)-+;{o5nCbp(*51^2gl~
z3%LLYj%GH>3}ZRwM<<9IUCd*V5J$1CD43I=A3@8#O^|N3BA~J>3;kMWwA_edmWQn{
zSY+_<*jg2w(6Vieoqjc30nQn=xsxuUqdgjC9>XuBT++qQ0X6%`^0nW{h#e#~zIh8c
zovCipc`IPG)Ldi+@?cjLC~X~i7Uq4xMzYhvE>S&0NtlG_XijhAWcl2Bc8}q&%->L|
zm(oKN-Ra$hhr9l9Omu?qqIicLodKed;j5rKx$?M!|IN)#fS-O=;_xbqnS>q$`H@ft
zF+H5yh*j|fIWAiqu}38I`o=LV7XIVx@2cnN-zim_9aMu8@Pop3KSFT^k<H`^>(^X3
zzkijIi0@3u9Ww?~tF*OZc;P=eYS%`f*7*5l)YRA~S$*oCYGnENA)^E)tcQ;O4iF@F
zcz}_Zg*R%d)*6EaA70rni->4ucWtDE1gA@=E8m_mY=8+lW((hkw#XG=AayD@$&464
zVjfbWxuPGky}Ll{gNqsFA$bd#hp{?Y%CJkEV50^1K~0kA<!i|Zh`e2%T`5l%<k%4s
z=Cumv+I{IEzPb(5(!8@HH$aQwqmzY-e7EkygYk#3b`$z&N6MdQ{EFtlk$Bfn^$@>f
zgs{E9t&79b)yK8lAV<T3)^2pO&mgBv>oxY!mXR|F_IY00N<P_)sV=fRQlP?ZyRC~q
z@Kh(l>Z{O@weznkE3KVf+m06_35~MI*UFKt&JRob7y2EvL{4k9wm<#hViL+YgTz%Y
zDrx-7eIbBP;#%``A#H@_5lAT+xzkI_dnZ<QY%NSxV$C7aA4lj-Q6-}sqWNFft9f$H
zN&!bAB#Vxs;U1B3S=A9iGBtgixkWu~n#s>S;X1{a%7k|ht=mkFVu^nFP8;kiu~ZzY
zP0xjM6q#be?ZJHMV^^eTvAM2)u<UZ1Oz*l>IbQ{ftpcq_U%~?_E2H5JNf>L8J~m0C
z`wQD|!!1Gz8Rv>%;w%s3K1iNwUQmF#l%dcM`60&UjEu;mi9QBRL4Mq_?c@{Jjt|Ud
z^;b9Wvp0$KJCs@vQ`l^DYOAgeHh2zK8`<L!TRn--zxL*x*;d+UR3#Gm=_8tqpe_W(
zJ13~wccUU(!t*Q;M41JFmDa_H)Tk+3<-82ZqL7E9zTdhldMhW%;#kRC(3L80a0a8E
zB_}P)g%xRNBT-NL<HT!wQ5r4WXK!j=i#^JVBvF|Z-HNhcnci?jo7tr}AyygN34d#u
zzK+Fe#*V9}e#h6cX;4sh+YS;}jcxF^HzfCu^m}>2V6EFWuC*_m5OoA9c5?-_)vu^S
zU(KBfulQ$CC0RO3Y-!1X+6${6i>-cXelG(OX|8C%0Q0p%!i}La_SU!Ak%~%h%)jGA
zD=JVi--N;KllzkEU=G8yev%DyFR><XSZ{D|g(z(BZ7<##6G*BYXF5W!egk-{Dx)5k
z-|i8hab8(Lt5hsmB`G7)B=8He)m3r;pW=VrJ+*$~HMR=mH>tdkO0eTU{Ui+`WGoIR
zlom{B12?*1joA!+F{ltPoEAJbG#e`o!Hh|9tx=0TWWutQrTfNN2mk3SrEpm+BqqwU
zP+6=YiX=PLT7g#n-DM3dXb)8PxHFsNJCOWy33pzgDyJ_pqKHpvACvCsi>-9sx0Byr
zY(LDn8_7kr?32F#mc5^YrL@g*c9?_pxj0R?+r2b9J9x!sNeH{#9C`DD_p)B}WFoAy
z&76w6-RCZQ)7obL-=_7oJ6c{JI6@dl9dXB4&T460Q~KtrD|=AY!NDRS#&b-LWTOXe
z_c;~cSma0%H3F?{`}<$_3#D?15JCW;U4iMta)`_0Uo#@r7XEWaIq@Gn=7ty_a|kUj
zg?us=InCLFcr7mlq+e|?w_MR4qvKhf0ZxmWGXA0llf!ggTA)?@$Tcg*t5WR~jP@ay
z5^KUi;<^0LnJd*Yj6Y{CvNp!5OSc4e4o5IPz?;~)q7rGJAY2)!6;I-hWr5|>%~qmd
zPVZW^;@tM2vy5fJ^?Ba(LbBqTIQ|SWbS%5&W!1yNtlxnzdi>f>m*A45nqLK1gU#Kg
zm`L@+`vjX`5IVP4e@YfaBG%99+Rsug-|{554x0ByqEXZmB1gcu1hlY)5-OYC!HgGw
z_ZyUjqP6;T_^|2ZU<&_W3lezBw@hms#(ZERvXVd$vEJ}#mM{yegNOCh#P@#Yl1RTl
zTuU7x<j)SGP`k5*XcOXW#;RW#{ZkOKqHX3YV=6{|5tp7suwI_xN1Iz?jUb3~=0u+0
z_~z;{?C&c1Em`P{?nm+#DkCwS6&`BF$_L)!=kwf`xvOj;w_P<`uz4Ke2G?c%1$phf
z5LqL_jh~H%3|MUDVgA?!bMoSFzOwTUj{uyY><HXAC;7Z7wN2_+vZTmwLcdC0y_VvU
z5V$iAU(C=>^5UQXrb$RBZOvkmP1MT%sLU68B>I7_xuRAK?lTQMcp6E`Xf(%#^N0}j
z_ykdc=v!N8vZ%}0(<N!*ii_UrMs%fbeCddU=vtBNYZmeDi|DNuw9z64)kC4gCchMJ
z*DOT{!N#xB3QTX~1~oB-V5k}x`(MSu)dT|2Zv@_PMyc#}D&kQ;F0YFtCHAU2zf<YT
zAYDt$kUFxT<Z{WK#ky{HeU!>jPkLJ&-{&vzV&pgEL3k=<`H;Ld$El#hwaVSIT5t@+
zYQ|t(^ork<7%@Sy`nGrCkPl^h9q2zh2KJdTym)ZP-=)Pt$vSn&htR5l+x!YBE*x<k
zwNNbBgQ!g67gA%w7sD{!JtFGZwEdz@d%Hq~;VB}@?5Yuz0py3R+sCu}6I&45P^HHU
z(l*mXpkzUp_<^c0T-iVml-WPce$$=%&MV+4k7?wBHco-4Hb>bPbx7D!-*zy!&pWMh
z=3+=dQ@3wYL&+cH^`{X2Lneju!Gjl?fT9l&zMvgT38GT)d!NtlN6hU{I#iOYf@3-N
zd>w%&Upc-WF!ydE=2E7vHS^}$b&iqrZrPEy&ac4lH{9nw@fyO3>`#R!bBk>X-AWm&
zBKI%VpHJ8k4fZ)KyO^$(=<t?lO@FXgT=%J%a~x2|2b(_g@$j$oXpdhO5@``-YCiMw
zOo@cCeG)m5{)HW7YTBoiMD7xBO2<Go9(z&}A%`K!zwywHydtDTWd4;o^`nRS^3K3{
z?X`EAwV*CYdYL9Ty-A>&h^z8yQI#G~R!XQH3bMjnSohu+c`1N@df8S~eB$wSXTzmh
zVPllCaK#qG(Y@T&qcSohxGqz+(!o7PdSeA6v{y~?TrKSC4nN<^kbCOtl0l!Ib>52G
zM!jN@MkW>^+7l78psKQ4kf}8-mKAIz%Mo+3a$LG+r>DD0Uo|y8`NOeuV$S`ieiCNz
zg<9j+vNbuhNQ}YXem`?ZOZD{%`YQEz($>!2LIwGcZ+w~jX$pGvZ}@N<4?{J!Iyg0&
z%IGFTUw5E{`*&^I!+0fRoF+3sGeTCCdcS|QPqedRgA{%eb5d?)RA2B}Y0sf;m;5pw
zXxsfn(crAY6tsXvWR%25x8#C#mGdgkm3i%2X@c@cb=a@cgzG8v$i0#*<I4<lMDsnu
z7!%u@pMw>NPzW_NXg#%XurvYclx~<sAOV76IyLh5kl`Zbg`yB0OjB_c{Nyr<XAb(}
z$lO=jX8*R~Ky2MRnFt}R@s@U&#``bSNJ@s=Sy@cHN*qE-e7>l7I0ZCI5Xg(W)rv##
zQB;C3QtoFY^!Oe%X&7|`MsSNzG(wniasqVsZnz9MHqV0OqOKlYoMJBx#?z{EX;XFP
zBWfC=?$v%1;@onE9(kr;0zO2b1{nzTL-v^V(u036jinryF#w@b2Gywmql?uku`KbL
z<ByY6=$2=FIY){zZb#Ksc7yf_BK#2{hV`5CniR_3ngRkO?i2<KKnvEoC}MGVflR94
zbaI&_YPvahNw&^uP#+qmo{Ypzb<#6A21cF4x=k>|AEV$j*p-#Lg=S$uLw|=i;1BO%
zPa9bw5%l73kq_2{;SS!vfAaslS}%ICbMq2L^Mts|>{kKP&oMO=ie@yS-h8mhzVGeb
zMEO01E)1tgt^&eSm-#qO50VNfj1m(3M}f=(|CQDyb$nsmjiFS<bJ7o=1O|h6SO=D0
z%vZ*jI~W1^HLJmi=LUdOeY20SzZy9)jMQT`o2t(D<qFaZ`Prjrqof0QYE<ly$jct!
z+^)E4T&;DH7iHa-cLT^r0w8A)36=g36X0GzlfL?_PVNxDIrN;JL-^v5#*|_?@ss=<
zWhJhWKO8z;2CpS=SSF;}*)0~jqC-iciIrNRgWVM{OH49o7Im3_WUq<eGP#NUaa|IP
zSN?@*^wR)p7Eo7eXC>q=CZ@g<po>W(mZF2g`6=nM=xMdZ_P7~-EsgL(&GJbPK81$C
zFV)CrU1Z0G(-!>PAFP02Zr%2|P`G&^m!koLr5aR{>b?_nNbYrsIoN9phzxHHRCKwx
zSczYvV{xrOHpc~oW5hHC@nR2;dS-0Iqi27nCi6D*gBM}4x@}tic)p@>b2S%Fb-kpR
z`QX8u53zH1!Hp-^AvtqcA2<CTP5p&gPZKc;de@qxY?AaX&Te1|c0=~gd=S`%m~Ezq
z%X^ORvYWMy<_E6tve}?@zI;%`M~=W|YTjtr_Ygt@)Wh!lWD2_$L}S{)@_f4TBAw$K
zJbi=6OgSEG4-JuiF9`+ON=T^6Nl5%x73h2IXMRC)i~NWxcH}3?1qOb45=p8s`=QUu
zELs%sIA-;xp7LqfadOCV@;4~{SOM9np?i$ojJ(ggr+cQjti-QLBYbZ`S1?<0!|jIK
zVO({HYgZ_&Q984?M2ze08zng5mS6AsgcDBgaHdZc#(h9@e|$4byOAs0wQ!H6U{*uA
z1?t>J7`UC`UQ-^$&LwSeV~R$5)d&f=djoS7N61v%^E!BYd3gd>xLIiP5BAy2rozKx
z6S*`_vRR(hvqFRY<i%~p>%S^;;_#HJE3-tEhRAl=PHffQ30A}(v8QCobyH?kO^&==
zJ#3Ea_1kuw_^LvC+KX8xjbFdQ|BzVsiCp;+S-*PK1^VLgBPVF!2I=F4sxo<9Mf`g$
zEwSx;&8)7HBEPw_BMaEV+02r~$I<1zrWODY6!CEZo7-D@kegXr+d2sWuX;ZL$!#r!
zfI1*0HYFDcOB-9+4{nwkACxuCKiHe|SpY?Z5e0qt-vJygJ;3BXjt)-l{60d!zj68B
z+kbVl0?Gdt@vs*H>ME&{OE|k(l5??ev9K{q`Ph1K0EH3B1>G#H_|+w){|WJaCIqzc
z@NnU0W%c&<X7T1^adxw2W#{ALV`bxD<=|j`mtc1Hb@BlFFgv+Z{sr+53`t9Ob2nQT
z4_jv^^1m>_X3m}-LO|gAIQf71=jfuO^e=cP_kXhR&IhXx*oBpyg^ktGk@ep-+&!ec
z-a-E9(EnA#UGu&4m{r}<-PzO4+)~QR(#eDJ-ytl_|E2HZ>E`fvI2PutmJXJV@1pMS
zR@wiDNf|jM)qiRHMS-=gqs!k~?_~cENe^4A|0e5y`1aSx-{JhbBk$_}!u=o8{}ub+
z!tYW_O8k<}=AM7KCnqTc{L4PSg|oS>1^?eoE-o`ZE^{6WW;QEJHfAm`CnvKRo0%oE
zIf&PSmyg5D?7i`CP;yT09$+VP%fF!B!C7qIao!Pl*g#ws%w`sRmhTX}mds#Fc5Y@6
zFPoVa4~T=CkAvgiAXMCJ-?I|z@b6yz1!eILWx;M{!DYqA!OX!0vSQ}q;9zIw<+k8s
z=CJ@-v0HL-nzM1R{|#kf&M)ok<_LbDPFqK?wI!>Ill9*Ne-X|vrYa`{<X~a@?;ceL
zu!q&Vf)G#%Y)-DC@!unwwvLt>9^k*|WasAN<mTgIV`pRIWM}6C{kM>|rJMVED*gq^
z&c?#|58%J%h5tR8cV@wVCF(oC-x}}1@JqN^f<2twG@YFtgn)nfME;lN-}y~0_>WnU
zwRL}&@ck?0|C#g}mahLe`^Oq^u>E_8oc!;+<p-Pp!-zZB%hKX+L+^V37&5m3J6T)4
zFYte6)PMEc{@-SciwpD~Bo8wOn4N?9ed@WH`8dq2n0eT^*f=aKta!{U{xRYILU(tz
z^6&<`S&CV|NBSPkdj|a-4LRLExTOD|&Uo8c{zViU2PZQdA2S=LCL23HCnrBA8zUPh
zKN}m6^`8;5{<W_ED`Y{|{|_mGe+&HEM)0opkG}T}=6%0n{nv)|PtyM4@&DoR&&l|I
zXyG0DKSusn{Qifo|IqcnV&H!z{GaUl4_*H&2L4yV|H-cZ-{?a8??)a>r}x_+@An59
z8KJDP_lF@!GX)t*0H8L3lH>gh!9`Zj9RNVW`s)J$$j!%p?}YP^Q<8!^L4d@iAVuxk
z1_A)&069r9O`pw+0y$@cjgG6JsPc6lO!^eNhOtyfxlU>x`mDOtTEtYmJ^-4xi->3f
z$HX*UwOlar<sK^Ja(S|vF)YCfTz6O;+|gHZ-<onl9xVm~rz7ds50jYG>Snv{pN9Bk
zsOCz(DW}RkF+spGk)-DNHT*KUFg7^QO%WAexBaXF7r1FtmZ9zM<FY>*f(6H|&t^Ux
zio&T1lu6;BMm(BGrjdxnX7`Fl2j@9<#w3$7;=nAnY_codG5yMV!6<p_Kw#u1UT-lU
zVW{W5IT(q8Lvs@BcG({cQF^i+3Pr%OipavWDvn2ZKRC6|d0h`GGrT@VV^Au`#!sZ+
z`MMoVq*BNfwt9(SemY80YO7OEv+sq06Xu7<EDiH|X+Ic>DZtflHdT8CnUBRIaMDC9
zkb}h`p)H}w(bMTQN)=-;rDCz^lB+~RAo&)lqFW@=nYj_#q~aCb%f!Q)UQC|Q=Fj>G
zdLfUM1s|`k5JUkYj@>px{_t`1snj*_gPlNtni-WWV<e@5TyM`U4;%DeF&F8VZiGcC
zG$D^AIRLBIxA91n9~8MA98$MOlWAIk2a@Zi1)x<Q`D`lc7%TB`SflT#jvXJI$3l>J
zoVKA)OY@vQoYKe=-Sc$MGYN$2Stod|`pSn>$)%Q0XqJVHqB=$b`dU}>uIE1^z@DB!
zi}`oE9E`@0{2($mD`c`=ESJNe{KBEY^!`c`W;ziWN_nJ(54Cj5;pea<@_?V5gMj|W
z7Sh;+AR~qp+9`%Orq)qJuo+c!T7~Y$r8E|NO$g`{3{L^Fdo1{a?RXRs9!ot+oo1*Y
zy*gD)%M63Npj9GDs(Oi9im09F3=eoDAqhb78y_4F7VkD*>|taaG6*TX)li4*YsI{d
z=}$^ePgYfjl;X5vno^0wR2?8b#+GZDByRiCI!uFMMm1TZ7d9pqD$NC<9E!{~W*d1r
z8i$8=pJgSQOT~UbC6_`am5a>hc0{LIDjTwBj5!{z2X>1~WpdjajUd8vvV=j^H(q>y
zy%L>v7WPiiEK+J%eUlC1*>(U6%`x_C61zCr0G@tHadEgMU+d9i3WZ!gevD9)ppusg
zKvOZ9T~xew(OVC29t-GpJsgU{<3V-MZ86sfoz28EG>FHs%28`Jje`FEmxmk>q#p_P
z1*^VO$}*A~vX(zkyNzy`#jzPUV1c7}>06I*tnjd*$caK)%>cD&-87%!v;R7U0A<;H
zPDEmLgtn;)BPa3L)3QUDGck#U?hV&_e?2wZ(n!AV8x46>gZ|xx&-Ky_x_Q2JH2Lg_
zyrLKDi+n2i6fRf_P%0^xnjsI@HVKIU9!n$=36uhadhCsd`LPmrh&+rehUc81a(-!3
zPKVw=#KhiJ)vLr%430ymROFZf7`5+@MSkaFRlwS(x36!Vjm%Hm<%HzB#Xeg}Fm|uf
zZ)P|iN;Ikw^H@}374pCse9GTpN~4@aRna?w=*qFwkngvo*~1bpW9ZrqjSDV)!o#PD
z{=p}vE!}da#;t3e0a{(Bk|%W4yw|)jpvr$lSdc*L_gIQCxxpu%L(tR+&pFHtg~m|F
zX84lqeY#E=jCtZmu!niVCq)*xz5cNB!lbsUXIe<T8iPrxl#5K@_Uot7f&EvJ;EuqV
z=U@Ah!;w&M%K4AiOG+XV$cqU<yFWd0nB+?9ud@aG=O7X2-zt+u`OPZp-dYx<lZB;w
zzVOmsU;bdDl1nBZ*3izj4xt`SNHg3}(1-bMolNoj6j<y*xqj~pj>oy={EW;PzCrOo
z1BCjH;((j|{fH?|kwY<gHJ~p*ECe3u3;Q(ihu`N+L+XBpC90*D@J}Q|-j4`D=Am1g
zCI-zHICUQhOvAyj2<KQ#nX)Yk*?dm!d43LkG4cl({`v_!?~6kwTEp-N@-Vzv&>Y2*
zV|1N*m{7&%3lpPcxuQ9q4m9Slm?>-6MpzNIKW`y;8(NCHXO4NmIupfgWn*~vw%6Pm
zG9Q|6L~E8)HhR^1a|%en?K6R#q)Ri*;=0(;IiMzA|8cP+T*+1eX@1;x48H<tob#}c
zsn?-(f@{s!WqCt<8iUQ~Pm)pl!U#Q$Zx+U8A((91;@u4zBtg^2@$ku&r0+y!!(S^`
zD8;lbDyrGQhY0o#%|qxEknO8dkOBqm3vvKB$1ky3UXu6KFA(3OxyZhFuuoF6aEPPN
zaXOgCFxhXPu%O*@i5R4mNH;avPi<g&3ASSv7pcv%E6;J(5{5z|41c*5(onohKUnbB
znZ|I4q+;^<ZkF!dJ&HeM?cc=2-np@d;N3HB-bp7f-iwg1Ypm8GPQjrr?a(raN#xM-
zS&rX!yoxgbQycQ}=5Q!14X!?pSBe7F;Ix8r9-h%y`Hqr>U7Tm&qmW=LC)WtcCEFaX
z!01Y|tnsnQ6a9?D+vKO^-!R;L?F&QbCwz13oCUjr?5jDJv8=w5FV}ZaQP-DPiaG;*
z1hit2J)=?a3&v~T8B@)&l#X+bQ6DzQo7P^AX+px2n-?c}PjXD7(HrJYT_;*+kl##W
z`G(6^zKX{nROTT-q$8S;rTLFS2egCho_*PId*-|aEwm=jbeOL+0+&YP-_m!Nfgy%s
zr{9pX2&@4nI|<V*BZy1>Lyp?0U2Z;uS1$&EI#0veFF)NAy?u&?KEf0N={t4JBDehK
zfHh-|1^n~%C2<fe9FzD^?T3wrxS5kJgKOJIEDDm7b?3jmUmF%MOq+Bu%|gAqhY7^H
z&-~R>sP49paMAQA<ZD0r-m1JD;IqG~yp(ostV9$E&$@&#BCmj8Lb3A%k6?LntnQj)
zjo=;=gN{!!Sie(E&|Tf3p8WXmM+(!SWz?wAJ!xgkHkntP>Uw@!uhA_L%VV#G5gL5y
zlIEOEp{Q@UQS{_n1`IC!gZtYz$-8HQ+|jfDmE^d424v+krQA{0ru58i^}>D8f$BzN
z6o1E(hP*ao|7`;tVqkbego{SW<09%COwU4ZqL_U>KSD+3k^`atL$`~|;0x!BxBqzS
z>Y=m9YVNLag?lL#wPdPNsf8@Mbu?;0O*`grA_=2ZeSHkHWlw@@tU^L0;C-VU9)lM-
z78?8BV7@hVq<h4_>zX9hIZ4+8{3?!B>^3MS0G0oZ<BCIdT#qHyEWyw4@Jf(|HUrJA
z2^9d5d8*T~8=nLbI2fgfx%lfB!mXqpIJc>LCKbEx73hrhY|jxXUS45|VV*@Lg_&Qh
zw4`P+B!h&iKVfR6HcB^1*DM)SMjpJ#`+W~t<WNZZd;QW*8ue7b>n!$NxSZDc>xuuD
zEt#S_*A9_A-~@WsBm1Ezf9#aS#va7(H6CdyUv=c#nshLcp<2hTIFW?mew5<!6QoqC
z;5T-jC%B~OwXtVs%I9y+M&Hmzr6NgEWy|@b@Gc3zX1gpVkYLGu`4UGG%YnGPH<c$1
zuvCwVV-FmA&Zp6=qIb*k9XKi4250a}jc!>#6#YPx)xBPv_7y$?hVjGcCtIh<_|KSR
zQ+Tqa$r(dIFu<UJD-*ztw-U2UwMfsm=WKHih9~?AD>%Yoe^y?D(bdHyW75QvsjHAm
zs2x1aWPlJ~Vye%O`jn0LK+t<8=~@U_Ua(IDB1gy#p33tVE?GqWGf>0W%g4>z1AkJT
zi6(m~js}7~2Y|yYI=nKnccw@U`4EEXvS}$(kj9M6KVu=U5sI`9UbQ2AvL1fe1!Xdm
zUZbpad{=xoZ=s<EKuEEQVX{O_C#WbJD@tv~9E~-N;<z)@nL+A1^9@}S-S6)XN`IS7
z!ly0&aZBGejM8|+tWt|a_~~Q~cFyysU!akJtiU8%_Y}@=uAB7YL7IoB)VG77AIC7p
z5D-VT?SeWeJbzw-AF>CVmR`B?6z`~cax%PX@obwvk^cF}&oH4tBrZJeP*FcwGeKus
zBAE_U07iz^H7&AUBSNw%X%(5Ei5x>o|7iX+sxfeEKVTjb4rGa1UUu=XUR0zcA7YZa
z9rZ1OP?}tiEmFH(e^jvK*!a0X9;{lAqs*VP$AEXbobwa=$M%83fMpB!p>^|{?^H(=
zq?E191eVfy`u9dY9(oyQOyA+7b@cCu)`<*=$)|e^WG<P?Mw?Zm{BK8$1J*I=ds=u8
zUMH}kqOnrYQkedO$*?fz;k*jOSSBqmwN)j|P2Fsafn(iMmLEL%-ndkHKI`~TyH(6O
zH@{`LK}pfm;L<^mDtfG(cOcLT83I+(iPchqaHQJ$UWP@*+u4Ww3@zZhj#D^@{6A;;
z&vDpFJfi_%7MaY)6eG#li(}xokyFgGIF=S8ePG^|wnL$V^>_*P;0(dCS&d)Nt#X^5
zGO6En;9=y|#hD;z`mzxYs`pJ8C8#D_7#GVWzgudYXX?xc(gx%o8qKbJ2X7qnn{ZgJ
zzd}90WU?)ZCqA4mIoJ}N&|jyQJGhxB?<=z2uhUK}EvJNMkf-&H5Qyi_H;HCP86MIg
zsmGU=3(=a-GnNKJOVN)3d3weqI+xQojb-tVxOB3q=;~!}Puo;baUp~?I(9>|z`_Rs
z;{0DPU6Sk-*=fiBMBbCJAyWB-CIE0}F_$Ogq8~6EuqbJ8MoGs}*AcMyzHwz`TgYNP
z;mNfQDmh)3r~cwx4;sW6O3Xfi)i%@x{efhGm1~tvjRLyCD;E!|a~k;%M*aNG@G6I!
zeW2ik0cw9kS0kTd9*omkVkHMxB%xu9u2=j#cy{)ULF-x?qRYas>KOAzKU&}OYvde>
zG`!(#f7??7P)R1DSi#eEQE8ENa4t;oA{<AzP|xA{U{EyojYf5`4+$V+%?}0@(j`68
zuECQ%dI*R8{EdH1h<V`y%5TOn&1SU7NnJJ3L@2_7dC~s$sx&Oen$<1YWkq9^L-)`#
z$)!+^vK915Cz?xL*)thX3OaP6KKF1>QTPc@OT$O_c<}>a@M;;Y1H&RbF5Y&w?fud;
zy!#ZY6>HZu7e3S=QH-#H5e2OCAKKNciBDIb7{|xMr-)XnJ=kN+3l@65GEbL_{5~J8
zn2S@HbAWLp-&CY_BY>>V7y&64&70)H867o{Ytfg18ku7eRX@=eO?GV-LylBn_>F;L
z=kEOi!gw4r?KpMq7p4&<`$<QwST^5x-~iTuKQXd<N{iowX?W|TgiHBp#G##Y*jM`6
z#_SFH&VSr-I72w7Z0m$g?t&0goFSUo>98b8duGxMjZ(6E8g~n*vwx&O8LZLq){y@V
z2=y^>7usFXy(#r!j)0gSa;k<d*&?QQ8=NRP1I66VF(@^=$e`tVTY(|k^2Q9EW09K7
z^3e6!aiH$<k)1yvDfFH{T0vcr>6XOFAB0a1rW~c}t&gkTj%Mw5BOMGC{B}}bd2K*7
ziMjTe=tz0@K$8j)>pn2kwN5}@Er-(OmT7d^Ds3pB^%S8vXl!1ZCpLz^+7VEZeZs=Y
zl*VrM#*>XT(flRgl0&8T7($=`nRATXN$v9jo^){kc~McEA+Vary#2FM<6U}R%Cp~y
zYVryFTE@ociUrLCwb{9B@3SQg^RsBY9PcSO)K%Z!n04fh`Lcx)f%57tQcX0P<Z@vQ
z{sLqrTAJYs6vWQ6@HyU3`Ev{K5=VB8#mbE{RA+K4imI;_3MwMn_JR7@gLq-9?K=^G
z%VjnA89|v{(&p2%0@E`uKB+W*l?oJdD9PmtD%;EY-WXAFQq38G;XZfZ=CwBcM*^~d
z_%^Y#jT2bKcj-VDwiuJU6G0;XY3!6g1xR6uV=$_(3D-gz;hv<QisV@Kf;!8bK8)q%
zhDSL`dv1I}&iitcOsyXIuq(Rop01=E<FFgKaDwq{@?F=ajZO7)w-EUroRT79N?x>M
z0hi6jIoIZ@63K#c4!O_gcCFH4u)K2KN}Nw^Fs5kg?`qO`v$?eL4(?F`4sucw&qT;D
zhz_n%0+M!`OW|qC(tHtB1C!iBQ0kl6dwrExpA;ieE;%F=1M{fOABciGwZ<;pih2d9
z%f4gS915P;);YKSpa`bQ59j?XH`CID{6i2NqSSi3^^>S~7qHy;{?A1;cY@%C4|~FU
z$N#5=^A2b8d;fS6F@jpLXNuUhM~o7q2x62ftt}K)4W&huAhq|Xt*SO{t+uFE?7gY*
zp^d$3v>z=+e))W_-@oU%&vmZrKF@Q`x!>>Cb3`lYAmSC9!Z<ealL@1jo(RZZK<ZQ9
zTCO7A8LW*<!6ywJ<i;kXNT-qmC%{3q$f&4i`G_YV{lSmHd7bV{wJISPaasE}@hyZF
zUWn(eo}p&@m%0S~tk!l+@on{GwsBJ@V`}{H!(&?aIlj2d5~+uU{Uh~Oc^z*prB{<`
zFM!2oppxMDYhc7^+=l9R89s`pz^Q(U4)@p#rJ8(avp(9;tC$#c4D2oxgWYLP$9<)(
zCy5OJp5?1%AX0;k1IY`Gx>wR!<BrpedQ?J+v}qta@5(K~BzF#~y}&6W@o)JcY@UGN
zVOp*$xq!eNcZ8$en*m3Aw&M}H;!IY(N7sRW9G)@Abtlbav11Mtg-x^1S1gj3{E%lh
zw^q1QLyQfeZ&1NJp4_Q6z5dA%7Sejw*yUziV_yLLlAPS|&lTg2>M>fGCPRbi@?8%+
zYrCHNPmZsqjfh~LuW($3jJ%P-6Z+ngK2hBix<|iUYva$aGd3kLL)T5bi8k)yTHx(+
zYioqDe80@6n}hXa^a^bj(ZhC5)=%6(P9V7E;*$>$JAq;b7UnY%z)d4HCu9cq9KPJk
zJA<?%ina0JkruDY)VDs=YMpYkT<Y89Le8T{%(^iTIPI-0F2gZ<0aVi#xA={ly4YC%
zz4`Wf^ug<w(3UmlaA5|5&@5Lgj|<YB{By6qvu*5^d{u*_5k5$jILVk5pfmvRv(MAX
zq%PTEBmge*X(p6+WuWPb$8b3sm3Sdo86)cpd+P(fB`7YO2Frk24#{SA>Fb6#(qc10
zIE{HPB1YN45@a#Vx7qVal#uwL%^$x7_l^R<)${xe*9_|ag`l}0$OP&Q6_87LGAz<W
z)MbHzH7anWmI6>liJHoIf9omPfMq`^HPrA8-WIJo3C%sxBlv|XtIabg8ibe-v4DaZ
zR>q%M65i<3ar6^7yYl{gj9{qpiB7+2fq^lv3ZbG*SW?)RWil(q!%4FijI8RY8wGe$
z<gpeT`MrqDGa&U!-A@}40Fyny;08eSlpp!Af)+L^RlD;mRlxmrLEMSP^Xa-BJzeqZ
zfva^j)N~AfdK~>FhJY+amx6{`w87J&F7K~)vvjy3CJldvL@9t6e=ub0?K88cicG=i
z{6xjNhPTVFvMGfn)+K|Qkie|tlzf?E+}K&s7tTH73#uQaL7@|?1en9^m(jRnCV_K?
z08yf_4<3gWq&J)w)-})Udk@VTf0hd{68P&3GtX)fi&3tcH%=2X%xbC79Wl4uXhr$c
zH-pmPX1Pg|;DvVO>I7trylb-LJ5~UnK%kcoU|vH`v8vkZPBOSLh`OYR$yZMo_jqAf
z7-`!_e#!l59{&rf!j%Red0`0fZH5wLUD;gVCAA>Wc~8@Q&}BhG0opjC7Djk106c^e
zq~uWn4#bK<;2Kf24VQuztsngmlViK!)f<Chdt4Zd^-f`2kK+bmeZk0aQwG^~L_>jB
zZ=$slt-}xMnUhSOnL?YFIoA+}Q$Ag(%%3V)+mZPQh&y{vLkS47Ql_$~?A~ugFo>;S
zbttAz6D=PWr1TISNEfay;F*X@eGCP*^8zI@M9se<AT#I9Pi{(>I?NHLqjGTZs-tBg
z15gq3&i|hLdY;c9!6II9L?zSWtumQ#Hx>Y4V^7LNj#>y+BP?OMda(f6TL2l}%B$5+
zi6t8q!jKGJwR(D>jD`@*+W^on!)Ck_2DkwTYZJAM6qTd`rtpA7gIqrg0|b}+4}~T5
z0Vzd*GUNNfK7En>cqpY1GQk8Yyw)8>|4V5~>Bd7pdD=O|%h*!_^8lDZ?_i&<m?mw|
zS|Bsu%pRy@vzmv`oWa}?USc-JO&2s$C1^29l(5IT*1Cfj!H96WwAnm>rd_@3EFE%Q
z9@swv&QbwQfH?2S?}AH^os^al@K%VFD=;(V0w!UlXwuowL^Z@)Y?3QqkS6c#^9AHu
zPtHw8>a3u;@R+WfMt~t25WgmH;&mGyl1MF`VGf{Yzam7sb_l$~!nxFY7{h#c0>d?v
z_m^otQ)6D?%M?Ito+E}zq=wQ^Ee<;Tb1ktu%Akp;UP6rf4Y503lZQ5zCBCJ0I@-!C
zq-#i=;tgnN3c#4=Z)y=>OY@xC1HVV5<$Q<H=dt44_-{K2*lavAWxNN6zyx-gwLp+d
zUyU>?B^77yHofye_E7Ie4PgCl8=leuJn^&HEG6l=@`lD|x5tzO@_>jt%9m@#ca0}+
zR^A>#;#MU93*W|Ns?Wp-t}sFa6!3KE+jw()V3D6y?2r05-BDRUXz`1I42ARw0q%Oz
zlmM4fRqJ3BLuE`QTv61lC$OJz2g?V-?tux(m1D3pN9d;@i{!Q-_t%U*o<5z9zuAKw
zfnJ@-{gi)eV*te((Z~~UNy$^9exk$Gv)YCbw3#yiRzjU>Ud>QORB3pv50KVwZyv~w
ze#!fZ*z=1OkfFsgRGCLp3qu;HnSP7nlY8uHTh?Dv0bl2}S9;tYWC-ky&m{_1@Lk>N
zNw$8JSfx8^!lvrb5)^_1DSSX1#BZlu`9SKa%;b*FR{<T)@X$Jl870NVFKM_Ntb0!_
zupZN>h}(NlqoZTByjS+}%VfOS+AwL!03an@)U&G|>Fkgx3>tL2w^M-{Rx_b|kq+Pz
z$8OV*s9+}7448$%lk0_Hl}Sr2iWMQ=2SePN0&UWf0S57DIr3MXB^w>dwvwwuxf|u5
zrQJ{b=xSMU4}>x6rmq8h8_M-@FkKEHqmNIGIN<oYo;nBc!;XXWS6$l2>QI+BU8Rf+
za0YgU1F$Zo4n4kTyhBN3tdJ0s2+z!n=yFe@^AmA{WWd@E42QoWCtxUBvMmD85eN>n
zU;6wBj2_@JFhF@35Rwwj^?0}BtLFD2;>;KGMX@iyR*wgVL6&0rg>gR&AzasgttdZk
zh#y2TU*{Fvh-bZO7}KZ-)04^&txE(K{+f!mek}GOdDK^U!FCCGPXIo~=9yV$1HJ(O
zW9&91y^DVRTFFW_`t;v2zVE|?v|7p6@wB^_++0T#TkllftxKOIrpmS*C2)$c`%bac
zQ_C#{dY`u_*Vd)KkOEnrmKy><fo$>`_<}5%7Ir2dYL_=%_pPtUi29s?C_44FuopfG
z%?qO0?n-SE1IuJ$iYlcRZi8JigWT5c*E@BgbuL<xmwfeZhKSD+WBC15r9y;m0Zc^W
z>Z?C_ER3>5w}4}WCNL*L4vdOrR^PNV@$okG-)yL__`k6G`UmJo!_y^F?NqLN#o}rE
zvHSpKQ<|!)H!BU`CpP~E>1Nz`VZ5W)2?gV+29Y>1Jpc+phmG<>)8%5~Z)9Xx-slCt
ztdcWr94Ive)KNs(kCOs3flMwqzqZ5sp}<U;dgGh6>lPT`pQO(Y1S!)VpEfEuKX|Ls
zVw8?o{5fylWt~)0ruG@ctETman@oe5$>sXJnKAmY`c7WfoB3k?aw1726?1wO?TdCd
zax72h-Jktzk{|4=@i;GVi9ysg+xeLp>UFjI|HYueE~VM5F-J4!3d3UeeP=zNn#~rA
zc({!y80m3A7@_k2#c;cb5b9+?#)o)&w*W9~Ru>=|r!*|%U!*_T4bk&SB~|u`sllGr
zxZ#Re#J6VEf6za?|K5%jmpaQOp6i~{LbH9B4jW_rXN`;8N8G0=`(9<Tx32setc-Sv
zLNtw}v)tnU4#kbna@`}k<e^toQcB`g4S9OSlf)(sKa$zrBq^E{^mQaQ4Jz_s%A`_u
zA2Ld2z(zpQ`AH=?(}kT6XQ=s#W&Wsld!xZ=p3kYfM3s#IwbaN#I?lL5<4wASZ43??
z=#mNFXYR9AW4X}nrEJcHE;w^E1kuT#8fX06ht^UA0QndFxOM#5<NMzTNtxz-i1H1p
z|33^%osikx19v=udy3tRpGp&^HGqdz4>K^4_Nu5k?xzg<g&u{f-OOGtf4}!3?s>mc
zn2l0)^|ZHC!ch*{^+xJlGEKt2lW$u|uNJ;u;)c!D&**7xa#!BU1T45c_gI=w4F$n~
zS>?(FS{v~d@@plrnT)o_K-0b#YJdke{p9GvGFqciD%3_uPeoQ~o!oZ8jvizW8>_kJ
zRU9-isNOddhU{qgdj(lkvvbD1%3p*~c34_wdJ_Nj;ZAidz&MShz)XZWDxnt5G&j{P
zV(YoXk<s&HPK{iW*1pOQ=R9RTEs{d~8T$Ho8@E`uhJ~GIoj2=Gg|Uz}f1c?cKAE#8
zlilEZDknNdx$xqxJD0zq07!`_+-?)tlpltRX6Y_`^?eKK3)`m^zeoyb^gGw-&d(~b
z=_nt+d4PtWqF*oeSqOFJ>)eI-=OG}Hvhru(?=sbtH_Bm+?W%yz>&2DFy_cqPNq`z5
z`R<wuS=jQX4A&M^a0H|af9E@4HMKb~M|R^BJj=xte&A)wiEA1fY1$`;YvcHJ{EqQP
zGMP1}pA&Wa5NKwm(`!1aEk`t4?%CB$p@>oL=oTMA<AxFU;w|2=;(MT)W1wWin83o(
zN;R7h!y86yq`*z#=T*$tXav4o<XARF+-oJ^`Yxc9nO5Gt>7!%)VE*^$)h>1?^Qku>
zjnUF&_E+oFO)(Qznn2sO)*%iJ<p@dEjk^_bTK`<?Fay(AP@HrMM&bf07jW5_IP6Qh
zUE$B)X}JUA7AO@r_a^rgAtL2Lv3xfO6@S4(3gPPEMAZ*Ha15G=N`$r#dn_bd>pvX(
zTUj*hQ0}Zoe5z>9asdD^Q&?ABo1DL9O*QYx9Wap1Gh<zRD_Xj!+3n5BBL-bDRK2X5
z=naTyK;L${ND05{{7(M!0-&rCDz@S*=U(*PMKKwUVy>D45rB80#0Bv8p@K=J=SFj^
zE89rZaA_e_o*2Q7u^w$o3?EZ`b)PKD;+}rcTKkne{g*Lxp&yL6#XrzE=>B7?F^cn?
z(LWCoRZ5K-gPeaOO<bKim?b*1DT16m<5ZJ*#e+u#1e<hiYgQ=Q3Nl%|zEfrIkII{v
z0A)*;Oo0`}#q$Ny)YYkXxAs4hJmQ3o-;Vv2gKlWd5yOiAjkqd~9iOMviFZfXz9wZn
zQY3(L5XrZV69N@ou{$hYdb8npe9p9kTNH4Ku0_6SaRvBEZlh4g2oPQy%&|tNH2izS
zs}u-*Y<}pjUCNbs=08pIktwo5n(_U_u+e$0_EPrYrxE#H_pUVq4qE4V@VWV^vDJ$y
zw`9r1KSwiRbr79Z%Jh1yfm1|Jo=lB~d~@ZGxbk;+&F)@;<kzz1q3G|QivcrXhfLE5
zZWz)CJvo{1(mE`TB>f_(o%E^_5Y;{$TR2s8G2S#PLvdX0k@vov(i5C)<%g{W6`$w)
z#MfXfy3Dz_23g@oHfxOR2<82cY%W=~4l`)7bW=B@wbq(s`9)KNoDg-@!&@to&Tf4c
z1siqs1-b!y!Y%Lz+|NL??@kif&hkjH4l_mP9BcOLFT;ARTZ74^6b-S}gQBJ#$>R#X
z<iqW}JmT1?SA>o9*mV^xNrYx+fE_+I(_xujKYvK5%x+oLT1!~=a~6l{XQKPlNBD%E
zkS?7+`RJw1=71Nq4l88}xAx?lh1B#N)@t4!FoO%iMs<Sq3QMb2h>=$b_k5ILW$nZ@
zRi-xo`!~C7qYAH@q-RKEQbt0)|K1Bbz-B9fRqp2Bi#1v#sTSOHS~?hK`Uc)p7xuQr
zPTyeIgm~lMN7oW1EZtBEJYNWr^Wj_<4jU0z-Tv^_1G2^wdn<8VN79tNlb-?`%;ctn
zj6amm&o^JMELz*7M>5(DcI`Ig3VZOieKiL0{}lW@628xi3#B-Y_G=XFrIvdbdQGlF
zqTD^07y5=6$P^!M9v&CX27ghGj|9DYb75|dO@HYhZ(cP10#kf&n!kOa5y5N;IN{8`
zm&tQ(*WlXg)FdxXm4yO$Hk6&vb4wf!edu_Zc%H_<=*6^}HQ3O{K9}nXJz8lX-={;4
z@_uYF<Pnn9%U_N2Y&!)od&-AJ&V9JhA>DH*x%-4u+9;Rja_maiyW)uV?R_g#GOi-{
zY)ISvw&!cbx=<c7yPl{*t~6&A*Q|t-SC9(n_GUWfXor<&vfIthKh9daRVwU5^G3b{
z=?LIyDP*?Y<^iU`ZEi{4t0GZoxi{vyy|)o}b{AKP_w1yhUNHBDKzJ9pNMnB-x(+0d
zs?}NDyhg5-$XTD|tiBVJPNLX!x!mFgrpYWCJOndA3TmGskbc{WWbHoTAaHiQ<E>Z6
zt!9N0kGBEo+R3}(5-c0q&X1z|*Q73IYbEBS^EWL1m^s$PQ#_kga<8a1`Wd~V?-A}{
zOK0;=756v7qavMn7O2BA#TJ|RbNl#n#K+T)ux_nSJB#BMPKbXg7Z8x{aa2hqItsdU
zrN%1-dRY>5g>225T~>gu>4puq-m8W~QYNc)+S`1XtluqN>UzA-SlNjySHEM6Xfb8S
z!=9H+vh<|!a|b7Eo(#je8iY`z4}|D!`cE6;c4e%x@POzGl`>TlJ%nMYefX0D#`qBt
zx|Z@i_B`*Q9n93;#(!minzYHmE)g%_Nm*IPSY`~swtB>RSN*QR{J7VFwR{^TVjDRJ
zr@QM~Lf8iLUW+vG5&bXAe4fTAcn~@KlK16hex}YtEOog_u3L(tW|sWwoTK`_Cmrqn
zuOn(^lopxLb(j0+N7Ayg&=FJRR?Q>pyTuZ}Pvzb!S(v;z8{`jm2Vu*jKsQ+7raWA5
z!|fRi?X_mN{#a;aA~mZR++>F)?9x_Ho?MtJ?bKo4LZ>+3p}poSKrNN&kx3iYt)?aF
zIC&{eD;)mrhUu?b=N>a@Dw7SVDy5%MT2?PwyK~HjdGx5L*rBA?FCpPQA?BpHT+4Y=
z#z%=Ahu0GKYOd>;(#luv17dW3&z*sI5{QzD=BXP~_7J|ScaGdT^=s`gcQIL}Z@(!<
zl(_v)$HqOTK@59*^FYpRT`QPV`SJ70TrT|X(K)l5*>@nC{H6QU#Grn_nJ7F4r#bQ#
zRCayMtSQdDqWQ)Bc{@KxyQ3ZKR(rVgb%zZ_DC4A6>_wVey5yzMN4whK%i|QaBtYT2
zF@_%F^nSBq8U1FTE<LE<;-5oOXD6dYZ_1(??BU=^!<VY?f)k%l2W82!6emlxyLmQ5
zx7d-hrB}tT-nbzuYm?cAof&^QWFhT5hDuZTwkhzRm1K1Qx7(1NYwfSe3T8m#Vx7j0
zWjD7fsVoFM*zv8y=r5iz^`X(xJ<iOBKR!^k16C?+I25O3(qEgUXjMX%rw-@z`26(1
z*r`7K20eo^>3$ygWsh76Yd5(^u15L;XQ41s=w1s!lX1C533oS5ctqb1o9V4uGrdI{
z67(HdyVUXXVYZyl>*Vk;|L4DXdhYbMaiAJ{*_0MHo^qm4&sUSd6o1Q+5u1+c+p5%G
zm8xalup`~~!{)$C_c*35iy}0^57!RA)a7W4ou;8egJMxO3m)lz&5m#?ABb-ReZKBx
zcUzpIAH0hxvenpf%`#2e6?=Lsw_{l9<7w1CbvB_FOydIAEo;1e<X1&|P_jRP?#;Vw
z{8CJNje}4>rBN!?^#P=YU%s3xyhj3R7LdX6CMZa#(O0QkC(kVfJ+-Gk5Ibr1h%N_-
zzCD;Nfr3!1K2i7z<Mf+EdO{R4r6`*;#4&La*))4@yuD*iUa-medMQr6S$nFwT%OEC
zquw9Vx7~B|cGu6n#xZ{DutAX(iYF6vuK)lH9AttpIJF_VH67gA{cK>Sm$Lu(D)u}6
z_?dgHH9$h8W8>}?iG8)uJ(p#lLaXS_?{<u{tAz|$uduIg;JO#1_1kIu4)`O}=qc{<
zCya3h1`iWNf5-U>X>PmVoG6H(TV53rF5AfA;qxoW^;V39(_6=2FE|0xhZsg&N9-^y
zaIqV+c)pOV$hEcjBY4TGxlO0m6Z2Bg+&}V(`tt)G{oWxAyQm!r$h_vwmAzsF_5K3k
z(>3JwDAc|2Q(zpCoF~%f{`OH~e;w<shu(;=NS(DrSh-IGO#C_rg?hQFj|XaazYzh8
zIkeCz^Z*<KC%Y9{8%!O_24`#LVgek83d*l&+~5C<zfyU)B7zjE<nhSz;~!t#<^SYc
zKOpe-2#57(>u2@avZ|VuI~D0zBUkOcUw)m*DjN{l6ePA-Ya?u$<S1OH(C_YP4;S{x
zCx8)j6T@_s2#RKX=jb}spY?;*&g*_h*PDD<M8uz*UOc=UkUL#{_0BGoiVy6mp*~D4
z#v>N@@Fjy6m|A#5sb3~h3$7Q%j%rkS!VSnY`w6{#4F0|>ex3~RyC3m@!lrQvo(C!s
z=(-u%O4jp?4o%DA8hZIZw)9?Ct=Ye{N)KEcd53{S7rG>wCQVk>@_yCBWPmAll1Cmj
zryZu&zcJ?N{AVT_ZcG}K!lEV8{{GT!?OrF}&8{Q^_1xUryW}&#<)fQcJaCDHo64Wt
zw%tRASUifTH|*VtB>bn!2Ggqly&~nj&!DYAA;>z7{<UyI5wRpfJX9{cjY5Fwh92(T
zX}!O+$PX#4JC36;WTmR#bSmfo5=*;J|Cx_U1S}O|l2C>_fvmG8=wfA5hG=|aXZ~>$
zD(lx|kvegA>B)+?LF(~zybuM}MC=CsvdIif-+ka2+@<k9$nDQsHeY)IJ<vyW`bM1f
ze*j()1;D#341!GgHg)pW)-`o<Dkx$GGvG!kTF<G3Zi`Pwaqy|`5gS$sMzlqN)27Tt
z&8uNQYMMmnU88RZVhj3xO{&!%^nELXRDr`E_XcSUa&M}m{ys{*l0^X;^(l81uo*z0
zVk4Za!h30mmc>Y<UT(wkD~i%YdBa8HgqZyb5&op$l+z5Ahyw9ND`g#%sJhT=n+2v=
z6=Sn<W#hm{2@vy1qcmHsHq(ih>*&omX;A&BD(mC8OkvYV(0_dF&70vvS*$}HvwvN>
z%Fgfi;dvN1?_@>XtzYdj<pVBw-v$#B_o?S{ga>6^ZG%UYQ|%uX(&QS-1GAAsk+eEj
z&E>lg-M?0zz2cy!PXJn?DRig*iYWWbt2geP-u1JPFd5qOfIxl<Ha#HLuMpx*8@2`8
zgE{_jQUIQ44DOxXPiz?CR~l&?5wl{$NO64mI0M$|7pGI~;jZL?;ko1l_vAuuJ&06B
zx!nT6j2IdLSrQVUk{?ld6g5^F<kIaV0?__%viA4h{kCW8iEruzrRKRt9u|B&P4)%V
zJOim|gTU&Y@*<4TP{aK&9UAsQ=|g7)pod8Ughge}ZTL`bp9i4i*$ZxV=}cIMQ`Z~k
zU)jj@Nb%@0Ai`(qR69CZk(mxh6V-G`xqZsc6zZ4uuV+q?I648WAY7+7Ec3{Bz-XEG
z(PXk0NQ(TPM2Myp(mmU{mj*0<KQe=RYA@E$R4da+V3Wpk$cb7n?fK;5ZnM%s1=|pv
zFsfgZk<47Og@}fZG7s%wsWdn`KPzM2*)^T|MTkjM!0O9jpNU!c;f!a%2!g$GL?36~
zw*4x{NuzlFHdZ-Hq>r<<uCY&p&w%}-(ygOk>krJm-kvCeNwX8kE_?yZ@z<0o^VRd<
z6OfWRUb9^=_J5%A0d*0i)VHxus#XhbmJ#sieS^v$6LK~g@W6I1$x*TsaYX8U*PIr_
zLa^X_+jft|>16^2#pWI>@sBT?XQG5ZTUmBvR)z7k{byAA044@j8N{JvUMthW(R2*0
zxau7*s|-y}850+A+7Pj_8lh7u*?%kRzzJ{@leQ{kF^HOe%{bE%>|#2o)i+?=>*?q4
zpfvk7TI{u0)JNMqfV661@X=HPg%w|H!Aj1D&KoyNbh&gUK_sk8tK>f;Q~2!zFvjUH
z-6Vv9TMsIoLWs8?o4t@Z&G(IJEH`qTd}_){%Bymz%mxU6|A((X<pH;1-L2(c-9Q~=
zW%Xdwh1JUmqJMvB8pPGVvEgRJ6x{u1cals?kNc&lRU05j;qd{e8|DUY^<1L<4<i2I
AUjP6A

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png
index f2bbf26ad759fb2ca151a839d4e61a983ac45f2a..3dc60464cf31e3ba07d5585542d75d616f63da03 100755
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 26684
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%0DY>5Wp99*Ft
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png
index 254a6f32bca09ab3009cb6d25ca4d57c048ba97a..3dc60464cf31e3ba07d5585542d75d616f63da03 100755
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 26685
zcmeFYWpEr#vMxL$W@ct)W~LD{SU6&4W*9MpZ86JYi!EkmmPNMEVwNqiWa;XCch8<Z
z@!dZs;=BL0qbItnD)Y(Ar?RTMBXVNZRpn8Uh>!pP04hj9MiT%4zTE-=2rzG#y8yFu
z0D$qyUt8Z(6YN9b>h5A~=V(RY>E~)iVdZOQ4FLGA*XG)JleVToUM+B45Hq8Hn2D78
z%uQahtINJ?v^5NLMx~K8UXlHQL71wLvG)2TKKgtp{_4i}(bk-aw>6iw*F1jOr>ElX
zarsi-X7A6#^<+1B$nT!V=Y?CrD?yQ0joT+J@+}{6<B^UTz2j))<;R!Nhez>ufnra;
z%aOZXaGI%R@lU(e1K4q%Z^<vZB|@Ah4|FG!TRHA-{em`agI<V&5Pq0E-BN|T_^{}^
z(Do2^ZS})Wj$(X=h53U@=h<U>PaVHovgh#U<oSM7kz-8H`}gy*{`|b=-beP|tS&);
zRxf9@M_V5u;)H@B!7n#YBV~2n?kcZ?!lS<l>BNJ?<xRzRkLXWNF9oaf17<g6lL@sB
z?>~t-{|FvFg>xxt{Tx+hW%!WOCez+a+{>&XdcEGbh!(8&HFwl_RJPT~XY~BZuVWmm
zWNQS!=PLNOYp;Ry_4Mp%cg5DlL%5z^g|C}Q>*%)l*WHT^KH=%0)(K(uQKjxZ^Ca@e
zJD1yU<O1@Q+qty`U(AiaPp+~^=P$~eM9FXZC1!sP6AylU{P;|CWtR5-Jr(L;(jgXg
zyLbwPkvzOf=EHMoJo9NcfNr-IJKhb5zRioDHaUZL8Sg>RxLY{0FpeR96{<AOj(2Q<
zK)9t{*Loly*UA2C{MKpk9>^_{Duo8SmEt47JR<X)p&wh6FBQjFmaAA*S(Y!IB={p&
z36J3pOJXcdk*#cLL9woAB-{RT*~+@TOAo9Bcgv<?b#2RczuB4h!s6fjBrgY(Id&DS
z_ci25oqmEIrUVwJnx=#{&L->X`;y=58F;lUw{Acdl7!E@CO>zc2P3p#PsP&b1x{3!
z=e-=ae68($eu?_JdCD6iT895Yt?v4prWo4}3_VC}5d2*xdNkfhLL%UCN*BN6<KaH{
zMrdz}NWAjRn)?j_S;EGn=VtU}LWl^{>>uXdEUb{5oL3i7oBa+K{|mj|pdT$|Ts(E7
z`79Y4P83fMug0Bq#={pMXQQSNJOB#AUQ!NbO2M$?{S=$&c>JXB*G*6BWC2sTdt*-5
z!*s$UGn9!iWW(mhN)1BEv0-hb#1AI?75umFytIBO$W+mQ+7}WSJ>Zl0<3`a@I;4%=
zGBKi%2kiNCl1G<&<g>seof8Q~1r6^!+9rR1@n>d>8Zy>=68-MdZjo|aIRYnXjV_Fb
z(M<Hbyz+sdYw$*F(<xDBUYdW-wj1qHwpznlrc^<qteaM>01*eVI@#g*e)%cb-2vO7
z{oCW$%Ce!JGn1SjySlwy%wB8X-`!E`vFJVXe9qX>jpT0YvQK1^l380BxXMr(^`7H>
zin4>7JYi{)Plo1V9_#<iZ9M_Ee{UsIz#t7lZIx5qr~A%@JpX;>C&5{%B+3P(X;cA>
z6FA_bn<+rIVKDXG?&p`1U){~du~6n4(M1T9*<VEY^0IFR1_bPIx>DL3{OYay+r88-
z4KR5#CUo1K#G=}7$L<R<YqX`Jw<`%opKNoq>X&8KMI-<C6KAJyuG8f$Um+SKq27Jb
zcezk0X4z2~?|$F4N7*muO21Bq9?Chp9*2f9CMv%@!-BFjItIf#$pW$e!r3WsMmQQ!
z`|VCbYC7}}F$_yeW$=^-!pHL)x?c45FPHr9n3y3??=N)<9EcLJX7ylj6R66tA9qNH
z5nCDqSbGBNtbQifU$%;UzB4-AQ@j`Ix(}f3>G-<t3YFEEyl}Igf}mT#oQm{Cma7e^
zYdaEivou_1t&wbCff=oj?GT>>T9BNRUnK89-976=|7wowbM<3Uawi}rApe{c`L;Ao
zJUDq-E8Kz25ns>6PN1(P{hb4!jZCm1(rqaYlm3B3^3sREwLFhLxsU9Iut>fx2o7Pt
z{5Kmd+P4+zq09ipo9_Xs!UY)lrPp{SsgR57AE;n1Vdz3)d!9|Why5ueSh#q`wRB`N
zd8nY82AImyPU@=u*%gsco<D1&EnwUVb%Yg#C@+R0Sl>(7_6`F`B`Y^P*S4AD*+Be#
zgA)U_|1>fRwS26eI+TEAR(TsXMaWz{+LkNJ()IwJRqiy@#+O>=>a;4!^M(UW&<_P~
zZRKwj;0z(EM<FjP_FGRQ{kWaGN`Dy%aYOZVrIMtT59x(;{lSbGP{`&vZM5bU-WibH
zF9{JqH0E62L}7ptK8EOS4dK`G<3LMHmT@fUc0TpEb^j)eXR2b?-!Xk?lGxafBwxl;
z%|;{H3J5v)$k2irV}N^<nLo-Wa{I_a<3!y@Dw@cJC9zSki;PkXxbfDEiRwlh!B|Ui
zmpjnBU(_^pP+YF@u^N7}TH4l|isuycO8WoUe1{lRDvG=fliF9|B={nQon2T&*{*JY
zLx<a%w%J^dNeSJr0*npYpvtP$#D;;gQ$Qk!D6IT}Frpd8x5n32vnfgAm5Kb~_)Aek
zIWcgR6$#qx6<Jkbd~5PD5iY@kgqEp~^JdpSST_^Zhz1s_Y&HxN)tW%S%)Lx=th%w`
z$EQ-v41Hf7+r_A0!1=s%^uq^wKN<D5nWOxaD^6Z%rjuyN(=1MSHZpBS+4UH}pYNMF
zgSb-I!9K=`X+*v%CTIszR@YCK(4jPnW8tDkd0mgDH-^eNZH7UWw%^Q6F<4{nTUXPG
zUp|O&nUu{5xG@UWV8J}$p)Y$k?z56fV4{V+ZtWJ;O|p`itvJdf?if3p@huy)B3*@l
zy^=~$7$|3~&%{z*a^^q4p`>69{Mgh+RA(Pb(qcIkn3M{^Qw5mX)L}I^)2k>@xsSK!
zGjBHweW#zGyU4})(B+nB^+>_t_QSn}u4YE|E0B+R8zHGcwn$XK`m%d24P&zzZ}JXj
zXt59osX3C02ShW8!PpaU5v-&k<?c!#uxsT&s9tDaT({4<Nd;;eeR!)PHfV*^<@#)I
zd+wONkz^HgvLJroe*ox3ZfQog19vfBP$}t7W9ugMAJj!$Lz(Ftvq%s-Z3qmbnNfPF
z9KzW&+YCm>BXbOyb93+C1sbW}(V%G>35V%9J42u}=?F9LDD6_wTpMD7sWB%&n7**h
zV2Sc=?+G5?cSAuHFL$2$7wh$3#hccjVEKOxS2DS_*ymCT@0Rep7hu4|;VNU%8oSv^
zx}-cYe1^N8-c6!zM1)~78&c!I*5_c}3x1&2W4c1-1zTe_t52#@=b8n28NUoUMG%a#
znn7a7es>e;BTYhHo9k_0dk{U7^C{6cKDic7IvQiA<P=Mo$rsCLc5%A!bbd%81WvDV
zxHk<=o!Q5h0XJgDaJ(oS6Cws?zWJw=?Y5%OlYXgyz%j*ubwYQFErDTTh~>4P0YO_F
z6;RnFr^P4UG^xm&N*|fro%Q%HQN}<U2UytpLbQzCU66uET$HCPtmUt+eu#ERHhJ7m
zhHA!1#0an}dF|RftKl>viNh=1DIPS0+EK`S4>W{C<Fjyr!(E9ykp*lQ052>zu7{yf
z(fff_4%7zy@Kl!#EvfH$lQUCK%AY0Mit_=#vNLdu>P1@Z@#hg{ZoOsribyEF(<5sa
zk}MR#2wf?txQ{ah--5m>mv0Jtm7E;VJEUU30k>D976S25EF^0I%?!G^;99iW%!=gI
z@^o=OR7$32eJDbTV|cCj)z$2>z9}VqsllJ6Kcw*$kdY>(@jurdma%-7Ja<`+cbKJ<
zy-q=9Y6d|Vx}ds0017CXK4{++D~6fnh#O7bN8wCM&>&{_b&ATd$D3*eDXt>qdc}18
zlqJ)!sy*>6!1xr_>K^XY@9h!P7ac<B{S|TFint!X5n)&I)1VxcHY=|c?+wv&WglFl
zTa1*-HyhNpsykqHgk<s1@|nkEKMHXBXCNQB>8cEF-N%GJdeK&3l%z!W1mC*pP*yc&
z%wFZHtSo>WyQWf?hxO(&0&9c$sIjjERFZI>z=oA3{Lh*r`ogq2s%lS;xE(pe0i3z4
zn|%}(L^WMSPXH!^<RsR2SCA%r1xeNtyio}kqB{!Iwu1<aa&_-22iaP4#Ia^aXH-p6
zQybm_cE}O+mD)6mG@`<H4-Zs!%C3qJ+P)_>)D*cBhxRoL#jL)f0wOrE9*!3zzk7DW
zXw7IJ>hXrkq%>vo^8_ME<4p(P82d4BpkK#)mF<zvBIyn2;n-Dw)j~N-t?QWxPSm#H
z{Z!*XbWaBj$D;O^B4`&t`)P(d)XTG=7E&0K{9+){?x4&~s;JDVYQrfBd)L<rYg3d+
z`E6eW#?mMP#DL18Tk=ikW6l`H7Qjr}4Em79ZJ?Xf9a%&*Sn*obSVkW6BKC^T9c-wj
zj+!+m%8M?Y!KR<HK1&L0Ir@a-EMz1^i6cRMt7?Qq#29-2-mq_>o~wKYf5(9_$jDK?
zc$4NFlcA&cS`hOy!biCz)>BE#;zg7&TTLX0Z@i58HQrHpXdl@aT1sOD=k^LDv)NS#
zBk-60!^y8%n7}D2`Tk+uxzse(AdQC#sd$9&HOWr-Nh@71na>eJG;?x&sLSXXJN^sE
za({C7Y!K%kon0Kj{fqjj!Md#bEwHQDg=~xqB0F9w2{h!^yjP9JY?*k_GGAxr*htd6
z7?i34%JtLeGxnr7b;Oye^)~uMq)4b>!b(jDXc2#RtEf24cy&g7z(qfi*imaC>wxd-
z!<}GK`J?)p8fB}cuixo}EI?<lN35<?ON$=V*mqT>LPsHE79r*hX160yjBbWXOaaZo
z*+W>lEgdO2oLLj)+T}|rM%9;=XbbrSfzN<f^qP0?S5A5~MBY*O>43uHLkby{l`(oz
z0s53W87LTVVgNSiR|G?dWrZ1qyEf^@LSASIjXjBbN7ej$XqGBUTs&B=EmZ`DDrdkH
zI%YyA^fthSh*K?hM`J+y0_uw13sapmnhJe_1rmosCql(qX|KwfGqY7OQy_!yg;(1a
zK)+yi`Y<5Y3KH4=iX$d#5~h!KJ3oce%g4QUGKZudt6hSFqmB4gPC%m;2=6OC37Z3G
zM_cmVWIuce{SY<t<cPg#so?X?#9TK=o+N~{L7u^zuAvDJ#-}cw;e_K0?z%)*aRl8}
znRm7414&*n;-YH>Vp`o<)i-!1tj)!ECe0r|kP`Y5`;8Kms_cEJ-M79FR#k0&x2R06
zD7^4z%|!Tl4}}`AzKbX<KRv*Uyg?+8=Ff;rP^a0BlL0{#6)6!x2B0JEJ+p1|#Up$;
z{Ns|YaJhwY%(+~{4E={NS<e)I9tiIQL!mBz+)rqRLPRqf7H+pB8&h}pQqlPUMdY18
zUVn=qUAj%NN0W|s%nMT*Y~AA6lKy4vreki4Q@+JySHfyQ=E^tAPr`u#&uHK`bPjD6
zjV(nU$9<aw$&pY8N1O|g6ozRGKaw23@qJoiJw#ABg7Mv!F>1C$+=KL%avt=LYm2z}
z`*i<TY~;uA#ODhe-a<-+A=5yOR7IaD`B5Dhg`7Tg7A$UU;ZV7>!@hL~nB7feH+pNu
z6`UcJiXT)|X+`TW{7Ym2m~D;o3ZH6ZcKZ$WNTz+jv7)aU2WJW?1EV%wgD}2hD-#4Y
z3rsK9abBi>;Xh<wv7Fg~nIP{piS${0JkprIw-P3A_*B#r+L`E^jC`I~9F!&58Ne7O
zYcS~>R?R2-MK~cs<eH7aq@7Z4IrW@nise4F?LPHU3|g?uxu{F+H_=~_OG{|mS|)6W
z_Uq`{ewD2jwZ!W0UCIlS6WVkl_}B-KX47>P;fvjij0&A0smS(B)H+LFL)B6kVFoq4
zD4;!7NKx&3d06>i2$_udgwf@5|4>j{sw5P@;OmEa0Af^rFGDQ@5=qR7?O`W;9V9#i
z@`=e+8m?ru&VT|-C$Iuo5{3IgaND8Q41Ebo-z*>z<szxM0k#DUPyRmJfr`V_@KQiy
zsmLY?)2@?=bYylm(RQ-~WMvmFBcl$8swhp}fLW@hLY5AHuKsx>#7zOzh8O#-T-a7}
z7lC(~qeey=Xo-tk6dSM41HF^@ay1KwF<eg0K<b09uu)V<w?C%SxS)+fkXmW5p}3SZ
zqypHn@2vvKVIj9t!c;%AI%c!G-Ri9lc|!V{h$$RUol>@KmONxA1s~?M@tX#}s2>C1
zn7b2l6?CINL1K;2@U>+#yM$^=4@J~A9C7sYgBs+5nv{re>RVmB4aHks=-$c9V71CR
z-eil7!xPVWKv-eqDbXR=Yx$k~@b!+GD@vt^T3~S%*ms-h+xv~a2F(rpK!%ZR6}%s~
z0+Pr!g}S?FyZZI^G6x+1TtNb?wVZ9}n9}Eur0e2hIU)Z2dIfqTQuX%V`}?~)G5UD4
zWl#0Tb>m00NnLhn(+q3k3EIw2oGGOZAVhI8u<sM3V9`N$w({3eIer^aEyI<cg!+)<
z^lL`m2c@hl3LE-n;PCU|$WxQd`^5k-u9iBrpkt(Rwx!0NO7E^9s~(&=Xv>H|&KL!V
z#npbm1Q00HOss5{PF$1eJG({{Tj|nl(AK1<QiSzBEM+SUK7M@fli3g$=L16wjS9lI
zNDpHFW9I-1&T|}$s=mSe9s4SVB*fE2?*)!3RiYe;92#E72fgS*gEeVyD6J;)fR80`
z40gbz-Nv%w+Lu@g1LbLfi{wE2xw*L6q%UKbYhBFx5-+N@3yl>CKxT<4>D767j-SV2
zqyPfHEXH}cL<8ZL9WDm2PoTA(3H)?2N*_DE9t<MZ9g#c1;vT1uZ(c?lS9mB_p@3(p
zfm8>Y)3Um8A5`>LgX-VO-^HE`oXHu~=J+-++Q=mm0v2_}Uib{o6&rMK8t8Cz7Whi|
znh~^HqwEDPi%lqf<Qv`S&C&{k&$Ad$*J~KCMlJJ7>{Y87*%j|i+Hmi_Q}NDTzu4-5
z5mJYsl6nojNk7C6O3;2TMFkEfzb_<n8#^JVWUqLs0MPJe4@3Y7G?qyCmet|H0f6t+
z#IP^g0&Q0{lS^m`{5+bbvf!{R&W%kUF{bU~&t#0*26MmpV;y^P9!*0&Sz7R4OFO3+
zePKRuK)^ANNVXu|O_C@{u&V*5nF-2H;A5&?vnV!;(x9REoRy+=Dg2T6pa22x8*J#f
zVk3)eqGn?-MhY-ZBkjNvR2?m}<ph=}N5r<?1q=f}G}p>^U!Q>dOQ|_UR&H2O<K7ji
z=Xe$i`6ceD5Eze(UQVtSdgn0-vQmh*P+lt1+3(HSN=cpC-Cj(g)wEZ!syXeYDbrvo
znp$w#cgU3J)ZvL0^U2COX)Q_7=B~Tl`e!>*Coyi?`4N1KEJZCc>y~8ZD^@*j=rCoG
z?}wHlkE8v3l2Y#{ma`b+b{_T+ZH-7=Xi!5{nV2Z_Za2urPA#WZm+{`fbrP3nYcT+)
zfMw{te@Z>2Z{TmQw!Y^*ParNZ$cOkhM5F~;3iYlQ<p=bFI+t-yh_%cIYTQHvMHTx#
z+fC`LcvY<ptOWsmMR`1IqrU#Cs-%2^2CIH~ijW?HDzNAVDU#3%iOeq5QW{^SYhan2
zIa1lZM#*w@(~|cm9v&2@G7XuGApVmFt;(V>zlV@inuGh0P{3%R{=TJ;ks)h?z{^ET
zACmOXo%9p4ew>Dg1Rtdz*0e0$?Wl;795O}zTvFuN_Ss3<);aHnZ5-T(!&7k3#dk8Q
z<c1^+Wz_YrCkR(b4HRP5XjjG8I^#a~&$12&YG!2<!mj5upw2Oo1{4i1zmq0JPo7N|
z<<klrvs(407C<UvzDtAV(iTMm)JkI`BK}&9f#J&S2yDKMe4*Ydy`Ash9AH{UsyaU_
z&WosF6B1G1M`Ba%ql_FL9pqBGPyAiZrOc;E$-GuOUE;AzHMjVA7CHFQ1w(=zL-P7H
zGTif3HLfEajrKgtTZ8$YB<|%GyH_zQ)B>GX4~4Y<@)ME6Wp)17BU<wNSH0GcQ_;Ye
z38}Au-Ui3pSM$PIWMk;(!Rc=^TjHx@COXew1VUN|+nc-_@U8CU^20*Q+qdS3A%fQa
zQtYzLtq(L@P|g%FKsu<`f$X`-W=3wJA`SkToVM@|RXYfIHh~r|%CPS+j3ScyI>vL3
z+n5o~W4hZ_sA8Gc2%#=AfwB*`Ds_ALs*NI@k>jnzvVT3RgOL`u>i{3T9;R&TiK)6%
z0$siTyadA#F(yL1JH8pX`U1Fm{0_xNk_M=ssh_z1M{cja7})uK9rVd|&#PKqiS-r#
zg}?V{0Diqtg9xsDPIoV%#pF`b1{F&~hY4Y98}$qSwk!&15t`bC{mo$8J9rS-AFD@f
z&3pTmXh>$SOdY9j1x|KxcH>x>xw<nhUyNTNY<XkOpNYs<9yNsNopWo<RvaG{3oTIq
z^SYB?o`?&4ot}VQ@_PEnkz^;Uy_#yu2YWU#3B+je!LxMlR(ps;ws1kqXTV)IqII(H
z_52gSiEzEPgvqGzoHT03<E&WK$~`vp!4z@*b310vj<X82YncL?i~Mp})Cz>@xT#4u
z+*4i~ZRVTKa1n^tVc$%=*4T+Gg+Ydn3(dHsft!H!ELOpD=k9Rn*J4J{3XFT9RGs2{
zYr4$Rr>4l!8@x|7CEzF(m6iJ12nfviS4#!Cufd$I5=)Qod61&xzEcG=?j(HTr2J(M
z1(~QIsIQ7aa*>rL=XTwy_b<l;;I%9lZ0zRLrVF!44e<7rxzU`(c!#6T(5fJNw8n5(
zcdtp_Y>msU@|#+^y2p<>EI1G5ghI}F$%vNjT&Yh*iB9Hh{mtX3Cp~?ZuGy`_Uw4`w
zr}3qnlCR1S5`xFpH)NYZ;x)$gww%<mpk@)44|HZ!W!fGP)$`w7)Ohz)I2DK&n3Cxo
zQoXFs2{o~rg=0%$cwwKwswb|x8#Lw!N|1t5J47S(P)SrS*p`kTP+KwjM)fzk_Xz8`
zPE@jrGO36DgEX@+>sMOp@JGQ*$|G_M7~<=f9^pc|@>x~(^3v#<-}9d2;;`_EY$LkQ
zygNp=eWdVJevVeIo6<i>90CfKGpRWAF^J<gWuxv05YNKpj7GKudA+!*AN1t(?6y|y
zexuzNrz``7T7P&%V|ROwFVPhG3f6hUzVJ-#r}5fTVeWn&Vd>X(-e8AUQBbQzCGC3x
zA=p7lEw0$VJCK1Hz2#v|BuZ&up3nbmm1HDzS?;j5(ZPy|QtM<Hiq6F2GP`|F-pdNz
zI-O?_901oE^2{mNHJ*u-i1Hxo{Fz#DRIXI*{%&S*=RQwJnf$yY9bPcqJC)=s0{mFj
zH1+3T;^`~NCqap8pIhvMQ6N&GJ&B6{sR$6THA+f)B1?_Ha_oIZrGr{hk&azBKsF&J
z!J2MRoDGm^74E+&E}H*Sdvi30W1=Yo0~9P^e5uuM8Ch0Ow9oO=guwEatYHKq{DSRp
z?482eQDnJ8JOHGxZ!NDhPHM1fpzs>aTN)#~eGwLs?&iU;-cL^l^0G7dIEdpjTz1V~
zLWe%$nWLbZW?Yn~xZ4KI>5(>4R3-SkVT6@boM^+L)~$_{Q-iFO==amH%6U<XOvQ0p
zcqks3-0bljjK+>~LvK|g5*P;gE|(ng0v>;CV_zw?{nlhhHQj7Ktt-cxHcg~GL6FKI
z5=cJ85wQbctq;xRYA0}yj?LmWx)>&)LXY8E5!0kOth`qEn8NNa1l!APjW=s=k?|l)
z8eg=+qY?~266@5^{VNu+mYdblg_xHZM>gwm)>p`A_;gP2c|=R&pEL&vGqfkg1y*A|
zO<a0!E)_LvTzsH2*V<tH<IJEcobzS;RD}N*1K!eS2C1SYVxn|tdoZJojZvJ{@;UWG
zuID@1CMpkp45v$Hc9wdt#IO|Jb;(W(3T-G6oi4uviQJ^Mhuyu-r@Ll0(#Trlp{PbE
ziLn4CK~1#%sA-8*Nft9a!6OvJ`le}AI*zNnUuyRse^INoIDkS^F++ovR$!S!35U`|
z4C;2Q7rNu42%Ly{6T1f#^R2C@&p2*2YP69_HSh13w6wmGO$P_OH#YYC#Uzak=b_<w
z0DMUs8Kx#-XOHPGw#25#Ku`%t#laa`+V0H8L#yYh&#+~VY^8xoSj6xpFSYyqC2r0y
z%@F6e&<K=tWmOAQdvA&06$=gAam+p}A9YQ-tWJ+0(R>x!&*B)qhi>U;2MOEv=GlCy
z_Urc0r-gPTLpvRdhz1_`Lj&GE^pE*6+s4L198(s1-(-F|RM=yu_~2hVk@V)ow7Lae
zN+wz?p*hTXPkfum7~UD)akf%T&8xt4xOKKl(tTu3DzBXqAv%*b%wm*`Yp5aGCA!F%
zaGU*p@=#=oo9%ZGQ_#I!kgektQoelSgQ}89^g9R5W#dF8y47Jh-?7cO`qTU^DGguJ
z%rl~7OHTGx>H%!bKC+Hv3CxUr0xp}3u05NYRzyKgW&coPE?hqx(J@+is2~PuBjw41
zMag%|s(7fBS5JjjAm#!gn@KU=3u)QSjBW72jHcwpA(ly4hp^q$)}(t=Gpyi+TZh%C
zHgnpTME6C2ShPOe;~dn1I#F+c2!s8|FSQE0p77}{sp*H?(Co)N%v<cctZXVOSFf5<
zwxb>*$*ad2H*y8!pT2f43fk&V_TRCKv|6H<Hib|n5>8<V#C^QND4dU87?F>h%hwJN
z3^;$g^<06R&TE4RFB0*==xlbK9n;0dP|oMra;OoLFa`zO?gLvpJRba3ol;KEb9+EZ
zI)z^-+akB>*CXPTk>AfQpA(JXl$F2Fu(WAD=JseHx3M_sDnw2OLyyyAwl`;e@%*mH
z<Wz~TU`$5{oL44rFG6j|uPNAYQz90{*bQTr)*B{S_Yx5DlgLc;)GT*JHEih%<6{!i
zXahTHmDhA+@>b99H+mnw?}oaiaH~etm+1$bZXvGLXst8b0d&V_7mT=PVQQ>JDn)&&
zihm2k1SEIcb)5<bW3(?teaZ`s(U&zm4bNWIDoc)YRM%0%jd9h5#qvkh4!7_aWeJQM
zNiNf);9^Z}9zrLBMC^wdfe`S=UZ_xKBJ;zV&0A;2;e5Xw%!hjuUy5XtHKj-wzCh0z
z2n%MWPej;=Om*d8io93N5fx(0<T<(OtI3{-+2>xFJ)C^m_04)b4$S(3&s%j|_(}x(
z(-)ESr!rJhAt{DU0jLkF8JeB*w=xtFyf8BnY_kHSPpwiDCZyfb)cntE4b`)M@<Rd>
zk^;}!eFBp^FUD|+k&mw1OlLXKQs~#3T_0ibgGZ?aHA9KZT<aSmyx;?#NTtGk?sCG~
z4+W>(<;T3UUbLhmQ2{i&mJl0N9=FblWE)kS2vzf)nOJjkDBV4kd-aqgPTSLO8a9-4
z!bDv~qT<t)xLcpYDhF<kBO0o__12EZVLoHD8W40=ROb)L-iVcC9|$Q#0$*VKMVp#~
zFybfIY(9MGr14`=e#|QSb@w|u0ME*q1_o*=@RB7t9j-0sEB|X@+O?>U71znUD16<v
zjeSP@{kD$cY{KyKPDcAB!D9)?aa44hnyaS^*ap%fy#_kbBA2Y{EbChknB>%U#lOpw
zpMx8W%(nx0h<G6J^-3qo{j46OEb^07nY5{BNX6fd9by&>i6YwhV?ctc{nc$r^HROU
zVbU2evsoz@X20-Ksi)~+CcUTb9~}CL?L<3RLb*aiOFA*Y<mBnv=2*YIJvvhC(~3_I
z^x$rsB1^qH#KxAJe%0M@5!;K1sb0vURxn+Ca*JmKn0!to2C1;;z`^VLH9UY|FAz43
zPZIIz5=f1joB1bc%b~L&jB>Ml`E1|ggGvXI(q@xmCMxZ7uGL~cS}f{kDuN{q@aFj<
zipF}fsS=vQk=aY6%yc>I)ZJ8{YP~M@y$_tOVeAjmFxaqWc1<yBvvj$OJljwCv{%{{
zonbs*{*2Be-VS5Fm%ghgsgZUTu5m5QG#1d-J>3btXmYp_@3pua3z9F3Ok}mUTx@Il
z5>X*_AJ|4WbXlZA8VSq0C7m+}qG?T*&RL%^wS@2rwZvLB`QSL<y9G2ys&XF(mgz?n
zn#eEk{`MlL4y~H=zG`BP%;MpTn=oml5Yz>q2>oD4gFY_m`%nc(ijzYDVP)s>!n7Hf
zPH_;(EMP`)%9urxg6bzc><kdl9kepAq0T<wj6*{Q8i!Clnz{$xLXYcVdV=IrHUrS?
zPH_x2g`#1sEx*QpP~7xuk%MIgqLt#+EJr{UTc2S(+ibFWgGMSu5lKIH4n`26g_W#-
zN;e~A?L+4cXdcdWSfHt79&y_`!P8L`eK91DKJ{F$J#zg<vmf7aB<U<Z%VIpQzp?+$
zCp%ubPp(E`gVP=zHH0_weMCW%8(L}q)3qRR^bW5_%T|+HaDg_DQE`(SoOT(RZ2)wr
zKiVi}I;U4Se5TmRPniZY7}?OEbeARja!$j%F}=4}=s$p#A(cNmaYqC-QKl8Yn7x_4
z<Xi77>Bnl&CbUVQ)C#j8=6v}SLlRkH@nRubzIV372=eR~C5dK`5ly}#OL7=$oQV^U
z-eVE39CWkFtceOKOFDX9`xQWSWDwOAyR{*D#<3Gi;kls71DknMdb=BRs_6P^l8Rw)
zOJK8pxb!<OVA40f^~|2xHc7!`aM!kKjmYQBxjJl2N{<@Sy6$kW=SunvVaAqPhq1dK
z!}pWq{Hfa1NL}p&xNX!J3^R^4*-6l4J+0*g@4XjmeN+TP!p;vjkF*cpk#+_+Ydh&{
zp6_ikyrK*|zvL1xYmtP9UGs^C_x&m=sYoGV&X2~Ulf^i;+*;()zUOgD@M~2#SpaGH
zJT+DiY$fJjn=KP)<N!2#E()FJGJBMy%Zw;+f6bvGWF$SBtsQbI-ygGRl>-qe_nv%g
z28-CNu#<gt%VnFVQ%B~rh;*SozoW`(oVFse(vwHHki%?{N9~!la9wv>W9aRywk_+D
z$XP1{y;sa3VWgv2VN~$U&)&VMA5&%Ofn-sR)8y;r#D`Z~fep%YnaJtuTGyz=XXhP6
z6#-x5+x?SG=tT+S0H>Gp4p{N_R$e#R_Fifx)vw4mN13CC4Ody77xu%4`fW+bs!m^L
zl)ICPX^?;Wpg;T!E}uu+MImjc)m!1Y&&;wu{<=uDIHJD9GVd{!;HX#p<uKDgRNOUs
zCE#%;_%*7zN3`KtR?X2<^q^3AP^HV}H}kyyz-U%5?@wvO%dFt}edM&+tYB>}{#KlU
zb$WuPzURw^EU%w1A2628l>DLM`OpeW5IWCz;2<nYL?`ebpyX!mUxheb;rUcFTKr2^
zQVQte0R??G(@0MmX4B-jciN<*3wUko+#gwZ+}un}8n=1Ie~KLJ3mR#AW-G&UD1?-7
z!BUf?UE$zNSNfEi&6TOj)mVFyDxhcnRG^_fFI=58sL(DvzYPTp&wrbNxo-7ml@?WF
zs!KwZR{>5JT~H#g(YVb!g>&8?;|e`H{rZWtAAbG`QrkozpPgJ4gCYZ^lnTI5Dv@LA
z;Ls%9qfeK}sJyjK<0c(XEy=F}*73d^;lQ~!*h_0g3VhQzKl7Z5bd-%x>8>GjN1!~@
zPXlO%lZbvO6q&{BUuFAxC8l6WiaJ~(b`c>XQ-cOB0mA+C0jd&d>&?m!{suJPt$YXm
z+)Fr|3HEiyP&j=(%Cp00{C2!}I@fCva!@_K_9(IhJ7st$7Fj0J)a(zX(<3x=S_EFd
zys+m#VwQd&;Rq91Hc}uxCM#dU`Q=A;cV%?mzB2m$`)QY6`$rCcwh<59_ZQ-y_js!u
zIf?4qms-05+I{4Ix_x>FE!5}&RIradCR*y8k?{o4+V|!+M$>y~`kxGu<dYCRek&EL
zWDQODPCnMXSUQpi=2W1b)(E)|L%B!fVYcP@<zcDcjP3idXF%`c@!a&IstJBy$CoBf
zwe8q*4!hU2lqnIuL@U}@+WI5!Ta6khU_=rHM-(PDTM{zO3W5adWGh&-)L57xk2j6M
z{u)(*<`i01@|<@;6@adZtIGN{1q%!Ex(9<YVPs8sr=G>|po>b<+{oj>71<9m<(dVD
z<`8A4Wog0-3(n@2;!$(k&%FS^y4k!KGMU7EU+R;yO1Y3{;Z43Y!m1g%C~;pptoC;m
zK?xdGCbVT}LiUNczGhkaOlD;^#IS|=hA-+2DVMhmT}jhYF}F{FHSPsR90!49$+G>+
zAS+QiDQKwCQ%12_=#KnBcxy4WBm2vpi0j9$LSZ@23zI>zVp03l%29mJVEFLrJ=#8)
z)<Ra~^n>hKi-C7ul1~F~R}3T0Q%*1kj%IzIb!*h(FA+dJk>_F)%D}Biy{FpJkKPSG
zkwZYqD|~YK!Qg5!^Sig2P%1lVX?2ja^naCsz7>Dw=A|?!4yxls^~%gM2{Dq&&_p=&
z53922P$J-(*O+-JrsKqeP(X^;sDao)nP}nL%x%m9Pg_UZW_au*FUf;~uOXMP8=!$^
zqs<7OYNW51sO-^tGdIM{tIcagxDc!Fw_Re1hqt(sM@pl<yt9A&J`}g1lzHgj9mvA2
zgtZA*yALw)xxl}qK1iO)*x|(%40UP{5%P5gXDbhqt9j(K2y_bY2QBll(dX{&aF|a(
zAaO}NT8EizPnsXYLjx40?4)YGD|6%W7i+4rMHh!DwAzhrRNab{CG2yiegw5qzb_vj
ze7?M2A2sN<YdQ2&hw*Zdv`QYmdO<jqUiFPyK8>nbxoqW~@;uE7>A6PkI9FGts4h!*
zE2br}dn=mNS5X$SaB*S-Te_HAvH3c=z7^F103zbPu3!rXD^Ch@D;qm!QL4+%UMdPZ
zOHnF4UKI`%S7|F-I|YAtD=mLjZ3}+~3qeaNaWNzjU!gYuCo4}dg|CyNvxktcDAnJ%
zLT~qfb+c1Z{4L_?AWEgLqD~?0;%-I3!^XqL!7A%(=gmbWhD0IaZfPx~DI@n!h_{v~
zm93|zs}MW8kB<+V4>y~OyA3<1pr9Z-2NydR7wek@tB0SnC)k(O*@OBoh<{+nSb12u
z+qrt$xj0k&g$Xuy@$wX<qIw&r_%HvQTvb&51@G+fPZr+zVD|;PvU9R=usb=i|GS2V
zr>yrI$UhzWziN1BzttYIYg&1@c)43x$$DEkds6>9gr&v5^j*E&9sdr;(t_Q}(aPyf
z)Z@)6=l?J%4^mP8m&RWd*w{I_{;l;!_WzLdw6p$ivi^r}e~tVd&c8eIrv5M7{~`Tf
zvHvanCZ(bxB;#V?^_P1f8Bwag><d}CSlC$#{e8>9&1KHZXU)ZG&L_yt%EJW)vkF>T
z^08X-TJnQ=!B&Did>sD<1#<TA1Up+;{RQ;~&Sv+9BgiYj4d&vsVC4ey^RV&=^7FHT
zxh%O^!Gc!YoaTbug4|$%e}hnSw|mP<u;agb^%s=o8x*fKm>X<mZp~`V4d!R%;pgOM
z72x6JVdW6u<L2Yx;sjfpTm21XX(1%%;_d`~n@&3?u#FYFtFz7D1Ah@NB&iM(rQ%}y
zhvR?us5^o^t=|+xsZ_ug6lz-kEvs$kWToW^{)<k|HwyR!c{n(DIJw_W&i@wDwQ~1(
zOU1uHIXT$4{{j5hya>HT^TsUruS9(V_*>&G7$IqQE3l`FyS9sqqbSv19#H(H`FDO(
zi2P$#6zn|SB>etL`F|$8mX+H-TK`xBj&^?!QBeGyw?bfxe;Dxqds|ulZRkz!A43+l
zU}qbvw*~&sjQX#ByZ_5<adC3-aPbS8v+`S5Sie!sW6cWYu(V*c<P_xN=HlZw=eGXG
zZ2b$}!^PUu2kdSoY4aB8TQqMO^mjBA4FBMg@qaqwV{7#nQ5;;{tQ>-@9NgL*oI>2(
zLR>t|9Na=298~Q8jF|neb^Tu<i?IKHND=v4;NLcaH@$!Ky=^dW`xX1YHmrY=_7{);
z508IN#{WYLZ_xiS^1tHuKXm<vuKyJS|107DWY>S_`d=~dzY_jWcK!cG7t()!@>n^)
zy$1Qbeb9KXjx@e~3_+PI$;$u$Rf*JGZ!JVu1p^NN02%wQ9}tk8OYqhS?+H?og+D}u
z!lNWOT=K&Q04M+;8A)y5_47QCi{V<!Wk_`CDnAxus(tN9niJ>?EkEPOx4)ktrQvr0
z(0yFRB@(&DCK)O~p(q#IXi!U~DH<klgv;=45%KW*-zoemONsb(m<*lw<r@9Rv1m2T
zw>*0L1?6dGi+-r4fgV|aa4e*0IRUl5OwUaWclA>xq*m>Q)!>8IZA;$k2Ku`0425CC
z^S$G+7zjt@R;Q9r<)TH}A4{Q=j>F;fj==!uIDLstp<u>^U1(V6RJvvP_3;_A=(Por
znU7?(!D5i9M&NpPFd81+S)|Q%r!P$9(XKxn5!*WQBbIex0^-}jt$QZmw)^S5cSj5+
zwQ5|#SSr4s`~FxOrF?#)w<K2YezHnawPw0QCoH^}5CT?lg!gmvZhveZ-n)7;jTc^v
zkpx6;y2yD7uoM)G6$}MN2BTK7ax9i?91cTDxkMP0-~vrdgLDQfA7Ybig0e@6R7Bmg
z=_C5wNjG69)PbtV!__6C1VG%W&9*-fA)Yafwi2Q53l%`aoJN5;idqTO*?z;%0kd7m
zLpIfhxFCxz>bVF4uzUX)jY2)8%x>Y5z1bg6*9qR0SvAY!UGY`Sq@j(qmV&?;AEP<7
z_`8gRA@e(L!W<RnIQt*bDG=ZBx6QE#Lkw&Zy;l4bAvB=0(lPClupu<3C_q=^O3u~X
zFe2R1A&g{To9pgSEa@q+iFrPY-9jk{lX{9viKTH$3oC<|9JMsc(wA1QVQ)AhnIh;X
zcORhpp@A$eF~pcDm41RLo~3aJ32aUilU}C3b|Ht2P#MPC3(KE};t>b-w;PQn#%HTR
zt=0|~Vbr9FZJ1{A5V1}|P17vWNR_acnC1r$CME+Ye-nTqV5v5fg?47<e#5Zh8!b(!
zu12h@*zV+vj1+ZEC|Pc6mI<|ZEcG6e0~}DpI7!n~;{Y9|In8*bLBxn;xEv2qH5`Rw
z#4hS+C>|gE?xVFtHVx-44JegHHXB9IeV;+SSRrh|1Zxyx0Cta0V{zXeiX_H&wt_`_
zXR<(H3BsVCfx8tkkCGkGT;~8j+4W$fJH>rZ=9D7u!GBj&SO~EaY}_ADr3B>?#ERC5
zsCcUZw3SmhC8Vkrd<+0*aey|rz5Zx?el$n@1`Dn5nGg6zh6%XVSsL|b(J;q<dB_DM
z>mb|_DL<xGU?wwSFTJOAA6hey=P-1{21g4pHtyqE<KsY65QjCI1FF*7=!Ow8|7rqx
zKiUo_A+tNd*p^37ka}+G*dxxGn#RF&LJW2=eKM_#6}x`WQAF3iyFK^4TAaqP$hC=~
zm^oBb_GW)pOrw~<1Iq%6Wk6}~72%u4p%B3%NyOs8vVd^U?a_z;c9ItH`@scB)*%}A
zRFi53%o-9F&X&5tCrstgcnoS~t_gr~^Ug@ru^_t=_70;%P2)^dZu%BCl;91{$#SBJ
zNBO&Yri1<@<4Q@-1r>HtPt3l@+;1%D)Z=Js2K&I)EGsR=ZY#QNY_Sri)~)dP(BemY
z0=k$}K}lV?h7%1weVg~ZE2}h$L~h!5+Si6Oxeti*(&*iui?OEH1SGSF+FFpTy$|6q
zn3_0DQz<@2tJI-bhXI7!ScihL<iVS(_sh>L8Y>27`LrvsSkx-nD1`36ej4vOd>0RG
z37&rXwIeeS1r4v7`*5|WA})=xkQlP{(=&?&R9thFDI7Qpg~<5&DMdoa{8RO7!@OLI
zm|Xjm0R7d)DF+QGg<?QUH`6AJb|5j`Xie!I?6FM><?kb^LQm?|J3nv&?gjTS3NvJl
z@}7<g`WV#_FY|bxC0&_IIb|iND@Za70eOmZlIk>I_=6E`H`5}`;xnX|wBP3eF~lN#
zW8KuS{v5ZugU}2DhC@8VX8EAdpp+@-?2!}T*cGd|iy8PX@!Q+tkdM(a+K1YM)Qec4
zT5%1n(hd-*`A)Gg%akfxyj7!O4M>`?N32B@@C6FwgEwJh`Pye$du%?SnlG;nY~6HP
z*g)mN2oCDZa4W>D*sM=b5%T$tp(N|m4Y0W_w0!B&P^{@#Xo0BMDIw2|+KmvDA&+wJ
zb+L3hHjeRp^>bZXlbXcjF#eNl+&n+XNayzvb3GqSK56;p1|719S=1<Gd^!1;xMbk_
zr)6qMUCXix4)7kLgJXR^1|?MUiY%0HUh_N%0Pi#vr{gViSMdxyj^QDn^5h(+W#f{<
znB{h~h-GouJY++^;}JJZEt0FNbC_7e@)l{vDlE{L;Z&XFt|AJDLL8X75!F(@&Dfm}
z)SJX~jG|%jJvPtqX&WNww+XCc;rz0;jp)-pYVn0ZQK}O$amz%bMT(M3Q_iuW4~y8b
zVHhN2H(Jgegry7haJ|<bkq%!IFCa^aW_VOaJ%_+-qIyfs#wo?$(;+I-$jviIdciS^
zCp@%VuV8Xu`p7sf{W{*e^c$A1t9ia3<4|yRl{;@sgmWd!DvsSx=K1OtI{NAYTUoEC
zi;!M2s(mOrVcz8HF>{*vN0o!D1GM`!in_1Q2XtYOl=_8nfx|4b7>wH4Be$`}X_Qy9
zIKhF^<?m9lh@Wy0ff-1q<mrJ!FhR}W>L))=y!Kfi5lfx%6Ft^Tt>DF>gx8F%C8{tZ
z$)g`A9|>&$rr#1L8wQaU1N)tH(OTVo`!1gigY_N<bf15EB>DIj^moAKQ!#$gH;>u~
zoTaK9amo{#t0{^HvT=<QKsWDw-oyJa-q81TbDvE~X1x0Bx6e!MJf>NlK9+g7Pul>Y
zRNG0QW-86?<~|;}0i|M9hu@9b^DY7Bi`sMXm$l`{0<js_FlLlxUf6J)9FcuE{w(X;
z`Z#0whoq2$!}sjRG-C{xw`hl_{(oe#92<s=KYJuEkJzOMNYPx)O&WZ5Pr~-xu4IM*
zU$~~bWKt@>vsx>7^edqXE&hY|+b`LteT>4%tNVrYplzDh+IK>=rKCyaiPQR-@4N-g
zo!B_xmMtCS>$Jm<HE@`r(IGJ&IyJwmgkLBl8>6Xm=GELF4Y_L;@ZG6?E05t6_q0#o
zXyeMBi}*_RmPwgMF%7Luno6;y0)|ZtT3%%{)<6;|vusUGER0oqqFbC&Vie$QqZ}AP
z5I+zdIj*(XnAq3f7us@5mi;o$&`$MT3cJv~Pf{2<_XpP{m-?syTbg-dfYIKi2p#=<
zboV+m0Pw?+UdvWOGBCI=S{ZBM*Du5y83S;3UE6dTPW20w3-*%(SCmv~nH8qRM;ckI
z+(MN_4a<IcWVCl<X4V=*4C4&-G9e`tp$h`X+bH6DqH@PIi{H{|CxTvPaBd+WowJw2
zz^M)Sf?Ky1@olOxjE@hTdtO3u6P9b+z^yBMvNXYpsIOn;LWzwuTDGK!rHyu?m6sl&
zWYa``aPmLGC&zppd2*qC`r%^y1ARy~iZo53R8SWGg6Mmu>p~(aHfU-po-~dNX>)rb
zM-E`686D3VJo1!Fr(MqI{?V`JuwWDXUO;we!{)x=6kS38YGKk(Y@aGZ2>xA)O}c#G
zv}q=#7e_kC1RBT$iw^#j2>yH{J+oMa{B(21F?(-xD5SKED;Du*`6U!XQ&J{2T`GmP
z9Jz?r(bHU>3OE&8ae~~XYO>7>vu&E8gNW@7_edzdk5cQUI(P2+kvMP~dH`qXpnkLG
zPnrwycqiq4PpDT9)c~8GfV{%38FFndP$WYkJ#_-ggqihc9MlzJfzIxWZj|rG`&0Xn
z53FQYs9#%-mEX);YH0uvQ>|lJtdKGY%SuKH((18>;>@DCZq4<kk-JX(!oN!Fbhm|M
zypAUm(3hUxFg6XKe!gZ^t3oE~J^Ttc>-94r*w|1(cpSZL0{1u1bw*(y-Th<Q>u&$)
z0jvoSxL?&QqKC@==Q;E~v#)OPg(pY(mX<&3y>}J9U41XvpAI3WF(qOtu~Emen(@jp
z2D2iW3@Rn6sPO8#1@<c>C=L~!0#kJH18BL^`raX}o&$#-i!cZkTlCVBYhcBKGBrg%
zi|oyiUja~Md^N5><7V|i$%<?3=R8HIdJV3sP}VjR{?Ss_Pn^@uU8NqY2EIL;`d7b+
zmS`whJNYqem9vcF&w~7n@-SF_1N*BO$4E9wOh_q5+f3xHA5@Lk%ZG$s_nCWaVl%dN
z@bA43;UpyDWMO2n0{c?nV9y`|N+j5(4bN5OMXYsg9L&KZZ4*}hUV^VYYVE^%fs^iK
zGcNV7@7<wg8R_sCfMm*^%V#Z!^rA*oY8fONsUf(sO<m6e5>m~a{Q*Xn2(1UHT*QIH
z9|LE(?4+O20k8`!79+}0<eY`E2%9LW79Y757ovP&-;_4PVL}ZA2)E&lzzQEfPhnVR
z*FAoqebYgJRn(MX0n&A4BJNh~m@-S#j5jbZl*$}iX`Ox0n+v87%H1=bSw04@9SE6n
zS*^Z6-@|_3Sd>b-KU#FOBR*uj$|!YoH&xwHX1`mdA6r~Xg}kRo?;0eO%ATu}$c#4H
zqeIqAC@vMHx0qut4uz3r9HHWGACdmDl(BB2K(NoFmr27=qi}Q7q=tqE6w_+i3jYWe
z+YOQu`hMY>?4Zm^Kl&%?j+_ID#y30>fH#A+GzN;f$8^M|ro$Z~8%0}1#M%DA^D)y>
z0s9dj)Yzxud{vtEi+eSs53@fh^AJwgNT2r)6dN3<Q6Vjw${j(qa6psWIIu7J=P}a@
z2rqM2$r+Qk`4vNhVuH0VUT2Y=0$i4ijybei_H*~i#V;1Ub+Mn}BSCq~h!4j8>UO|q
z?!hRdYwqUPZ4Cg8OcJU!0z)f}4tWdr{Dc7FK}-YfEWR%$WqsFBbSr1SFbeiuUr0Vf
z@&o->1o8(@v523)2@Z&`&V6}v>oLtTnJu%@R!p@K3$S6Ib$`9641m}_w#l?w(^+RR
z+_#VOD3zjaggh`vWYd0X9}g<#-E*cr^Ylnn`iVeKCrI>geu~(4xrE+=X$gr>u$yUm
zdo&GfJ%;PV*|*L@`fH^N5tlKesj36}w+t#1GBn3V3GfLhV^pekx0!Q7MV~G$GC)zs
zb1}-<xSz6iF|QTt3N)^TQ8bw&p+GSL$*$Zn(LLFgUGLGNvMi%(#=2t2ugqg9kn@aw
zFj0QHeS3f~AH+^NO<V;;XhkdZ>S+`z<ofmO!WjxBMYT=n2$`}BY#bKxs6GxlHgga7
z$z9o+zrx%Gjyesz7YixbIOG7G6Jbd)#jrZ>6(#FVkDH@Y%d}16ZBXg$>?=`+YPG!9
z=Ki39?nv5#@lf`tOS_*XBoTs|sANd7jP2Y6C&^4hvo>?}$<8b=>A2mLVM;W-vchCp
zrlqjmw+=h?R9`%B3I!#H-wDMiX)3eakU9tQ5>SAthiE!$;wv^|*t^}y`ocwi9M*ig
zGNc*D`udRMM16Ztmj;aU=$UR^C8VeTp|-kzFurJ%GZNN$j8yJ3u_(@w93fa~2`bAx
zWaDN@=QMxi&%_?9p9;F*QmZ-u3g@A4k5D*k4A0}sg?6766vP`*RS;V=5378>&FD&f
z3K&#RIb{6$er;&kl5ULF{7j+q$qJVBNg@Fxa0Cu_d*@)nKKROd(Ljwzefb)tArV7*
zF+YNE&TB1E{N9a91SiMR_h2XW&kev^3dJoBJ3HP;lf}Itx~57rq=0zS7y4&A(z%_k
z-&hbHk9FTLqAI71ZSRv3%aZ^BnH)j68Z>J->BTY{$Mfp;2ytO@<q4tD4qx#4l`dlk
zA$d?jljO<TA)NA?bTAu7tm*Bc2yx&fPU@dL<cOpZSoN30D^V?o7g=ush;2LMONq1p
zNKQ5++F8zPtrsO{>N<s1GwOazV*V{%$+$-0*0SM65;zoFugpHz)y&=ib3M6b#3fa{
z=|_St>P@n)EYzh_L_m(&PiOXxa*}WYARiU($0k@abj>$4IsBPydPPT%XkkZ?tn?Ex
z3M`VNTePr@z4js`T~$snvb<-UPZU~nJ#)M3(`B!66zT<+v~q9`t;IcY=og)l3-^Lf
z5!#YtOxrz?L%V91##72rnp}v$Flf4=4&_t?9H!EEv+<L-^Z&GP=HXC&?;oETV;N){
z`#NFlS;jV&7)uz8B@$&fgrp$~6@$sXFWDv8Nwx|pW8Zf&e5kP#LiJIE`OW8h{r)}A
zIoG+a`#jG%=YGFm&;1oJTaQp1k@%_Y_BxELL*5jxWPnIkY>DDID32zMUw9!Qdx5Es
z{c3rN_-Appt_2@7by1sJkRshmF1!#I%@Q+0-|7KhVEVo9Lkqe+7wT0aFw%<7Z&E#k
z9$rY`t)8Xj_?NZ>^R(7(98q6=k!{l4#he;Ha{mXt$Gkw?MTyM)!hz8S>%7i-E7`TA
z+H+v>DX1hQ{t6g57PqPPRZf7aDR66?V8T83!f2-6*lvt9_8}63e*k+5C1AH&((#|^
z8^{uafT#It8OYQSlOW1slisCt_P8Hu#=WYcMLKklZ*R)2z+?|Dn!TWDW63Z1AY7i1
z@L^i68-@B0ZQK!_es2~W?bSg*>PfO#_Z?jY{&9TDq|lQzo5hJeK!}=UpRHOZFZ-iT
zZEvjdriPjrLSLgp_`G;iZTkX}A#CK0tnrJjxTgL<_yr}o@t;d3oz>&?a?M7DGv&LU
z1ojSnkDpwh&6<!Qe4pX?3^_$(!$*vLCH>-hDGU#Oxz)y>U1e@gVufy)`jBirB(=di
z<u*1*6U70!57&npD413HERv_)yu81pp@L9I&G`pkAZ`-P3M|ZLA%dGnYmO;Q9ytQJ
z7q^D!M-jF0;L%p^%G7#aTJ<i4IUbFjauJuYBUZhbd)yAzmKWjJy+E27%Nv3w&D|XA
z|6Z@Z8h!BU1+;bDC0vw=C^E;>#^;Lip#0ox=xQH-saVx0ZA=JOBTX@91u72${2lUi
zGigh{F%tpj`E-*iyK>NU#1FUvooc)Ytc;ocxr5Dtz%mpcPKRScuY_i^y7u=#oak{G
zq1-0?=MiI^U@3|O_RHMa6k0^`(Dsl2qDN-|;PP31hFb>h|GHp!AgBb|O;wO<c`_{0
zRNQrui9IT4wU$o{93^fh=kukvWD}PCsMJW)FJwo&>NqU-SfA)0rlP*UgfI*>CE)-C
zv+T@2v!r}5Cli=Qa88x|g&5&5m1ErjwE{yEepO;cnW(g=AKO$`jHk0!Ef`hRSvLmo
zqRL~fwu*ZZnWsS7)w-XyVgMEgfZ;WO_=zCueFZ&iOs4kRuT&wAn+0*ln$KqHzUk{p
zUJY8StD$9J^4I4YC@}(LF}oHt)?y4F7j^r5wx46b7qMstFeS<WBm_es+x1V)n=3Mf
zqw^CHb&d5aFSDtMCC)X2mYBe*>zsU%W75=B(I3t`>j!EWqC;a6tAtp?9ab>-WEP<_
zra*C$s4oGJ5oR=65Y@BD?0*Z*ns}NEFc$jj0<*|!m55QPS};kIFv@DJ&>OX|+H6Ay
zFt&iw;O4nWQ{cr8mFfgkjG|kz^c!}7fKZUPFJM7a0Z~=$eJdH<6ii!E#Nwx~hkv-Z
zD~ht~r@Y|(ut4|)Rpm*8k3Kg7__aWZ@@^ci@RC}P*MgVXKIo#Lu>fNdQ41qJ6apSX
zi86}lKu1!=5OAHO){alXh&PPAi^;KD^zMtnay%>y!TF>xZ^ZF}aDHIagc*~32ePri
zyD!m3ncnd`?d)+T-)y1ni<~RS!)f2{RMrm_>>a3lB*cTWx3L5SSuImtQt=otCK|?8
zusashriqu22vbLh52lM&7w}C+r9OlLJNSW88R8b7k&xN5mPgm6%pB)QGf_GCc(t*z
z&_Sq}Mc02%em%=)l46srIHHkj^--NlxE%|CaBwDNqQ)#ms*zSOJ^fgK{0)E{f92)s
z$E1?Y3Q<S~zj^~BP)<_>=3@vLkmE4<_5^SZ@T6VbDpFjU2AIMJ5)XF!C<+i>4mcE*
zHUOj)0m@A7hWPeJ4iKQ!M935yr1VN}4D&CwDW!)1{orNq7%%5Q?U)C^4*7)mcE>d9
zfYyUp1!ng^C0o^e0v1dbPVf@*abAYt(JEofF_M%6&aKu1#0*A;Go;Ps0krHJ+~yci
z3yQ#jS#XvrXcEMIOK}%mg6g8SjDojAW!!+7Dd#XLYlLan01M49f3az<VnLdskMAdt
zTLUFG9i_X9?j~TnuNwn~=|F;7z{ywb1V|#SY=#AZk@J!W`N|>i7900+-(d{v;V}%~
zLfK!T`$&s@NhnhSad?dyDU%yZ!?d{=2+y=7ZmEDKqxy(39@ivpc~2eMT9x>f+Ux45
zu#vBz@Q7>B(iDIR-QUzAz_!*IttVlRM%(2Uv+qO1{KRj2DcD>*D|Nnmhrk3*x%D8B
zYk!R_J2e!iZ?=5$Kn_r!CQV?&ZaaZG06h7##XKeHnaZZ-NB4)+0P=xI-&8KvO>Ub^
zU9Y@3io&l+0T#bZ$W@<85Zz$JMkwI%@|TI0_@E+x>)7uNae8C&fUx4{gBeQclR~@=
z<Y^%u<*K%!D5lDoN;pE?yf<iocnc>0!tH^H$(7@<G$-hXV9Vt8V2@YKzFxjvPQN)r
zoPge4$pa|7M+~4?Ga7XaE-86TGDvj1d|KNWiZOQqz)EOSEvlKyNUDvm3;?n^9W8@Y
zK%4&qsrMH<AVZsNxH6Bf7KSoZH~SJLpzzSmu56&B0=~iTp!~2S*a+AcpGy+05V*YE
zn{4wSu}W{ultaz2H8>OxQhJ9mjNeJQ^p4zHnaLZSuL?Sx<)e3$Fiwh#U)J<6-0+!R
zWdA{@D(T=egNcsS_F3J_FO&1(Xvd}{1Ax?U(ax=TrgK83u^7;gy>Auh5p`4Q7wHHt
zaq2M(jS69L%Ya!LKDt`?q%vu_6;ToDb1=-SCDbk(8E6=vmZNytMY_p}Vkf;eoV!{6
zQP$(wpP`l=e@_&<VfHG}ud&<!57XlUGW+`0NCJLb)z{zxzWe4V`&p0vp$617PER=_
z1Dt`I<pONTXh46QH{GHJGFC){MT~EDR(z#5(dCh(VKQL-8w^jlq#$G@U$P?x&=m>^
za#;TO0gM^sF*HPb8xoTeE%f=f6{{BZBH}ET^2Kq_!PXClMnF~)28D6ojUYT%f32!K
zY>Xd5vtH#F-i&9zY!uUkfa%L*h}R{83x7>V+dPzbmptYtx@fnIx+4T1=kUrbvjtxR
zfU)*l(mqAMeywID8-Mt38{hY3L0PZn>w4MWNp7hlNo;hf?AE1Eky7Q`j}o}WIQ^#C
z8fX=kgM7|fRch<fpUZ%(PRfk{pdb!KO+rDITq`GwFRknA?z=XZ<iveXK~$Z3N7S1T
zh2aO$?R2L$OMvAvu|<_Ki#NfpnZfSscN?6$F}mli$;*EF*Fz=eNHKx|YBHfBHvp#M
zaShcUJQv5<qFcc+B9qu-5l3c3ne`WKEke9)!xvlHO99XAKmP&x)A4nSRXdmKU9x=K
z@k4QtdMHiTHJFzM3X)oWgY+`4JvaHL-vtE|XogUD34H(>$$*RU$1vn#<F938SY7J_
zzo=3$YZ@#y0@P7O*!NRHvq3Dbc>ngpyJ5ggxdxN#b{m#h;Gd+Ajzk%=Uf*^axFC4D
z(sGP}U-B7$-bI~EbEeKI#Ji^Ln!8-1x#`8mo!N25@rEvb_Uri)0SaPCWK|1BRh{z=
zcS<Z@*X^GJ9MbO`stI^+aEW2m6}yGmS=tTtyZ`mUfL%+o*<+4o&y+?a?)uGnJvN^!
z7V~r;RWjD+fiOcA|Leo+Dn@LO2bmla9NYuJusJ<|c%1TxTtJb*R1ZYoH<eu3FQE>5
zTH}r{Vw2pS)A-JK|L$9Rc6{m_k7TY#N-N#YZ3bM7&7XB1N<V3zuIy`->E4FQE3gX2
zH4520n$C7Z@GBHQF~@U<<eG<BRZS_0S2N=4lT4DBGI~$pc%6hWE$Ht|Y#u@gV9R7u
zcJDJwXTU~5viV6RIWvV__h)GZisk-j^!Q-FX<pB0yTw(E0kyQKAqMWaLz69r#T_gj
z8swS@-)HT&Q)fHZ>!Tjdg|2uD3<TLFm>OsD%$MFu3;_8T^RR8=>BGBUh)J0i{mAl7
zn*YBH%N$cUJ%YY@0rwC+%pXb<W;B6^RrfQnkq&C;dEUoN`-Pr`YCWvpu7AJwBk%aU
zQJRZVar1JpQpQs+*$u`T-Ez&MzmsoT%dQo^TIPk#H_Ym5ZShv#$OJ69Kl5B(NDTwQ
zfLY}#1=^eO6^iR6v6;+vKY(Wa&(#6<YzHXOg=O@{V>IZ^(B6uy(mI8mf^YheJzT8T
zo_BHZ<d8=H>=RUH<KIiDqMC1~yla9*NEOHB6_!WwpYMOGjs=*ck(F3UFehd7lDXEF
zhGlF6Z#XJ?fx@ksOV-|3{qB;dBA`uHia*6%ooMHk=+U&a7q9bS|EV+{+8)3+(<>l%
z`e>>Ld`I<I*EknmynXB9HxvLV5r^Av0h{xm;G@}k3SWNRhWf$w=_SvT0-OBLbbIo%
zN^CpJC$1l0;3t?@OZ}E2UHQ7VApv<vh_t-oDfp{gHT8{hT<5qfr2A@V^<m$InL-kv
zMntivra~UJvL(l}4HX^*>A~OlO<GTH4bD^CxrI-2v4!vWS#si<hew<DDd9SJL0$hJ
z1Y^0(nv;)-di_WYE6d3hUA5LDx^0i_YL+nM7;ki|udqqus7LWO|C8c7pqd{*>Be!P
z#iP|~4iTo;%(zIQ>!Q!9Sg+6teLByvYKpkiM#T4@L#ZpRvU}ZE*XG{B@3G6>oX!^0
zuS1)nWy>5c*J+qxC#|)BcI|D$T$(Bo((IeJE8?{OxzJ?=rm>;98I+7Ag;dYs@-cC^
z7Yw_iAHUM`2E{E>Gj853-f3b)%DrO69uPYIoQ)jH)60!+7{2EeJQ<Y;?HKV~Otvw&
zKmNC}XvDGHMV<5*VZn9|0I*V7S3TRDzvj&~Zz!EGknK|wJwh8swy4GZ_38sAJqdJ!
zyu0`{h<ITCPP$l$pxVN>{AUF~d1Z8L#c9r+=-W#Ya$LncH3wn<pF*i~;O|2v(@L++
zmRL8A(dLoTLZ~7sf)i^q)|?nVj(B;OBG2ZLe$ZC?nKJX2Ic#wNjJzQ@*fiwveY+`&
z`;0jt4-!>MiynuZeIZX?o<5i(xo{vrE?#kJ$^4Qbqe8;XdUiFdRBZ*7EZNYdy7x!*
zbxfd&m20NZDq`tukvx5Q`pu2~_hipFkstNre-)scn)9S5#s5ZJmc&ggQ1iswqa2@;
zG9Dm^;2dP~O_PKmgd6S~o45X4IDwEe<LDj*TxMuhY+hOgeo)vf)HMc#*M@MdGboSz
z9`!B-LLXWjdgzq$B%TJ$(7k7gtdM1XJ2_%}maDUzefVKivCpG>-H?mkWdVF<abjZq
zeA+!(dg;&6?2|f(?izJ@J=ei0;>VAs$3nlj2}WG{JF;$nCqepiS<7(r*N?@3*(ZlA
zGe}+-$`~^>mGHvmNgP@Bc~S@YWhEf0V<fh4y6AkOc}$M#xZI)aeKlhwI@>9Z*a#z@
z<@_YnU@f~XczA}`;l{S>%$!J-{r4QMS+$O{7>aCj53`N-x^($@bA*BjZPoo7tI{s+
z{gwrrbqxi2fqSB@@O!*ZLG*8q6F5%u$gz&IMQ2>=4jV6?^x3q9P)ey9Vw)#bO*>M=
z7ktWx+k1P)ani1e8tZfFA*{&678ig$AvV)-h0!2?SftE;Ma@QARQ_WYm)b{?$KwZt
zgx=6@-9P!5<*k;$=e3TjWlA^p6k9~p4II~N>JM1K1y9CwL-Y$vt5!*omx*_LRbXWu
zq;)lx_JF(Bd+eeLFPo-kNM%xILcRUk2Rp!JD}z;U=iiAnULva%Tz6hRm|*z=-qR5E
zvBS+=W7>lF5Z*@DlBBHM(FuH?h>;87Jm-#^5jeep@U{br<|7AdNqlG0w1cz15(mum
zx}#hGRKVXaU%xC`$Fx^E+8%c0Cgc)l$d!F{CdvO4{5&$D-<t=Gn85fqiTBYe+z-2=
z&?!~!5yB6BO$uU(kGBYqi{^koFDFET-n>4yu)w9i2#B{Rns|;aJ~+wWIoFI}wE`S-
zXWz->JF{<e>vL{al%&Z*1H2l`jv0BS4u{`$zDPVvV`BDZS<4z~?B|@%b%P$QHd5{~
zpvL&$w;J(@$m{2?#d)=#09d^gpG3~TJJ%)OaV)w0h+Eb;m+xZyQumwUh_@a6tJ89B
zVuWl+``z|u>&1FdK6Crts6w7J7ge{cgyWZx3fYbp2G(fD)u-}1EiT_r+j>+h9K!NO
zzXBPE;29ZIw*A%tw$XilS<$;9QDmhr=9z<!F>iJ^Pl?aml#zZ2@1{_AH@HZ1e*(Gz
zq>QQ8Szo_Gsg=svnB%U#6`W3{+H|?Rl7?o<Y?^#Tb7AEx?kPg)H?7Gw9+Qqjr&l}c
zy*qETD2;m72d3*J?@CIsZR)r@h#pv%xtOb!nwQPrwESc4R2NV6Y*HzG;yRe8j0nFY
z{QcIhmTy(OUx*KibmQ5ejw@7KZ1T^|A0H#$pL9Oy(f;slX~NPO`R@am1^EtFl}w_O
zuxoc}ymFAY6;V&b&b-BS73h|3)M)3kW;85gx>l#NBY@5N-P*08&;OL2leBvIE3Swh
zTlQnb>w-m|kvwtc=#0ygV>(lZ5Niy85Z$eS86*6zoOKof5Phy%rbcFjFfDhCd~n2?
zJRm{WQ@+NY<=wZ3nK{@7tPawWx41Z^;)T4ZJL@>xtRdJ=pVZ)H&^?qN_bRAXV6#MG
zGw0xBcSBnQ*J#manI<`E@M%TB%LEM%ri5SczqrWH)V+_REjP_|PeEv9DXz^sY3zG3
z(C_~`qE_M3rVzVt^ZtBKUQrP_VyWD&d0=z9SnBtQLcOx3>Fd)W!4MA+t~?5KjU8^r
z#{)OonZ?pyX>lKjg+?aQvP-~CztKIpuoG6K6sF2LcRI8(AO<~k*8PNNWimZ8>7Vqd
zYl}NgUC7dlhQGOH_N&&V*IbsybW^5E`Dc{2_4Br#9P<%AeHt20DEZY3NO*6k1$jQ#
zYQc>8L1O3OmBhW8tGZ_Nik16-7~S9Vry#xrk~G31b#vMQB5?WEk$aaxtv&WOHp{I3
z3nHS#{dYPp?jap=#Pf?MYJU4l!My7CpO@xy;kS>@Sl!LP0x^_NJtwAy4TCNu(Q!E4
zk&m#7+bdQrN#0ehPae-Y1i3n#>|r-L!ey^IZX%$}Q`WKPY3}LL7b5TNYeO!6q^KtW
z3g3(~^_rv)m>0_#wD@-GL;aWj9Fn`bm@WHKmegVQhmIRRRfQKE`+hhmOO~fPS>in{
zbD?_0PTZ}1s{RcojZs-!thSu2go|NIS(kBin$njoq5rHT>jSv`ru=-{KuuN%69yma
zJpMy|YrB%hQpl5&&^Chk<Q3Bp79HK|!g~1q9Zd&dwbGUgF)f$=$~;B860$OVIIl0@
zuMfse_Zu|o8<xoq@WC&76;jxHD7^|bvhTPHMNuMmT8UcBD>cga+i9Ys2L8BAAGMm9
zZTisQufW>n&Y$<Q6?|VMhmQw5`_0#TYoMJA-Pp&WytMh48;yRpmJFu)TTaZlbaelA
zrNNp^E$gN|`K~`M2VT0zHGNSOp#{Fbe)y>_M@Ql$4ILI7i?&_#O#f?sgjan>dM)hx
zc`v)i@&t45O-zxU=C)gwS<<e=;~Tl1BQoz#qNuev!p>PHgsxiE`1mTWiT9%Ae*!&P
zb~yxPSoWHRp#I8ZG-?}zC{6!-1vhxF6x2L0gY9*2ut<}ia*uAFdkSWHPh&84%A8s?
z9EG_#lr4pZP^~_3_$u?v>qJIk6e~3;n=-<)aFaN+dau>rvY;&5=6t@8q+G8(QClfb
zW}(v<2<_kLy?(R%=U&sepv{vZu~n)k6MUxt01O&pfiO9@BYU(Q-8=kkVP+Td|M(#W
zoWB3ez0wvarP{f9dz;L;R_Kw-woj#1^cQwJCpgtZ2W?h4H#YG-OVI`$bp8i|k!g%n
zcliU>Bm+x;31hzE{Y12OT=C9SM9@92iUgN$;_~$UmE?9K#?raoDa0F2g!CgvkXMo4
zSQdFWP1wAiOIPIDS^g2eVAtAVQ16X-A#4#4`AFm00iQwNFqTu?o(yDN_u<K2HHP|p
zf(Ymt@p=~OUHd6CflSU5>-VUCkT_7seuG-U{7IzldLpdcHv%Skm5WNfTs9y8HGN)-
zfh8PU8I*bfPC-*W2=+!Z$FiZhn)#SOr{RL~OPY80KN2og9<GX^L@N0_v-|}omUaa{
z_%#d))gR$;p6vtd-rLqya|$P7o$HjUy|*i`GTG$=Bb$RImTGN9&61o%>y!pOyd2=7
zp7}&Dl3{X$p%O{etZyA%rTMdQ(AIU;|LAJ7ADfuuqm%Rd7lR5XYcJo}htUXty)-pO
zXeIb0;_km-@&?n2jw%nxC2GU<qd3t`s*iX9ndU#C7Z1T-S0vApA^vwG?ort^9^tbf
zWg<flGe^lrp7EhsSzKeE;QQ9Tt7<j-7uM-P>!WY5kmy3!B(tQc%3A)<`q&IG)lTxv
zqvf{8)&?}iJYM+7LdT0ugHl<vMEc*KdTc!E6ni+8<)B_$+j|!RhWLC;^QtF4v2aV}
zWBZOr*f5)C5$&dfdy!PYblFf^^}m;7T=toCG^qqxm+`-r&S(;jOpJ#rgtt=(FukzD
z-CJ#UmzM+~rFB2zs0>-D+85ml27uJ^?&E(Jq7nhih1evt(YGM>Ia5rr3OYkPzNst!
zM>9I>*Hn=PX?OY2s-$7+kC}K8Dy)gz4f<u9`6PY!o>xe>=KmnKKkL~79R-X)U$vQQ
zaW?+}ctunI@1igmGVRyg#a~<3+{LYgzz$`=jZ?Ir(TLoXoQmQSP}?Ilt`Uvti-Km%
zSc_WLo_w!q7GH3Sz9x(-81OT#R=?N(r3_L94u9AetU1KHrGftYAoWrf6=*cbS3z?a
zLZA|(-0Y%zX~@>4NR)nV<H}2_(nNj3#p6U+{R@!+<dBq;4AqDN$t7zQUDK$#uq#^y
zW;j(7^KuoFpa%&Miz(wYJMDI}$rl@#tvFdw!<ZWT!?;XQvq;c?eC+k>;lo+%!<}<~
zUAxQ9?)DS-n7D6cMci&!>oyYrF8bUA6BGAo=W|4d<lXE-MpaTB?ibSK8Yu#^QNxk+
zx|b~!yOBM=R-eA)Vq{DJT4AVkXTYjB=ZnkNZk^orx0Es+-t&Y&ehN3=BQ>lN<INg(
zggZjG{&7|U9%~Nmo!(7s92Qg_Z5oxZ=D^BueR@9&)*g^#K=krf^1%o^3c`B|p*QYD
zs-WF(fMCW<O@J&ZDNxDxs646~D+_Y%aTWvU{I^*9dvAU_aP-DEcY#v#+#(MP-k&7<
zfoh(D)OA2$jV?toW@wnv{u5m~&LP=D7bT#lX##{zb>4mCP+^}BpzPHLZgK5O*nrbE
znB-sD%=Jv6)|Mr~=NQyFyVy~gjz^Q#3@C+t>d6%5pZ2d;PLU)g0jwlihZvE2;5TTz
z!vA0@*&8H7c}pfn(~IbxZr@1*mcJdH#XokC7+|TDYa(*U61Wt^ZI<_ZbMZIX8KA=L
z$SxSouc=5@9{ECKV`rJCPKZnz9Fw1wvEbsCPWwF6G%9fIMTqa@9Q<(BD{vIaSvhKe
zw`kvand7Wkyl@kzk|oy9U0c`GuPI>2`Cj?P(XWkr7T)#82rzkW64gy8fI0n|He<bf
z7IF+y)*xtg2*>^pR6d|Bf|U9-^~=<1!_6}SAG~c;{bNeWrU35Q%_liYcOj3+eQ#RQ
zg4u|c0`={8*qmP^V9^{Nu~Pr|ad;(41#pyQH)U0rT-kq0V*p@bVwXc6O6Rq)EFR6o
z&`YY_^0v;<;+8XYm81`qD60`Uk&*wmvJRX8H#KdqLKTB(8P`oRt-!8kL)!g=CVgK1
zj`vElZ(<}~NkqN3%LB-&6^0y5Cs0}OrB<BuLfC>yi&VF3R}w_ZrnE}&BPvDEArNbl
z4%16QD!KQf)2W1b#}D)8awqwIQBCE>PE(J~*vWZSu9evUA@Kk3^~ZeRHk^lz;>&C3
zgRHDxT)L=6IZ^!YFD=8khS#>d9N2=}|Ljgt=o#_95ZbkY3RE5+fWBs7Sg-FI^?wCY
B;9~#)

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png
index 998f5fb3cb6f04dd8541efdc151bde4014aa69db..3dc60464cf31e3ba07d5585542d75d616f63da03 100755
GIT binary patch
literal 4633
zcmV+!66WoRP)<h;3K|Lk000e1NJLTq004jh004jp1ONa4X*a1r00009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde2XaY7K~#7F<-uD_ly@G-;qRahf|3Z<YGUNH(wo*Ru*ss;1k)8I#nwVE
zZRB#@8xL8xEqEB$xK&#BZZ%Q2ZP02PtxI}~b^|KgXi=<(TP<Q~mSHT4O9J!RkmlF_
z3<U(_F!R38qp3qK>-ZzJoZ%v^JRr=^4EUKa4`}5gr`gXYUS*!VgGIc>VH$}r79D)U
zVcueqk`=Qk;UKL%uT~CH!Ym~ZW>Cr}gqcWTKB1HuN_6B9qK(PYMu;3GDvCKvKO<?U
zf#cLr#RgVV$V=pt&r1}tk_}W*!*LpTz)1QzOR*9SYq`X5I{BLSSi=h%C0<|+@9{OA
z4CfMSl_*$6BSVSOObyFP(KwO9a%yNM%1|0vrRhdK=NQU$c95e9LJm8)&QQ+rJ53jY
z?4gIj9&?l;O#+HI%3}uWVGlt~J&O6B!G7d@vNVa9$4-7^uv-*sDiP#w^b_wVwvnbO
zKpNZliFo~dNUEj=1zaUw4<Y7i3Ne=uJ;b|8fhHes&_%p6WNR9b%^Bi#@rEW70YXHH
zb)Pa#Bg*)JSW!X*G&xA+bK;#KL(_~5P7v=jvo-O^q>)%*DwH6opo>_IWNKpZBG-x4
zLcS6R`Lq!0IxlMCu$Vi<sv}(qhICF6>kf-GF<8JIVuc7O0TCcXtUD~w^J5-2aQdiH
z0;7sPoEv27`4HsaIK8~11jjq{;xrP}_z|EEr<Zai0m|vcsUx8AVlPe~l}Zv+(uWh$
z`0xf%oXtuiyh{`lrCejjQX)79lw>%76Je>wh9K8)P7zR&A;2k|YXmhGe2CLRx{?s-
zwBQ`n=uu1`CQQDP6#0ZPeH3eSNaYqzg_0PRIJZdEXs{dSgpwTp#M!N9Baf$;`(!A|
zk->e;Q}XmIoW&`V2T+D{RwH8-&gb$7PT{Q5NNB=zvsfNMHcv238XjwLcF9B7jZ>=O
za2eCV9C-+H=)hdo(D*&hHhBzNaaL$3oX512CXXSFcFcMG7CH1|s^vjcWBSR}V1zK;
z%$Em|MK>m-c+BJn%u#t1M=)*7R4iV{DUwG~gj1?m9K*E8!)U>LDu-EgVs^;G*pBHU
zC_@P*N{&2?Y@(PoGSp)JBafpQQ!B$wOpQE_8qD|l1q*SC<Z&#=S)>7M#B`D(k0XUn
z%-b5kN0@r~0QH!UHGoFUPWb?T!8B?B5lo4EfD%lEfXKy}FCSn&PM%nYX_HUThA9(U
zFb(nv8ZcYLA<QxP1jjIk#21)q`2-(ez7!WQRq_d{Fc(BC=1utoZ(>@-L(B^K1S>G@
zB7#{apI{j#BDygz%O`jR(=D8A`2^YgN;ui_39|W>=*GM(pWqctw}@bt$tPHbiHL`o
zV)+CsFzw<dW`lf!4Vata0;WnnK^5kL_ySWcpWp+`m*NoSn0$g`m_uR<ra?YI17?d@
zhiQ{f(1s}!xj0$!0p{c6Ng{$Nkq=OUc|<@GjhLPC0d`^<HGq#W_3{DgF&}FH8!`VS
zMIJ{AotU>ZfQ2}P@;Hic7U>t<!qmv)sKMNl;qRDcc^u7{S{eR;iIOc3Bbz8@jSNA;
znC<c~wqv>o%HbHMMIOd?m`@dp*KvyEQ54~nDi$+o!yJ)E@efQJGZl{zrkgBz5Sesi
z_GvJ3>Bm&dgQ&*zldIq2Jf@vAc?@Z^W6o<RtiahSk6|m$N)3(6m=5O1LzqJc=8A?x
zDb6l=2)l6BX?QeYx>+obU<pq!moySq<D8O5a0+L&M#edu_3{AL<9wxOA&;k+dt@ld
zk->e;Q}Xm|?7=y%B*zJykVb=4ZsAlYiBW-bn^cVs#q?o1$ybshpD?D66&gJb;Ixpg
zBt$wbI0rNq1o;-{BmpHE0-VJ8mY~Llr9^P{E6MOzoCpOPJIaY-qP(jl!X~1aDCHU-
zLO6X?DoIdDA5KW)MSwb-UdojOD5n>vj)2CGAeV4@sZ@fal3tuE1oeE#q!p)+DkU&B
z(}&Yark)=QxQi2IF99VW0_-J<bC(607%b*4vFb=uf+3wcV%=r2CJqa^POKL4lt9R%
zg;+OOsEI`uO~eXQp#(t%VPZ9rrHRLEP807q8JcEfaDsSen61e{fPF-Xb&oPlBg(i(
ztSI{kXfjbwgm|aP)-)iS)5Lp3xh5Y4TqRx)yO^sf#9VgKL%gdLXlgKv1N0NGgRP`#
z3XsNDI*8ZL0cL3`QOs=yd&v7_X%aDyKl6~mZd0tON02@IkHH>ughEXM3OPbIgY~k9
zpr#8;Imb}GV>?SUL0H0et}&EzEY);lHBAg9$`xu@PKw5f6qZxN6`~BKiPcIJl+w&_
zI;m$TCCt|-F`p84QcowtX{J<(hS&HP{fwlI298rr6&qMdAqC`<PXUFjWCNS2<~R+s
zF_M11;x#2IatYDKWO+b{TqQbYP|9a?F_F6Xj8bMOc@U(8TJG???odk!K_x2|v5~_x
z@`$nM;2RFJkwx+j@>tKGsO1b7xk)==o-p7EVcNOLMNYGyO}xrHO_~1#Zj~Jav*Fl4
P00000NkvXXu0mjfY&D(f

literal 26685
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
CK^Lk3

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png
index 0d8d037a5f0357f90e13ff9cb05544cbd6d7d931..3dc60464cf31e3ba07d5585542d75d616f63da03 100755
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 26685
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png
index c8acaaa58349b47893c0c3ab3bbd4a2d472c8721..3dc60464cf31e3ba07d5585542d75d616f63da03 100755
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 26686
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
B?Uw)m

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircle@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircle@2x.png
index 207ce15dfabab74df8b5c13932506d94ef19dcfe..919d8f405ca7f40c921e71b91e7a81655db1f94b 100755
GIT binary patch
delta 42344
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

delta 95844
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
K?H<|qr~Dr=#f2~c

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-0@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-0@2x.png
index ccd1494cdf1a9d19a9c860b88d240392ef1919ea..8e50cd033596fb3daacd173247d6779168cc8f99 100755
GIT binary patch
literal 26595
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

literal 87032
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
CAgN>k

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-1@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-1@2x.png
index e611add3ba9861baf68614ec51d63d3f94c8592a..3b5e886933d2f7a8803a44304c5439058ef86fa2 100755
GIT binary patch
literal 40858
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
U^GtX>4gf!<m#-R@=)2(m2kI%UfdBvi

literal 119975
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
E0Oy=DQvd(}

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png
deleted file mode 100644
index 60e2d3328f89df794d7b894fd2f6e2dfbb44ba82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2095
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
ZzyR4Xd;=*Q?iv69002ovPDHLkV1gL3>M{TT

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png
deleted file mode 100644
index 03ebd1904875ab54fa71cbe948304fbb6266d69a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^j6ht&!3HE(th_Z1NJ*BsMwA5Sr<If^7Ns&crsOB3
zDtP85rl$s_CZ<#to=mj?D$?_GaSW-rmGtBPe|u(OW&s5b0RuL{{})vhSj1!(AJJe`
mnsM{yP3eNAb2c+DvN1d<;HnQh5Offzlfl!~&t;ucLK6U8&?-Ox

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png
deleted file mode 100644
index 27fe5a4e8d16eb92aa3342865479515ab0788ac8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1926
zcmX9<dsGu=7M~=Ogd_tQ3MC-{iKsw<D2X72CUp`XO)A!`B1P(h1dvozKwjk`gdicJ
zlq^!VTPY^3cw&o|D0rkTP$5-VK~j%!B64I+skA8%fr6ByuwU3eX6D>)zI%U<d*_?8
zvJc*Krn0CI1UXA3(R;x&99+pxByjJL*(u-wr;B!rAn3ckaANfzAok3SNzC1sc{H~`
zeku(TrDiJ9IMNgH^t8Qc^3=lY{xksuk(ttHQT!*PijtY@eIaIOJ9-o21-bVwuaz$|
z&@!UU2f~^8eZn3%PrycR5_tY-4vt4hbE0^X^MvX${9Fd7i)`Ko;gzk0pSrTPht$5n
z^LC;%%)~*@;Z1?)eY}Yo-$=Gc#44v^pgD#LQh26ru$33Z!gdOUGon#M7~iIcQfvf1
zRzl#Y5=n2*wu-!iphayc8U&fb&<x1r9_m>~#c*aSiV>bgcqrenRo!(7sQ*l5b=5lS
zHz>XqA5MduI3AJ3)o!d^br=$OWl&|sX@~VZ$$kjMf^*+5^|JIp^;7XGD@8l4m+Fq5
zbR@7C?o*Zte`1aIhsJvoa%oiq#8D}Ki%3xN-Ksnged2uiUDl?~c^n4)<4I1OL@J{s
zVbM5~>zh<c9auEU9tWRP$_)f_DK<s9c98@_FxoD-M;iP{kMDuCZhBLgz6J)O4SNl^
zYVSNweuZDuzwcNY2mqbB!0>OgK)+qf;w)+W21PgsudT$_W{dvh%J^~W25rSR8(jc<
z_fL>Vf#GBu5+M8?a)ADqw~O-tr|7*i>Is87{CTFawH0p@a7Nez!b2*^x0zygxz-zJ
zkY>w@5g3#`3)hxc7oS!>lk?q4A2}BKF4OE+l=$q;=o6RE{<#@Y^c6ReN2_0|6weK|
z2uIAnbU>U^b5ZVub3{6?%JM{p_E&w1R}>Y<bZgqNDL7&Uqt$IBgMySjK}Xz^MD(jA
z8pIJ+F}Jnd^dv1#=wL8IXEu#s+|!o6dR{L|a>SKG<eGL4X`U2Kb_SjB3pV+YreiWf
zkZjPeIOUej;cY+D?YXCrydfOGO6v53y|*&wO(Z;oJ2MsGq7>QiTyB-Xk=tfFQe;f9
zT7frr1ow~=e}5}V$xMU*Y4I@*Evnes())7`go78n7;RKpIx`kD`E%XMaa-?OQZ-28
zi5A$#5ZvHTSuXzTXl?s@$h+&#_xArktA)i(04d2$ziJv9de^lR6uwRAw+mf3DxL5i
zZ%jZ&vDSxmHFDjcMMePT4CJ&RQMrw<kAok{Jo>F1c;wW1GqPo!<jY#zjrz<);48jx
zW*fSuDavvL;-#_iXU~E6>cSZ^A(b-S3e=k6n)X>l7c;buJdiW4TJFtS@WP;S0XgZL
zRZr~^B;3JzAm@^5`N8^|J9S$Eo}Uy8Bag4E`!ifO*#yn~@NB|Sx?P45|HI~V?QC?g
z4jFo_Dw>(fI(BuPb+<t}kD%Q?TbsauPH46p%_UTBqJ{`$Ol%!0P#!8!-md?`(SnX~
zOGyD$>*GvzfZv!*mM-wnSs#~9Fzw<?ZsbLzi7@xBa+UoMSZ5KwWQ?l1Xy$jSil)H!
zTX_LH^`={H_Wq4D;LF9yWE1(ABvVtAFTtyzp7tf$gdyExedpbHA>ephKn{u!ofyos
z#4hRx06epEi_y1?Qq$3HdB0QwjO&@~ShGCE8=pRb&BawoU$ZzWCoUoOIx7L1t28)d
z`yS1UG#((0hLy3j40^L2$5CnL#>$kX73~K-M7th}=wN8AyWKeS(#q%ETnn=#%<90t
ze7vB1Kb>x9o>VALdA9*Ak}r2xz8Rw57nC4M3H<_h<7Ki1Fz`+PZbuO%l5Br0a(oSA
zg;^8KgM`6aeM%%kx-bcr>ZGgP7Qr&44d-K|2JBpyh%9M!COO<|4q{>(ULo9=0@1|`
z{mdIm##t*?42H{S5)ek>iXW($sYURj-j(3}Ao(XED3+A5XEmxS;3@V8-Lioga8`Zm
zKGNssuY$f>>S4+Fubmb-0Ub}(`9&iCk5&1fTk<F#81#!`7;WiTVkcFr16S@Ny3-R&
zh>n{v_16n9O~0IyKJrn1yh6BoSU@*>AiDNP`V(J;9{Ld+x^0JNiTBTS>lAaos86NG
z4t<SG-@F=nz=eWhe<ckp`LHTl4~+dwwr7JT;T20(8z|e}kB8CD5ACm0uwdHX@U<OV
zqjv4{R_@(@=7uP!;H}5RyH4ONZ%14k4$7PDY~?-|_X{>j6a1y0egJwb*di9UsPQkh
zVUV*XtU<4yq=oM3s=AeRG6WkrM2iyo(WeWwm?<>=Qy<n3zq5r{|0)^my+XXaW*8>7
zPz!0(bK?q3h@tu4v->WnEttwXV40o7A14u+VB^TJY0coQo|V0F9X(&cElEqk8XNmG
iXXL~5fUGV&%!C*_ol6Q};|lnZLeiKIqOXgS)&B#53)X=E

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png
deleted file mode 100644
index 87ead80a08146adfa553d242f315f764a467506e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3749
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
DZJ4!X

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png
deleted file mode 100644
index 778c231f20ca9253e64ccffb64a0aa39a3b97a76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14570
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png
deleted file mode 100644
index ce79780fda8e5de5e89a958e4b7000ab6c6de7ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4791
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
PK2D*pzfZY$bjE)HM$sIi

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png
similarity index 100%
rename from osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle.png
rename to osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png
diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png
deleted file mode 100644
index 6dca33317131cd69ef449c0a6c0122f0f39cd84c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 66280
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png
deleted file mode 100644
index 5d8b60da9e79009e8b3e78b2003d883974b139a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12374
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
Qd;A||`ImC#G8P~IA7%MrKL7v#

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png
deleted file mode 100644
index 2626c394dcdccdb7d74da5460ec3f6d6570ad9a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 66281
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


From a9b45c6fdcba03437cca43f9613f85c60f98c0c2 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Tue, 19 Sep 2023 01:31:26 -0400
Subject: [PATCH 1465/2100] Fix slider path calculations for edge cases

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 05960ec416..cf6d0d212b 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -261,10 +261,14 @@ namespace osu.Game.Rulesets.Objects
                 // The current vertex ends the segment
                 var segmentVertices = vertices.AsSpan().Slice(start, i - start + 1);
                 var segmentType = ControlPoints[start].Type ?? PathType.Linear;
-
-                foreach (Vector2 t in calculateSubPath(segmentVertices, segmentType))
+                // No need to calculate path when there is only 1 vertex
+                if (segmentVertices.Length == 1)
+                    calculatedPath.Add(segmentVertices[0]);
+                else if (segmentVertices.Length > 1)
                 {
-                    if (calculatedPath.Count == 0 || calculatedPath.Last() != t)
+                    // Skip the first vertex if it is the same as the last vertex from the previous segment
+                    int skipFirst = calculatedPath.Last() == segmentVertices[0] ? 1 : 0;
+                    foreach (Vector2 t in calculateSubPath(segmentVertices, segmentType).Skip(skipFirst))
                         calculatedPath.Add(t);
                 }
 

From 0360646e9b8858ef52ab4ad5599a32dbdc3ddbb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 14:38:53 +0900
Subject: [PATCH 1466/2100] Avoid fast fade out if slider head was not hit

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 09d98654c3..1a6a0a9ecc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -317,7 +317,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             switch (state)
             {
                 case ArmedState.Hit:
-                    if (SliderBody?.SnakingOut.Value == true)
+                    if (HeadCircle.IsHit && SliderBody?.SnakingOut.Value == true)
                         Body.FadeOut(40); // short fade to allow for any body colour to smoothly disappear.
                     break;
             }

From 4504c9fc43f6783d07041275a40d3fdff29d8f02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 14:42:07 +0900
Subject: [PATCH 1467/2100] Update tests in line with new slider snaking
 behaviour

---
 .../TestSceneSliderSnaking.cs                       | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 630049f408..aef7dcaa59 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -135,9 +135,9 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
-        public void TestRepeatArrowDoesNotMoveWhenHit()
+        public void TestRepeatArrowDoesNotMove([Values] bool useAutoplay)
         {
-            AddStep("enable autoplay", () => autoplay = true);
+            AddStep($"set autoplay to {useAutoplay}", () => autoplay = useAutoplay);
             setSnaking(true);
             CreateTest();
             // repeat might have a chance to update its position depending on where in the frame its hit,
@@ -145,15 +145,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             addCheckPositionChangeSteps(() => 16600, getSliderRepeat, positionAlmostSame);
         }
 
-        [Test]
-        public void TestRepeatArrowMovesWhenNotHit()
-        {
-            AddStep("disable autoplay", () => autoplay = false);
-            setSnaking(true);
-            CreateTest();
-            addCheckPositionChangeSteps(() => 16600, getSliderRepeat, positionDecreased);
-        }
-
         private void retrieveSlider(int index)
         {
             AddStep("retrieve slider at index", () => slider = (Slider)beatmap.HitObjects[index]);

From 046e96afcd9ce4c32fcf2a7c1bcaafe9ba811782 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 14:51:03 +0900
Subject: [PATCH 1468/2100] Apply NRT to slider snaking tests

---
 .../TestSceneSliderSnaking.cs                 | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index aef7dcaa59..13166c2b6b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -33,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests
     public partial class TestSceneSliderSnaking : TestSceneOsuPlayer
     {
         [Resolved]
-        private AudioManager audioManager { get; set; }
+        private AudioManager audioManager { get; set; } = null!;
 
         protected override bool Autoplay => autoplay;
         private bool autoplay;
@@ -41,12 +39,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         private readonly BindableBool snakingIn = new BindableBool();
         private readonly BindableBool snakingOut = new BindableBool();
 
-        private IBeatmap beatmap;
+        private IBeatmap beatmap = null!;
 
         private const double duration_of_span = 3605;
         private const double fade_in_modifier = -1200;
 
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard? storyboard = null)
             => new ClockBackedTestWorkingBeatmap(this.beatmap = beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
 
         [BackgroundDependencyLoader]
@@ -57,15 +55,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             config.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
         }
 
-        private Slider slider;
-        private DrawableSlider drawableSlider;
-
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            slider = null;
-            drawableSlider = null;
-        });
+        private Slider slider = null!;
+        private DrawableSlider? drawableSlider;
 
         protected override bool HasCustomSteps => true;
 
@@ -150,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("retrieve slider at index", () => slider = (Slider)beatmap.HitObjects[index]);
             addSeekStep(() => slider.StartTime);
             AddUntilStep("retrieve drawable slider", () =>
-                (drawableSlider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == slider)) != null);
+                (drawableSlider = (DrawableSlider?)Player.DrawableRuleset.Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == slider)) != null);
         }
 
         private void addEnsureSnakingInSteps(Func<double> startTime) => addCheckPositionChangeSteps(startTime, getSliderEnd, positionIncreased);
@@ -170,7 +161,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private Func<double> timeAtRepeat(Func<double> startTime, int repeatIndex) => () => startTime() + 100 + duration_of_span * repeatIndex;
         private Func<Vector2> positionAtRepeat(int repeatIndex) => repeatIndex % 2 == 0 ? getSliderStart : getSliderEnd;
 
-        private List<Vector2> getSliderCurve() => ((PlaySliderBody)drawableSlider.Body.Drawable).CurrentCurve;
+        private List<Vector2> getSliderCurve() => ((PlaySliderBody)drawableSlider!.Body.Drawable).CurrentCurve;
         private Vector2 getSliderStart() => getSliderCurve().First();
         private Vector2 getSliderEnd() => getSliderCurve().Last();
 

From c0f603eb0e4007cf8a35e8af4e25d9e01441b1ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 15:27:55 +0900
Subject: [PATCH 1469/2100] Fix typo in comment

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 07dc2bea54..f80f43bb77 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Tournament.Screens.MapPool
             if (CurrentMatch.Value == null || CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) < 2)
                 return;
 
-            // if bans have already been placed, beatmap changes result in a selection being made autoamtically
+            // if bans have already been placed, beatmap changes result in a selection being made automatically
             if (beatmap.NewValue?.OnlineID > 0)
                 addForBeatmap(beatmap.NewValue.OnlineID);
         }

From 73db68a49a8226b57c2c41be024fbab946094fd6 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Tue, 19 Sep 2023 02:28:28 -0400
Subject: [PATCH 1470/2100] Check if path lists are empty

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index cf6d0d212b..0ac057578b 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -261,14 +261,17 @@ namespace osu.Game.Rulesets.Objects
                 // The current vertex ends the segment
                 var segmentVertices = vertices.AsSpan().Slice(start, i - start + 1);
                 var segmentType = ControlPoints[start].Type ?? PathType.Linear;
+
                 // No need to calculate path when there is only 1 vertex
                 if (segmentVertices.Length == 1)
                     calculatedPath.Add(segmentVertices[0]);
                 else if (segmentVertices.Length > 1)
                 {
+                    List<Vector2> subPath = calculateSubPath(segmentVertices, segmentType);
                     // Skip the first vertex if it is the same as the last vertex from the previous segment
-                    int skipFirst = calculatedPath.Last() == segmentVertices[0] ? 1 : 0;
-                    foreach (Vector2 t in calculateSubPath(segmentVertices, segmentType).Skip(skipFirst))
+                    int skipFirst = calculatedPath.Count > 0 && subPath.Count > 0 && calculatedPath.Last() == subPath[0] ? 1 : 0;
+
+                    foreach (Vector2 t in subPath.Skip(skipFirst))
                         calculatedPath.Add(t);
                 }
 

From 8e199de78ac57a7d9ed959378eb17df40c7354e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 08:30:17 +0200
Subject: [PATCH 1471/2100] Tweak nano beatmap card UX further to meet
 expectations

---
 .../Drawables/Cards/BeatmapCardNano.cs        |   2 -
 .../Cards/CollapsibleButtonContainerSlim.cs   | 237 +++++++++++-------
 2 files changed, 142 insertions(+), 97 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
index 2f46bc51d6..29f9d7ed2c 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
@@ -149,8 +149,6 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                 };
                 c.Expanded.BindTarget = Expanded;
             });
-
-            Action = () => buttonContainer.TriggerClick();
         }
 
         private LocalisableString createArtistText()
diff --git a/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs b/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
index d17ff0d759..151c91f4c1 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -17,10 +18,11 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables.Cards
 {
-    public partial class CollapsibleButtonContainerSlim : OsuClickableContainer
+    public partial class CollapsibleButtonContainerSlim : Container
     {
         public Bindable<bool> ShowDetails = new Bindable<bool>();
         public Bindable<BeatmapSetFavouriteState> FavouriteState = new Bindable<BeatmapSetFavouriteState>();
@@ -56,30 +58,15 @@ namespace osu.Game.Beatmaps.Drawables.Cards
 
         protected override Container<Drawable> Content => mainContent;
 
-        private readonly APIBeatmapSet beatmapSet;
-
         private readonly Container background;
 
-        private readonly Container buttonArea;
+        private readonly OsuClickableContainer buttonArea;
 
         private readonly Container mainArea;
         private readonly Container mainContent;
 
-        private readonly Container icons;
-        private readonly SpriteIcon downloadIcon;
-        private readonly LoadingSpinner spinner;
-        private readonly SpriteIcon goToBeatmapIcon;
-
         private const int icon_size = 12;
 
-        private Bindable<bool> preferNoVideo = null!;
-
-        [Resolved]
-        private BeatmapModelDownloader beatmaps { get; set; } = null!;
-
-        [Resolved]
-        private OsuGame? game { get; set; }
-
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -88,15 +75,13 @@ namespace osu.Game.Beatmaps.Drawables.Cards
 
         public CollapsibleButtonContainerSlim(APIBeatmapSet beatmapSet)
         {
-            this.beatmapSet = beatmapSet;
-
             downloadTracker = new BeatmapDownloadTracker(beatmapSet);
 
             RelativeSizeAxes = Axes.Y;
             Masking = true;
             CornerRadius = BeatmapCard.CORNER_RADIUS;
 
-            base.Content.AddRange(new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 downloadTracker,
                 background = new Container
@@ -110,39 +95,10 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                         Colour = Colour4.White
                     },
                 },
-                buttonArea = new Container
+                buttonArea = new ButtonArea(beatmapSet)
                 {
                     Name = @"Right (button) area",
-                    RelativeSizeAxes = Axes.Y,
-                    Origin = Anchor.TopRight,
-                    Anchor = Anchor.TopRight,
-                    Child = icons = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            downloadIcon = new SpriteIcon
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Size = new Vector2(icon_size),
-                                Icon = FontAwesome.Solid.Download
-                            },
-                            spinner = new LoadingSpinner
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Size = new Vector2(icon_size)
-                            },
-                            goToBeatmapIcon = new SpriteIcon
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Size = new Vector2(icon_size),
-                                Icon = FontAwesome.Solid.AngleDoubleRight
-                            },
-                        }
-                    }
+                    State = { BindTarget = downloadTracker.State }
                 },
                 mainArea = new Container
                 {
@@ -168,23 +124,13 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                         }
                     }
                 }
-            });
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            preferNoVideo = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
-
-            downloadIcon.Colour = spinner.Colour = colourProvider.Content1;
-            goToBeatmapIcon.Colour = colourProvider.Foreground1;
+            };
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            preferNoVideo.BindValueChanged(_ => updateState());
             downloadTracker.State.BindValueChanged(_ => updateState());
             ShowDetails.BindValueChanged(_ => updateState(), true);
             FinishTransforms(true);
@@ -195,51 +141,152 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             float targetWidth = Width - (ShowDetails.Value ? ButtonsExpandedWidth : ButtonsCollapsedWidth);
 
             mainArea.ResizeWidthTo(targetWidth, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            background.FadeColour(downloadTracker.State.Value == DownloadState.LocallyAvailable ? colours.Lime0 : colourProvider.Background3, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            buttonArea.FadeTo(ShowDetails.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+        }
 
-            var backgroundColour = downloadTracker.State.Value == DownloadState.LocallyAvailable ? colours.Lime0 : colourProvider.Background3;
-            if (ShowDetails.Value)
-                backgroundColour = backgroundColour.Lighten(0.2f);
+        private partial class ButtonArea : OsuClickableContainer
+        {
+            public Bindable<DownloadState> State { get; } = new Bindable<DownloadState>();
 
-            background.FadeColour(backgroundColour, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            icons.FadeTo(ShowDetails.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            private readonly APIBeatmapSet beatmapSet;
 
-            if (beatmapSet.Availability.DownloadDisabled)
+            private Box hoverLayer = null!;
+            private SpriteIcon downloadIcon = null!;
+            private LoadingSpinner spinner = null!;
+            private SpriteIcon goToBeatmapIcon = null!;
+
+            private Bindable<bool> preferNoVideo = null!;
+
+            [Resolved]
+            private OverlayColourProvider colourProvider { get; set; } = null!;
+
+            [Resolved]
+            private BeatmapModelDownloader beatmaps { get; set; } = null!;
+
+            [Resolved]
+            private OsuGame? game { get; set; }
+
+            public ButtonArea(APIBeatmapSet beatmapSet)
             {
-                Enabled.Value = false;
-                TooltipText = BeatmapsetsStrings.AvailabilityDisabled;
-                return;
+                this.beatmapSet = beatmapSet;
             }
 
-            switch (downloadTracker.State.Value)
+            [BackgroundDependencyLoader]
+            private void load(OsuConfigManager config)
             {
-                case DownloadState.NotDownloaded:
-                    Action = () => beatmaps.Download(beatmapSet, preferNoVideo.Value);
-                    break;
+                RelativeSizeAxes = Axes.Y;
+                Origin = Anchor.TopRight;
+                Anchor = Anchor.TopRight;
+                Child = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Left = -BeatmapCard.CORNER_RADIUS },
+                            Child = hoverLayer = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Colour4.White.Opacity(0.1f),
+                                Blending = BlendingParameters.Additive
+                            }
+                        },
+                        downloadIcon = new SpriteIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(icon_size),
+                            Icon = FontAwesome.Solid.Download
+                        },
+                        spinner = new LoadingSpinner
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(icon_size)
+                        },
+                        goToBeatmapIcon = new SpriteIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(icon_size),
+                            Icon = FontAwesome.Solid.AngleDoubleRight
+                        },
+                    }
+                };
 
-                case DownloadState.LocallyAvailable:
-                    Action = () => game?.PresentBeatmap(beatmapSet);
-                    break;
-
-                default:
-                    Action = null;
-                    break;
+                preferNoVideo = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
             }
 
-            downloadIcon.FadeTo(downloadTracker.State.Value == DownloadState.NotDownloaded ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            spinner.FadeTo(downloadTracker.State.Value == DownloadState.Downloading || downloadTracker.State.Value == DownloadState.Importing ? 1 : 0,
-                BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            goToBeatmapIcon.FadeTo(downloadTracker.State.Value == DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-
-            if (downloadTracker.State.Value == DownloadState.NotDownloaded)
+            protected override void LoadComplete()
             {
-                if (!beatmapSet.HasVideo)
-                    TooltipText = BeatmapsetsStrings.PanelDownloadAll;
+                base.LoadComplete();
+
+                State.BindValueChanged(_ => updateState(), true);
+                FinishTransforms(true);
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateState();
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateState();
+                base.OnHoverLost(e);
+            }
+
+            private void updateState()
+            {
+                hoverLayer.FadeTo(IsHovered ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+                downloadIcon.FadeTo(State.Value == DownloadState.NotDownloaded ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+                downloadIcon.FadeColour(IsHovered ? colourProvider.Content1 : colourProvider.Light1, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+                spinner.FadeTo(State.Value == DownloadState.Downloading || State.Value == DownloadState.Importing ? 1 : 0,
+                    BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+                spinner.FadeColour(IsHovered ? colourProvider.Content1 : colourProvider.Light1, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+                goToBeatmapIcon.FadeTo(State.Value == DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+                goToBeatmapIcon.FadeColour(IsHovered ? colourProvider.Foreground1 : colourProvider.Background3, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+                switch (State.Value)
+                {
+                    case DownloadState.NotDownloaded:
+                        Action = () => beatmaps.Download(beatmapSet, preferNoVideo.Value);
+                        break;
+
+                    case DownloadState.LocallyAvailable:
+                        Action = () => game?.PresentBeatmap(beatmapSet);
+                        break;
+
+                    default:
+                        Action = null;
+                        break;
+                }
+
+                if (beatmapSet.Availability.DownloadDisabled)
+                {
+                    Enabled.Value = false;
+                    TooltipText = BeatmapsetsStrings.AvailabilityDisabled;
+                    return;
+                }
+
+                if (State.Value == DownloadState.NotDownloaded)
+                {
+                    if (!beatmapSet.HasVideo)
+                        TooltipText = BeatmapsetsStrings.PanelDownloadAll;
+                    else
+                        TooltipText = preferNoVideo.Value ? BeatmapsetsStrings.PanelDownloadNoVideo : BeatmapsetsStrings.PanelDownloadVideo;
+                }
                 else
-                    TooltipText = preferNoVideo.Value ? BeatmapsetsStrings.PanelDownloadNoVideo : BeatmapsetsStrings.PanelDownloadVideo;
-            }
-            else
-            {
-                TooltipText = default;
+                {
+                    TooltipText = default;
+                }
             }
         }
     }

From 0555d22eb8cc5edd3eaf1ab20e63d474bc75194c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 16:35:22 +0900
Subject: [PATCH 1472/2100] Add comment mentioning why hover is disabled on the
 notification type

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

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index d98c07ce1f..f2f7315e8b 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -83,6 +83,7 @@ namespace osu.Game.Database
             card.Width = Content.DrawWidth;
         }
 
+        // Disable hover so we don't have silly colour conflicts with the nested beatmap card.
         protected override bool OnHover(HoverEvent e) => false;
         protected override void OnHoverLost(HoverLostEvent e) { }
 

From 7f30354e61d6d9fa8bc931b894f5040ff6d25c4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 17:20:58 +0900
Subject: [PATCH 1473/2100] Adjust sizing slightly to remove need for
 `CollapsibleButtonContainerSlim`

---
 .../Drawables/Cards/BeatmapCardNano.cs        |   6 +-
 .../Cards/CollapsibleButtonContainerSlim.cs   | 293 ------------------
 .../Database/MissingBeatmapNotification.cs    |   4 -
 3 files changed, 3 insertions(+), 300 deletions(-)
 delete mode 100644 osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
index 29f9d7ed2c..4ab2b0c973 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
         [Cached]
         private readonly BeatmapCardContent content;
 
-        private CollapsibleButtonContainerSlim buttonContainer = null!;
+        private CollapsibleButtonContainer buttonContainer = null!;
 
         private FillFlowContainer idleBottomContent = null!;
         private BeatmapCardDownloadProgressBar downloadProgressBar = null!;
@@ -66,12 +66,12 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                     Height = height,
                     Children = new Drawable[]
                     {
-                        buttonContainer = new CollapsibleButtonContainerSlim(BeatmapSet)
+                        buttonContainer = new CollapsibleButtonContainer(BeatmapSet)
                         {
                             Width = Width,
                             FavouriteState = { BindTarget = FavouriteState },
                             ButtonsCollapsedWidth = 5,
-                            ButtonsExpandedWidth = 20,
+                            ButtonsExpandedWidth = 30,
                             Children = new Drawable[]
                             {
                                 new FillFlowContainer
diff --git a/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs b/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
deleted file mode 100644
index 151c91f4c1..0000000000
--- a/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
+++ /dev/null
@@ -1,293 +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.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.Input.Events;
-using osu.Game.Configuration;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
-using osu.Game.Resources.Localisation.Web;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Beatmaps.Drawables.Cards
-{
-    public partial class CollapsibleButtonContainerSlim : Container
-    {
-        public Bindable<bool> ShowDetails = new Bindable<bool>();
-        public Bindable<BeatmapSetFavouriteState> FavouriteState = new Bindable<BeatmapSetFavouriteState>();
-
-        private readonly BeatmapDownloadTracker downloadTracker;
-
-        private float buttonsExpandedWidth;
-
-        public float ButtonsExpandedWidth
-        {
-            get => buttonsExpandedWidth;
-            set
-            {
-                buttonsExpandedWidth = value;
-                buttonArea.Width = value;
-                if (IsLoaded)
-                    updateState();
-            }
-        }
-
-        private float buttonsCollapsedWidth;
-
-        public float ButtonsCollapsedWidth
-        {
-            get => buttonsCollapsedWidth;
-            set
-            {
-                buttonsCollapsedWidth = value;
-                if (IsLoaded)
-                    updateState();
-            }
-        }
-
-        protected override Container<Drawable> Content => mainContent;
-
-        private readonly Container background;
-
-        private readonly OsuClickableContainer buttonArea;
-
-        private readonly Container mainArea;
-        private readonly Container mainContent;
-
-        private const int icon_size = 12;
-
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
-
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
-
-        public CollapsibleButtonContainerSlim(APIBeatmapSet beatmapSet)
-        {
-            downloadTracker = new BeatmapDownloadTracker(beatmapSet);
-
-            RelativeSizeAxes = Axes.Y;
-            Masking = true;
-            CornerRadius = BeatmapCard.CORNER_RADIUS;
-
-            InternalChildren = new Drawable[]
-            {
-                downloadTracker,
-                background = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Colour4.White
-                    },
-                },
-                buttonArea = new ButtonArea(beatmapSet)
-                {
-                    Name = @"Right (button) area",
-                    State = { BindTarget = downloadTracker.State }
-                },
-                mainArea = new Container
-                {
-                    Name = @"Main content",
-                    RelativeSizeAxes = Axes.Y,
-                    CornerRadius = BeatmapCard.CORNER_RADIUS,
-                    Masking = true,
-                    Children = new Drawable[]
-                    {
-                        new BeatmapCardContentBackground(beatmapSet)
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Dimmed = { BindTarget = ShowDetails }
-                        },
-                        mainContent = new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding
-                            {
-                                Horizontal = 10,
-                                Vertical = 4
-                            },
-                        }
-                    }
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            downloadTracker.State.BindValueChanged(_ => updateState());
-            ShowDetails.BindValueChanged(_ => updateState(), true);
-            FinishTransforms(true);
-        }
-
-        private void updateState()
-        {
-            float targetWidth = Width - (ShowDetails.Value ? ButtonsExpandedWidth : ButtonsCollapsedWidth);
-
-            mainArea.ResizeWidthTo(targetWidth, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            background.FadeColour(downloadTracker.State.Value == DownloadState.LocallyAvailable ? colours.Lime0 : colourProvider.Background3, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            buttonArea.FadeTo(ShowDetails.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-        }
-
-        private partial class ButtonArea : OsuClickableContainer
-        {
-            public Bindable<DownloadState> State { get; } = new Bindable<DownloadState>();
-
-            private readonly APIBeatmapSet beatmapSet;
-
-            private Box hoverLayer = null!;
-            private SpriteIcon downloadIcon = null!;
-            private LoadingSpinner spinner = null!;
-            private SpriteIcon goToBeatmapIcon = null!;
-
-            private Bindable<bool> preferNoVideo = null!;
-
-            [Resolved]
-            private OverlayColourProvider colourProvider { get; set; } = null!;
-
-            [Resolved]
-            private BeatmapModelDownloader beatmaps { get; set; } = null!;
-
-            [Resolved]
-            private OsuGame? game { get; set; }
-
-            public ButtonArea(APIBeatmapSet beatmapSet)
-            {
-                this.beatmapSet = beatmapSet;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuConfigManager config)
-            {
-                RelativeSizeAxes = Axes.Y;
-                Origin = Anchor.TopRight;
-                Anchor = Anchor.TopRight;
-                Child = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = -BeatmapCard.CORNER_RADIUS },
-                            Child = hoverLayer = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Colour4.White.Opacity(0.1f),
-                                Blending = BlendingParameters.Additive
-                            }
-                        },
-                        downloadIcon = new SpriteIcon
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(icon_size),
-                            Icon = FontAwesome.Solid.Download
-                        },
-                        spinner = new LoadingSpinner
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(icon_size)
-                        },
-                        goToBeatmapIcon = new SpriteIcon
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(icon_size),
-                            Icon = FontAwesome.Solid.AngleDoubleRight
-                        },
-                    }
-                };
-
-                preferNoVideo = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                State.BindValueChanged(_ => updateState(), true);
-                FinishTransforms(true);
-            }
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                updateState();
-                return base.OnHover(e);
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                updateState();
-                base.OnHoverLost(e);
-            }
-
-            private void updateState()
-            {
-                hoverLayer.FadeTo(IsHovered ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-
-                downloadIcon.FadeTo(State.Value == DownloadState.NotDownloaded ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-                downloadIcon.FadeColour(IsHovered ? colourProvider.Content1 : colourProvider.Light1, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-
-                spinner.FadeTo(State.Value == DownloadState.Downloading || State.Value == DownloadState.Importing ? 1 : 0,
-                    BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-                spinner.FadeColour(IsHovered ? colourProvider.Content1 : colourProvider.Light1, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-
-                goToBeatmapIcon.FadeTo(State.Value == DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-                goToBeatmapIcon.FadeColour(IsHovered ? colourProvider.Foreground1 : colourProvider.Background3, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-
-                switch (State.Value)
-                {
-                    case DownloadState.NotDownloaded:
-                        Action = () => beatmaps.Download(beatmapSet, preferNoVideo.Value);
-                        break;
-
-                    case DownloadState.LocallyAvailable:
-                        Action = () => game?.PresentBeatmap(beatmapSet);
-                        break;
-
-                    default:
-                        Action = null;
-                        break;
-                }
-
-                if (beatmapSet.Availability.DownloadDisabled)
-                {
-                    Enabled.Value = false;
-                    TooltipText = BeatmapsetsStrings.AvailabilityDisabled;
-                    return;
-                }
-
-                if (State.Value == DownloadState.NotDownloaded)
-                {
-                    if (!beatmapSet.HasVideo)
-                        TooltipText = BeatmapsetsStrings.PanelDownloadAll;
-                    else
-                        TooltipText = preferNoVideo.Value ? BeatmapsetsStrings.PanelDownloadNoVideo : BeatmapsetsStrings.PanelDownloadVideo;
-                }
-                else
-                {
-                    TooltipText = default;
-                }
-            }
-        }
-    }
-}
diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index f2f7315e8b..bc96625ead 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -83,10 +83,6 @@ namespace osu.Game.Database
             card.Width = Content.DrawWidth;
         }
 
-        // Disable hover so we don't have silly colour conflicts with the nested beatmap card.
-        protected override bool OnHover(HoverEvent e) => false;
-        protected override void OnHoverLost(HoverLostEvent e) { }
-
         private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
         {
             if (changes?.InsertedIndices == null) return;

From 62f97a8d83a5baa59da76cdcea179b6be500360a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 10:27:24 +0200
Subject: [PATCH 1474/2100] Adjust beatmap card thumbnail dim state to match
 web better

---
 .../Drawables/Cards/BeatmapCardThumbnail.cs   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
index ad91615031..5a26a988fb 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
@@ -3,15 +3,15 @@
 
 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.Game.Beatmaps.Drawables.Cards.Buttons;
-using osu.Game.Graphics;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Framework.Graphics.UserInterface;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables.Cards
 {
@@ -25,7 +25,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             set => foreground.Padding = value;
         }
 
-        private readonly UpdateableOnlineBeatmapSetCover cover;
+        private readonly Box background;
         private readonly Container foreground;
         private readonly PlayButton playButton;
         private readonly CircularProgress progress;
@@ -33,15 +33,22 @@ namespace osu.Game.Beatmaps.Drawables.Cards
 
         protected override Container<Drawable> Content => content;
 
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
         public BeatmapCardThumbnail(APIBeatmapSet beatmapSetInfo)
         {
             InternalChildren = new Drawable[]
             {
-                cover = new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.List)
+                new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.List)
                 {
                     RelativeSizeAxes = Axes.Both,
                     OnlineInfo = beatmapSetInfo
                 },
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
                 foreground = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -68,7 +75,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load()
         {
             progress.Colour = colourProvider.Highlight1;
         }
@@ -89,7 +96,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             bool shouldDim = Dimmed.Value || playButton.Playing.Value;
 
             playButton.FadeTo(shouldDim ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            cover.FadeColour(shouldDim ? OsuColour.Gray(0.2f) : Color4.White, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            background.FadeColour(colourProvider.Background6.Opacity(shouldDim ? 0.8f : 0f), BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
         }
     }
 }

From 0593c76c57436757e7da3ada6556c683396fdbfa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 17:34:24 +0900
Subject: [PATCH 1475/2100] Fix log output using incorrect name

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

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 2875035e1b..26594fb815 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Scoring
                 catch (LegacyScoreDecoder.BeatmapNotFoundException e)
                 {
                     onMissingBeatmap(e, archive, name);
-                    Logger.Log($@"Score '{name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
+                    Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
                     return null;
                 }
             }

From f726c38215b6ff35305969b7c7e79f89a25818f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 17:41:00 +0900
Subject: [PATCH 1476/2100] Pass `ArchiveReader` instead of `Stream` to
 simplify resolution code

---
 .../TestSceneMissingBeatmapNotification.cs    |  4 +--
 .../Database/MissingBeatmapNotification.cs    | 14 ++++-----
 osu.Game/Scoring/ScoreImporter.cs             | 30 ++++---------------
 3 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs
index 23b9c5f76a..f5506edf3b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.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.IO;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -9,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Database;
 using osu.Game.Overlays;
+using osu.Game.Tests.Scores.IO;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 AutoSizeAxes = Axes.Y,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Child = new MissingBeatmapNotification(CreateAPIBeatmapSet(Ruleset.Value).Beatmaps.First(), new MemoryStream(), "deadbeef")
+                Child = new MissingBeatmapNotification(CreateAPIBeatmapSet(Ruleset.Value).Beatmaps.First(), new ImportScoreTest.TestArchiveReader(), "deadbeef")
             };
         }
     }
diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index bc96625ead..261de2a938 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -2,19 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables.Cards;
 using osu.Game.Configuration;
+using osu.Game.IO.Archives;
+using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 using Realms;
-using osu.Game.Localisation;
 
 namespace osu.Game.Database
 {
@@ -29,7 +28,7 @@ namespace osu.Game.Database
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
 
-        private readonly MemoryStream scoreStream;
+        private readonly ArchiveReader scoreArchive;
         private readonly APIBeatmapSet beatmapSetInfo;
         private readonly string beatmapHash;
 
@@ -39,12 +38,12 @@ namespace osu.Game.Database
 
         private IDisposable? realmSubscription;
 
-        public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream, string beatmapHash)
+        public MissingBeatmapNotification(APIBeatmap beatmap, ArchiveReader scoreArchive, string beatmapHash)
         {
             beatmapSetInfo = beatmap.BeatmapSet!;
 
             this.beatmapHash = beatmapHash;
-            this.scoreStream = scoreStream;
+            this.scoreArchive = scoreArchive;
         }
 
         [BackgroundDependencyLoader]
@@ -89,7 +88,8 @@ namespace osu.Game.Database
 
             if (sender.Any(s => s.Beatmaps.Any(b => b.MD5Hash == beatmapHash)))
             {
-                var importTask = new ImportTask(scoreStream, "score.osr");
+                string name = scoreArchive.Filenames.First(f => f.EndsWith(".osr", StringComparison.OrdinalIgnoreCase));
+                var importTask = new ImportTask(scoreArchive.GetStream(name), name);
                 scoreManager.Import(new[] { importTask });
                 realmSubscription?.Dispose();
                 Close(false);
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 26594fb815..b85b6a066e 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using Newtonsoft.Json;
@@ -55,36 +54,17 @@ namespace osu.Game.Scoring
                 }
                 catch (LegacyScoreDecoder.BeatmapNotFoundException e)
                 {
-                    onMissingBeatmap(e, archive, name);
                     Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
+
+                    // In the case of a missing beatmap, let's attempt to resolve it and show a prompt to the user to download the required beatmap.
+                    var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = e.Hash });
+                    req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, e.Hash));
+                    api.Queue(req);
                     return null;
                 }
             }
         }
 
-        private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e, ArchiveReader archive, string name)
-        {
-            var stream = new MemoryStream();
-
-            // stream will be closed after the exception was thrown, so fetch the stream again.
-            using (var scoreStream = archive.GetStream(name))
-            {
-                scoreStream.CopyTo(stream);
-            }
-
-            var req = new GetBeatmapRequest(new BeatmapInfo
-            {
-                MD5Hash = e.Hash
-            });
-
-            req.Success += res =>
-            {
-                PostNotification?.Invoke(new MissingBeatmapNotification(res, stream, e.Hash));
-            };
-
-            api.Queue(req);
-        }
-
         public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);
 
         protected override void Populate(ScoreInfo model, ArchiveReader? archive, Realm realm, CancellationToken cancellationToken = default)

From cdb5fea513f06bf18eefc62a8b0d4997d4c8a91d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 17:53:00 +0900
Subject: [PATCH 1477/2100] Remove unused translations

---
 .../Localisation/OnlineSettingsStrings.cs     |  5 -----
 osu.Game/Localisation/WebSettingsStrings.cs   | 19 -------------------
 2 files changed, 24 deletions(-)
 delete mode 100644 osu.Game/Localisation/WebSettingsStrings.cs

diff --git a/osu.Game/Localisation/OnlineSettingsStrings.cs b/osu.Game/Localisation/OnlineSettingsStrings.cs
index 5ea53a13bf..0660bac172 100644
--- a/osu.Game/Localisation/OnlineSettingsStrings.cs
+++ b/osu.Game/Localisation/OnlineSettingsStrings.cs
@@ -54,11 +54,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString PreferNoVideo => new TranslatableString(getKey(@"prefer_no_video"), @"Prefer downloads without video");
 
-        /// <summary>
-        /// "Automatically download beatmaps when spectating"
-        /// </summary>
-        public static LocalisableString AutomaticallyDownloadWhenSpectating => new TranslatableString(getKey(@"automatically_download_when_spectating"), @"Automatically download beatmaps when spectating");
-
         /// <summary>
         /// "Automatically download missing beatmaps"
         /// </summary>
diff --git a/osu.Game/Localisation/WebSettingsStrings.cs b/osu.Game/Localisation/WebSettingsStrings.cs
deleted file mode 100644
index b3033524dc..0000000000
--- a/osu.Game/Localisation/WebSettingsStrings.cs
+++ /dev/null
@@ -1,19 +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.Localisation;
-
-namespace osu.Game.Localisation
-{
-    public static class WebSettingsStrings
-    {
-        private const string prefix = @"osu.Game.Resources.Localisation.WebSettings";
-
-        /// <summary>
-        /// "Automatically download missing beatmaps"
-        /// </summary>
-        public static LocalisableString AutomaticallyDownloadMissingBeatmaps => new TranslatableString(getKey(@"automatically_download_missing_beatmaps"), @"Automatically download missing beatmaps");
-
-        private static string getKey(string key) => $@"{prefix}:{key}";
-    }
-}
\ No newline at end of file

From 05e05f8160a73dd9f270147874ba0632897d2670 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 18:02:08 +0900
Subject: [PATCH 1478/2100] Increase transition speed slightly

---
 osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
index a16f6d5689..25e42bcbf7 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
 {
     public abstract partial class BeatmapCard : OsuClickableContainer, IHasContextMenu
     {
-        public const float TRANSITION_DURATION = 400;
+        public const float TRANSITION_DURATION = 340;
         public const float CORNER_RADIUS = 10;
 
         protected const float WIDTH = 430;

From ed9039f60f31415089be387e9075e6439099ee58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 11:09:23 +0200
Subject: [PATCH 1479/2100] Fix notification text sets overwriting each other

---
 .../Database/MissingBeatmapNotification.cs     | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 261de2a938..584b2675f3 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -52,14 +52,6 @@ namespace osu.Game.Database
             realmSubscription = realm.RegisterForNotifications(
                 realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
 
-            realm.Run(r =>
-            {
-                if (r.All<BeatmapSetInfo>().Any(s => !s.DeletePending && s.OnlineID == beatmapSetInfo.OnlineID))
-                {
-                    Text = NotificationsStrings.MismatchingBeatmapForReplay;
-                }
-            });
-
             autoDownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadMissingBeatmaps);
             noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
@@ -71,9 +63,15 @@ namespace osu.Game.Database
             base.LoadComplete();
 
             if (autoDownloadConfig.Value)
+            {
+                Text = NotificationsStrings.DownloadingBeatmapForReplay;
                 beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
-
-            Text = autoDownloadConfig.Value ? NotificationsStrings.DownloadingBeatmapForReplay : NotificationsStrings.MissingBeatmapForReplay;
+            }
+            else
+            {
+                bool missingSetMatchesExistingOnlineId = realm.Run(r => r.All<BeatmapSetInfo>().Any(s => !s.DeletePending && s.OnlineID == beatmapSetInfo.OnlineID));
+                Text = missingSetMatchesExistingOnlineId ? NotificationsStrings.MismatchingBeatmapForReplay : NotificationsStrings.MissingBeatmapForReplay;
+            }
         }
 
         protected override void Update()

From 773ec469898c9d616c2211723ebb3a9742dc76c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Sep 2023 23:59:44 +0900
Subject: [PATCH 1480/2100] Expose some storyboard pieces to allow better
 testability

---
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs      | 4 +++-
 osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs | 5 ++++-
 osu.Game/Storyboards/Storyboard.cs                        | 2 +-
 osu.Game/Storyboards/StoryboardVideo.cs                   | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 6931cea81e..a11251ed22 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -23,7 +23,9 @@ namespace osu.Game.Storyboards.Drawables
 {
     public partial class DrawableStoryboard : Container<DrawableStoryboardLayer>
     {
-        [Cached]
+        public Vector2 AppliedScale { get; private set; }
+
+        [Cached(typeof(Storyboard))]
         public Storyboard Storyboard { get; }
 
         /// <summary>
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
index 38e7ff1c70..40842fe7ed 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.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.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -30,10 +31,12 @@ namespace osu.Game.Storyboards.Drawables
             InternalChild = ElementContainer = new LayerElementContainer(layer);
         }
 
-        protected partial class LayerElementContainer : LifetimeManagementContainer
+        public partial class LayerElementContainer : LifetimeManagementContainer
         {
             private readonly StoryboardLayer storyboardLayer;
 
+            public IEnumerable<Drawable> Elements => InternalChildren;
+
             public LayerElementContainer(StoryboardLayer layer)
             {
                 storyboardLayer = layer;
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 1892855d3d..03e30d6272 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Storyboards
             }
         }
 
-        public DrawableStoryboard CreateDrawable(IReadOnlyList<Mod>? mods = null) =>
+        public virtual DrawableStoryboard CreateDrawable(IReadOnlyList<Mod>? mods = null) =>
             new DrawableStoryboard(this, mods);
 
         private static readonly string[] image_extensions = { @".png", @".jpg" };
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
index 4652e45852..8c11e19a06 100644
--- a/osu.Game/Storyboards/StoryboardVideo.cs
+++ b/osu.Game/Storyboards/StoryboardVideo.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
-        public StoryboardVideo(string path, int offset)
+        public StoryboardVideo(string path, double offset)
         {
             Path = path;
             StartTime = offset;

From 2f020f8682aece5fcf4b54f879c4492149485ff6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 19:44:41 +0900
Subject: [PATCH 1481/2100] Add test coverage of storyboard preferring skin
 when specified

---
 .../TestSceneDrawableStoryboardSprite.cs      | 176 +++++++++++++++---
 1 file changed, 150 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
index ec4bb1a86b..d20c7c2f7a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
@@ -2,17 +2,23 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Storyboards;
 using osu.Game.Storyboards.Drawables;
+using osu.Game.Tests.Resources;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -21,17 +27,21 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
-        [Cached]
-        private Storyboard storyboard { get; set; } = new Storyboard();
+        [Cached(typeof(Storyboard))]
+        private TestStoryboard storyboard { get; set; } = new TestStoryboard();
 
         private IEnumerable<DrawableStoryboardSprite> sprites => this.ChildrenOfType<DrawableStoryboardSprite>();
 
+        private const string lookup_name = "hitcircleoverlay";
+
         [Test]
         public void TestSkinSpriteDisallowedByDefault()
         {
-            const string lookup_name = "hitcircleoverlay";
-
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = false);
+            AddStep("disallow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = false;
+                storyboard.AlwaysProvideTexture = false;
+            });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
 
@@ -40,11 +50,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestAllowLookupFromSkin()
+        public void TestLookupFromStoryboard()
         {
-            const string lookup_name = "hitcircleoverlay";
-
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
+            AddStep("allow storyboard lookup", () =>
+            {
+                storyboard.UseSkinSprites = false;
+                storyboard.AlwaysProvideTexture = true;
+            });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
 
@@ -52,16 +64,54 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("sprite found texture", () =>
                 sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Texture != null)));
 
-            AddAssert("skinnable sprite has correct size", () =>
-                sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Size == new Vector2(128))));
+            assertStoryboardSourced();
+        }
+
+        [Test]
+        public void TestSkinLookupPreferredOverStoryboard()
+        {
+            AddStep("allow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = true;
+            });
+
+            AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
+
+            // Only checking for at least one sprite that succeeded, as not all skins in this test provide the hitcircleoverlay texture.
+            AddAssert("sprite found texture", () =>
+                sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Texture != null)));
+
+            assertSkinSourced();
+        }
+
+        [Test]
+        public void TestAllowLookupFromSkin()
+        {
+            AddStep("allow skin lookup", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = false;
+            });
+
+            AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
+
+            // Only checking for at least one sprite that succeeded, as not all skins in this test provide the hitcircleoverlay texture.
+            AddAssert("sprite found texture", () =>
+                sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Texture != null)));
+
+            assertSkinSourced();
         }
 
         [Test]
         public void TestFlippedSprite()
         {
-            const string lookup_name = "hitcircleoverlay";
+            AddStep("allow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = true;
+            });
 
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
             AddStep("flip sprites", () => sprites.ForEach(s =>
             {
@@ -74,9 +124,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestZeroScale()
         {
-            const string lookup_name = "hitcircleoverlay";
+            AddStep("allow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = true;
+            });
 
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
             AddAssert("sprites present", () => sprites.All(s => s.IsPresent));
             AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(0, 1)));
@@ -86,9 +139,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestNegativeScale()
         {
-            const string lookup_name = "hitcircleoverlay";
+            AddStep("allow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = true;
+            });
 
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
             AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(-1)));
             AddAssert("origin flipped", () => sprites.All(s => s.Origin == Anchor.BottomRight));
@@ -97,9 +153,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestNegativeScaleWithFlippedSprite()
         {
-            const string lookup_name = "hitcircleoverlay";
+            AddStep("allow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = true;
+            });
 
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
             AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(-1)));
             AddAssert("origin flipped", () => sprites.All(s => s.Origin == Anchor.BottomRight));
@@ -111,13 +170,78 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("origin back", () => sprites.All(s => s.Origin == Anchor.TopLeft));
         }
 
-        private DrawableStoryboardSprite createSprite(string lookupName, Anchor origin, Vector2 initialPosition)
-            => new DrawableStoryboardSprite(
-                new StoryboardSprite(lookupName, origin, initialPosition)
-            ).With(s =>
+        private DrawableStoryboard createSprite(string lookupName, Anchor origin, Vector2 initialPosition)
+        {
+            var layer = storyboard.GetLayer("Background");
+
+            var sprite = new StoryboardSprite(lookupName, origin, initialPosition);
+            sprite.AddLoop(Time.Current, 100).Alpha.Add(Easing.None, 0, 10000, 1, 1);
+
+            layer.Elements.Clear();
+            layer.Add(sprite);
+
+            return storyboard.CreateDrawable();
+        }
+
+        private void assertStoryboardSourced()
+        {
+            AddAssert("sprite came from storyboard", () =>
+                sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Size == new Vector2(200))));
+        }
+
+        private void assertSkinSourced()
+        {
+            AddAssert("sprite came from skin", () =>
+                sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Size == new Vector2(128))));
+        }
+
+        private partial class TestStoryboard : Storyboard
+        {
+            public override DrawableStoryboard CreateDrawable(IReadOnlyList<Mod>? mods = null)
             {
-                s.LifetimeStart = double.MinValue;
-                s.LifetimeEnd = double.MaxValue;
-            });
+                return new TestDrawableStoryboard(this, mods);
+            }
+
+            public bool AlwaysProvideTexture { get; set; }
+
+            public override string GetStoragePathFromStoryboardPath(string path) => AlwaysProvideTexture ? path : string.Empty;
+
+            private partial class TestDrawableStoryboard : DrawableStoryboard
+            {
+                private readonly bool alwaysProvideTexture;
+
+                public TestDrawableStoryboard(TestStoryboard storyboard, IReadOnlyList<Mod>? mods)
+                    : base(storyboard, mods)
+                {
+                    alwaysProvideTexture = storyboard.AlwaysProvideTexture;
+                }
+
+                protected override IResourceStore<byte[]> CreateResourceLookupStore() => alwaysProvideTexture
+                    ? new AlwaysReturnsTextureStore()
+                    : new ResourceStore<byte[]>();
+
+                internal class AlwaysReturnsTextureStore : IResourceStore<byte[]>
+                {
+                    private const string test_image = "Resources/Textures/test-image.png";
+
+                    private readonly DllResourceStore store;
+
+                    public AlwaysReturnsTextureStore()
+                    {
+                        store = TestResources.GetStore();
+                    }
+
+                    public void Dispose() => store.Dispose();
+
+                    public byte[] Get(string name) => store.Get(test_image);
+
+                    public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken()) => store.GetAsync(test_image, cancellationToken);
+
+                    public Stream GetStream(string name) => store.GetStream(test_image);
+
+                    public IEnumerable<string> GetAvailableResources() => store.GetAvailableResources();
+                }
+            }
+        }
     }
 }

From 4a7dc4d7927aaba2b1f527e6b2939fa179189535 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 19:13:58 +0900
Subject: [PATCH 1482/2100] Fix storyboard `UseSkinSprites` being implemented
 incorrectly

This was implemented as a "fallback", but it's actually intended to be
an "override". As in it allows storyboarders to *prefer* a skin sprite
before falling back to a local version contained within the storyboard.

Can be tested with https://osu.ppy.sh/beatmapsets/832364#osu/1743837.

Closes https://github.com/ppy/osu/issues/24813.
---
 .../Drawables/DrawableStoryboardSprite.cs     | 23 ++++++++++++-------
 osu.Game/Storyboards/Storyboard.cs            |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 379de1a497..14132654d1 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
@@ -74,6 +75,15 @@ namespace osu.Game.Storyboards.Drawables
         public override bool IsPresent
             => !float.IsNaN(DrawPosition.X) && !float.IsNaN(DrawPosition.Y) && base.IsPresent;
 
+        [Resolved]
+        private ISkinSource skin { get; set; } = null!;
+
+        [Resolved]
+        private Storyboard storyboard { get; set; } = null!;
+
+        [Resolved]
+        private TextureStore textureStore { get; set; } = null!;
+
         public DrawableStoryboardSprite(StoryboardSprite sprite)
         {
             Sprite = sprite;
@@ -84,24 +94,21 @@ namespace osu.Game.Storyboards.Drawables
             LifetimeEnd = sprite.EndTimeForDisplay;
         }
 
-        [Resolved]
-        private ISkinSource skin { get; set; } = null!;
-
         [BackgroundDependencyLoader]
-        private void load(TextureStore textureStore, Storyboard storyboard)
+        private void load()
         {
-            Texture = textureStore.Get(Sprite.Path);
-
-            if (Texture == null && storyboard.UseSkinSprites)
+            if (storyboard.UseSkinSprites)
             {
                 skin.SourceChanged += skinSourceChanged;
                 skinSourceChanged();
             }
+            else
+                Texture = textureStore.Get(Sprite.Path);
 
             Sprite.ApplyTransforms(this);
         }
 
-        private void skinSourceChanged() => Texture = skin.GetTexture(Sprite.Path);
+        private void skinSourceChanged() => Texture = skin.GetTexture(Sprite.Path) ?? textureStore.Get(Sprite.Path);
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 03e30d6272..21342831b0 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Storyboards
         public BeatmapInfo BeatmapInfo = new BeatmapInfo();
 
         /// <summary>
-        /// Whether the storyboard can fall back to skin sprites in case no matching storyboard sprites are found.
+        /// Whether the storyboard should prefer textures from the current skin before using local storyboard textures.
         /// </summary>
         public bool UseSkinSprites { get; set; }
 

From 320a9fc17169c81b082c42d16fb750b9fc7e6026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 13:47:46 +0200
Subject: [PATCH 1483/2100] Replace test with better test

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 29 +++++++++++--------
 osu.Game.Tests/Resources/invalid-bank.osu     | 18 ++++++++----
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 6fe9c902bb..1ba63f4037 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -622,7 +622,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         }
 
         [Test]
-        public void TestInvalidBankDefaultsToNone()
+        public void TestInvalidBankDefaultsToNormal()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
@@ -631,20 +631,25 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[0].Samples[0].Bank);
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[0].Samples[1].Bank);
+                assertObjectHasBanks(hitObjects[0], HitSampleInfo.BANK_DRUM);
+                assertObjectHasBanks(hitObjects[1], HitSampleInfo.BANK_NORMAL);
+                assertObjectHasBanks(hitObjects[2], HitSampleInfo.BANK_SOFT);
+                assertObjectHasBanks(hitObjects[3], HitSampleInfo.BANK_DRUM);
+                assertObjectHasBanks(hitObjects[4], HitSampleInfo.BANK_NORMAL);
 
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[1].Samples[0].Bank);
-                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[1].Samples[1].Bank);
+                assertObjectHasBanks(hitObjects[5], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_DRUM);
+                assertObjectHasBanks(hitObjects[6], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_NORMAL);
+                assertObjectHasBanks(hitObjects[7], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_SOFT);
+                assertObjectHasBanks(hitObjects[8], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_DRUM);
+                assertObjectHasBanks(hitObjects[9], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_NORMAL);
+            }
 
-                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[2].Samples[0].Bank);
-                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[2].Samples[1].Bank);
+            void assertObjectHasBanks(HitObject hitObject, string normalBank, string? additionsBank = null)
+            {
+                Assert.AreEqual(normalBank, hitObject.Samples[0].Bank);
 
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[3].Samples[0].Bank);
-                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[3].Samples[1].Bank);
-
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[4].Samples[0].Bank);
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[4].Samples[1].Bank);
+                if (additionsBank != null)
+                    Assert.AreEqual(additionsBank, hitObject.Samples[1].Bank);
             }
         }
 
diff --git a/osu.Game.Tests/Resources/invalid-bank.osu b/osu.Game.Tests/Resources/invalid-bank.osu
index fb54a61fd3..8c554cc17f 100644
--- a/osu.Game.Tests/Resources/invalid-bank.osu
+++ b/osu.Game.Tests/Resources/invalid-bank.osu
@@ -3,9 +3,17 @@ osu file format v14
 [General]
 SampleSet: Normal
 
+[TimingPoints]
+0,500,4,3,0,100,1,0
+
 [HitObjects]
-256,192,1000,1,8,0:0:0:0:
-256,192,2000,1,8,1:2:0:0:
-256,192,3000,1,8,2:62:0:0:
-256,192,4000,1,8,41:2:0:0:
-256,192,5000,1,8,41:62:0:0:
+256,192,1000,5,0,0:0:0:0:
+256,192,2000,1,0,1:0:0:0:
+256,192,3000,1,0,2:0:0:0:
+256,192,4000,1,0,3:0:0:0:
+256,192,5000,1,0,42:0:0:0:
+256,192,6000,5,4,0:0:0:0:
+256,192,7000,1,4,0:1:0:0:
+256,192,8000,1,4,0:2:0:0:
+256,192,9000,1,4,0:3:0:0:
+256,192,10000,1,4,0:42:0:0:

From c4a0ca326ed5e02a9219dee579cb9a01c554960b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 13:53:49 +0200
Subject: [PATCH 1484/2100] Replace sample bank fix with more correct fix

stable does not treat unknown enum members as `None` / `Auto`, it treats
them as `Normal`:

    switch (sampleSet)
    {
        case SampleSet.Normal:
        default:
            sample = 0;
            break;
        case SampleSet.None:
        case SampleSet.Soft:
            sample = 1;
            break;
        case SampleSet.Drum:
            sample = 2;
            break;
    }

    (from https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/Audio/AudioEngine.cs#L1158-L1171).
---
 .../Rulesets/Objects/Legacy/ConvertHitObjectParser.cs    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 339e9bb5bc..d20f2d31bb 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -190,13 +190,18 @@ namespace osu.Game.Rulesets.Objects.Legacy
             string[] split = str.Split(':');
 
             var bank = (LegacySampleBank)Parsing.ParseInt(split[0]);
+            if (!Enum.IsDefined(bank))
+                bank = LegacySampleBank.Normal;
+
             var addBank = (LegacySampleBank)Parsing.ParseInt(split[1]);
+            if (!Enum.IsDefined(addBank))
+                addBank = LegacySampleBank.Normal;
 
             string stringBank = bank.ToString().ToLowerInvariant();
-            if (stringBank == @"none" || !Enum.IsDefined(bank))
+            if (stringBank == @"none")
                 stringBank = null;
             string stringAddBank = addBank.ToString().ToLowerInvariant();
-            if (stringAddBank == @"none" || !Enum.IsDefined(addBank))
+            if (stringAddBank == @"none")
                 stringAddBank = null;
 
             bankInfo.BankForNormal = stringBank;

From ba518e1da8442d8aaf17a235d227a394f077689e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 20:11:16 +0200
Subject: [PATCH 1485/2100] Fix `StoryboardResourceLookupStore` dying on
 failure to unmap path

Before the introduction of `StoryboardResourceLookupStore`, missing
files would softly fail by use of null fallbacks. After the
aforementioned class was added, however, the fallbacks would not work
anymore if for whatever reason `GetStoragePathFromStoryboardPath()`
failed to unmap the storyboard asset name to a storage path.
---
 .../Drawables/DrawableStoryboard.cs           | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 6931cea81e..c2a58d46ef 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -142,14 +142,32 @@ namespace osu.Game.Storyboards.Drawables
             public void Dispose() =>
                 realmFileStore.Dispose();
 
-            public byte[] Get(string name) =>
-                realmFileStore.Get(storyboard.GetStoragePathFromStoryboardPath(name));
+            public byte[] Get(string name)
+            {
+                string? storagePath = storyboard.GetStoragePathFromStoryboardPath(name);
 
-            public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken()) =>
-                realmFileStore.GetAsync(storyboard.GetStoragePathFromStoryboardPath(name), cancellationToken);
+                return string.IsNullOrEmpty(storagePath)
+                    ? null!
+                    : realmFileStore.Get(storagePath);
+            }
 
-            public Stream GetStream(string name) =>
-                realmFileStore.GetStream(storyboard.GetStoragePathFromStoryboardPath(name));
+            public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken())
+            {
+                string? storagePath = storyboard.GetStoragePathFromStoryboardPath(name);
+
+                return string.IsNullOrEmpty(storagePath)
+                    ? Task.FromResult<byte[]>(null!)
+                    : realmFileStore.GetAsync(storagePath, cancellationToken);
+            }
+
+            public Stream? GetStream(string name)
+            {
+                string? storagePath = storyboard.GetStoragePathFromStoryboardPath(name);
+
+                return string.IsNullOrEmpty(storagePath)
+                    ? null
+                    : realmFileStore.GetStream(storagePath);
+            }
 
             public IEnumerable<string> GetAvailableResources() =>
                 realmFileStore.GetAvailableResources();

From 641e651bf282aeeb11050756e63e3a98cc136bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 20:18:33 +0200
Subject: [PATCH 1486/2100] Fix `DrawableStoryboardVideo` attempting to unmap
 path once too much

The `StoryboardResourceLookupStore` cached at storyboard level is
supposed to already be handling that; no need for local logic anymore.
---
 osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index eec2cd6a60..9a5db4bb39 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -29,12 +29,7 @@ namespace osu.Game.Storyboards.Drawables
         [BackgroundDependencyLoader(true)]
         private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            string? path = beatmap.Value.BeatmapSetInfo?.GetPathForFile(Video.Path);
-
-            if (path == null)
-                return;
-
-            var stream = textureStore.GetStream(path);
+            var stream = textureStore.GetStream(Video.Path);
 
             if (stream == null)
                 return;

From 333b839e0d7b859aa677a6a27163cb894c7d5563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 21:37:44 +0200
Subject: [PATCH 1487/2100] Fix broken automatic beatmap download setting
 migration

---
 osu.Game/Configuration/OsuConfigManager.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index b5253d3500..db71ff4e84 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -64,6 +64,12 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.Username, string.Empty);
             SetDefault(OsuSetting.Token, string.Empty);
 
+#pragma warning disable CS0618 // Type or member is obsolete
+            // this default set MUST remain despite the setting being deprecated, because `SetDefault()` calls are implicitly used to declare the type returned for the lookup.
+            // if this is removed, the setting will be interpreted as a string, and `Migrate()` will fail due to cast failure.
+            // can be removed 20240618
+            SetDefault(OsuSetting.AutomaticallyDownloadWhenSpectating, false);
+#pragma warning restore CS0618 // Type or member is obsolete
             SetDefault(OsuSetting.AutomaticallyDownloadMissingBeatmaps, false);
 
             SetDefault(OsuSetting.SavePassword, false).ValueChanged += enabled =>
@@ -218,7 +224,7 @@ namespace osu.Game.Configuration
             if (combined < 20230918)
             {
 #pragma warning disable CS0618 // Type or member is obsolete
-                SetValue(OsuSetting.AutomaticallyDownloadMissingBeatmaps, Get<OsuSetting>(OsuSetting.AutomaticallyDownloadWhenSpectating)); // can be removed 20240618
+                SetValue(OsuSetting.AutomaticallyDownloadMissingBeatmaps, Get<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating)); // can be removed 20240618
 #pragma warning restore CS0618 // Type or member is obsolete
             }
         }

From 8e16b1d50784e62123d4ab308985b186e3c4ecb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 12:48:15 +0900
Subject: [PATCH 1488/2100] Simplify some maximum size specs

---
 .../Skinning/Legacy/LegacyFruitPiece.cs             | 13 +++++++++----
 .../HitCircles/Components/HitCircleOverlapMarker.cs |  2 +-
 .../HitCircles/Components/HitCirclePiece.cs         |  2 +-
 .../Objects/Drawables/DrawableHitCircle.cs          |  2 +-
 .../Objects/Drawables/DrawableSliderBall.cs         |  2 +-
 .../Objects/Drawables/DrawableSliderRepeat.cs       |  2 +-
 .../Objects/Drawables/DrawableSliderTail.cs         |  2 +-
 .../Objects/Drawables/DrawableSliderTick.cs         |  2 +-
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs       |  5 +++++
 .../Skinning/Argon/ArgonMainCirclePiece.cs          |  2 +-
 .../Skinning/Argon/ArgonReverseArrow.cs             |  2 +-
 .../Skinning/Default/CirclePiece.cs                 |  3 +--
 .../Skinning/Default/ExplodePiece.cs                |  3 +--
 .../Skinning/Default/FlashPiece.cs                  |  3 +--
 .../Skinning/Default/MainCirclePiece.cs             |  3 +--
 .../Skinning/Default/ReverseArrowPiece.cs           |  2 +-
 osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs |  3 +--
 .../Skinning/Legacy/LegacyApproachCircle.cs         |  2 +-
 .../Skinning/Legacy/LegacyMainCirclePiece.cs        |  9 +++------
 .../Skinning/Legacy/LegacyReverseArrow.cs           |  3 +--
 .../Skinning/Legacy/LegacySliderBall.cs             |  5 ++---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs     |  4 ++--
 .../UI/Cursor/CursorRippleVisualiser.cs             |  2 +-
 23 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index eacda1dc64..62097d79bd 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -26,21 +26,26 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             switch (visualRepresentation)
             {
                 case FruitVisualRepresentation.Pear:
-                    SetTexture(Skin.GetTexture("fruit-pear")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-pear-overlay")?.WithMaximumSize(fruit_max_size));
+                    setTextures("pear");
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    SetTexture(Skin.GetTexture("fruit-grapes")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-grapes-overlay")?.WithMaximumSize(fruit_max_size));
+                    setTextures("grapes");
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    SetTexture(Skin.GetTexture("fruit-apple")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-apple-overlay")?.WithMaximumSize(fruit_max_size));
+                    setTextures("apple");
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    SetTexture(Skin.GetTexture("fruit-orange")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-orange-overlay")?.WithMaximumSize(fruit_max_size));
+                    setTextures("orange");
                     break;
             }
+
+            void setTextures(string fruitName) => SetTexture(
+                Skin.GetTexture($"fruit-{fruitName}")?.WithMaximumSize(fruit_max_size),
+                Skin.GetTexture($"fruit-{fruitName}-overlay")?.WithMaximumSize(fruit_max_size)
+            );
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs
index e5cc8595d1..3cba0610a1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
         {
             Origin = Anchor.Centre;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             InternalChild = content = new Container
             {
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 670e98ca50..c585f09b00 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
         {
             Origin = Anchor.Centre;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             CornerRadius = Size.X / 2;
             CornerExponent = 2;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 3458069dd1..999979c491 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             public HitReceptor()
             {
-                Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+                Size = OsuHitObject.OBJECT_DIMENSIONS;
 
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index d06fb5b4de..47214f1e53 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Origin = Anchor.Centre;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Children = new[]
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index fc4863f164..5721328057 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private void load()
         {
             Origin = Anchor.Centre;
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             AddInternal(scaleContainer = new Container
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index d9501f7d58..9fbc97c484 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private void load()
         {
             Origin = Anchor.Centre;
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             AddRangeInternal(new Drawable[]
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 6d0ae93e62..a947580d2f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
             Origin = Anchor.Centre;
 
             AddInternal(scaleContainer = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.SliderScorePoint), _ => new CircularContainer
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index fd5741698a..0bdbfaa760 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -21,6 +21,11 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public const float OBJECT_RADIUS = 64;
 
+        /// <summary>
+        /// The width and height any element participating in display of a hitcircle (or similarly sized object) should be.
+        /// </summary>
+        public static readonly Vector2 OBJECT_DIMENSIONS = new Vector2(OBJECT_RADIUS * 2);
+
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second (ie. the speed slider balls move through their track).
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index 3427031dc8..7508a689d2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
         private Bindable<bool> configHitLighting = null!;
 
-        private static readonly Vector2 circle_size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+        private static readonly Vector2 circle_size = OsuHitObject.OBJECT_DIMENSIONS;
 
         [Resolved]
         private DrawableHitObject drawableObject { get; set; } = null!;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index f93e26b2ca..67fc1b2304 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             InternalChildren = new Drawable[]
             {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
index f4761e0ea8..65a7b1328b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
@@ -22,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public CirclePiece()
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
             Masking = true;
 
             CornerRadius = Size.X / 2;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
index 91bf75617a..7beb16f7d7 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
@@ -20,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public ExplodePiece()
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
index 789137117e..86087ac50d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
@@ -13,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
     {
         public FlashPiece()
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
index 20fa4e5342..bcea33f63c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
@@ -25,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public MainCirclePiece()
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
index 3fe7872ff7..27868db2f6 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Child = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow), _ => new SpriteIcon
             {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
index 46d48f62e7..c3bbd89ab6 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
@@ -14,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
     {
         public RingPiece(float thickness = 9)
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
index cdc61ebd9b..403a14214e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private DrawableHitObject drawableObject { get; set; } = null!;
 
         public LegacyApproachCircle()
-            : base("Gameplay/osu/approachcircle", new Vector2(OsuHitObject.OBJECT_RADIUS * 2))
+            : base("Gameplay/osu/approachcircle", OsuHitObject.OBJECT_DIMENSIONS)
         {
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 18010cdb2c..8990204931 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -14,15 +14,12 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public partial class LegacyMainCirclePiece : CompositeDrawable
     {
-        private static readonly Vector2 circle_piece_size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
-
         public override bool RemoveCompletedTransforms => false;
 
         /// <summary>
@@ -53,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             this.priorityLookupPrefix = priorityLookupPrefix;
             this.hasNumber = hasNumber;
 
-            Size = circle_piece_size;
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
         }
 
         [BackgroundDependencyLoader]
@@ -70,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(circle_piece_size) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -79,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: circle_piece_size))
+                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: OsuHitObject.OBJECT_DIMENSIONS))
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 293df6b3a0..3a80607522 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -37,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
 
-            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2)) ?? Empty());
+            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty());
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 145a8a50af..c3beb5bc35 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -48,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(new Vector2(OsuHitObject.OBJECT_RADIUS * 2)),
+                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS),
                     Colour = new Color4(5, 5, 5, 255),
                 },
                 LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
@@ -60,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(new Vector2(OsuHitObject.OBJECT_RADIUS * 2)),
+                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS),
                     Blending = BlendingParameters.Additive,
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 2564dbf335..ea6f6fe6ce 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return null;
 
                     case OsuSkinComponents.SliderBall:
-                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2));
+                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: OsuHitObject.OBJECT_DIMENSIONS);
 
                         // todo: slider ball has a custom frame delay based on velocity
                         // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         if (!this.HasFont(LegacyFont.HitCircle))
                             return null;
 
-                        return new LegacySpriteText(LegacyFont.HitCircle, new Vector2(OsuHitObject.OBJECT_RADIUS * 2))
+                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS)
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
                             Scale = new Vector2(0.8f),
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
index 076d97d06a..52486b701a 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 {
                     new RingPiece(3)
                     {
-                        Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2),
+                        Size = OsuHitObject.OBJECT_DIMENSIONS,
                         Alpha = 0.1f,
                     }
                 };

From 50adb5f7a7991dcfd84eba98bb28155b65e32175 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 12:54:28 +0900
Subject: [PATCH 1489/2100] Remove incorrectly merge conflict resolved

---
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index a11251ed22..352246c533 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Storyboards.Drawables
 {
     public partial class DrawableStoryboard : Container<DrawableStoryboardLayer>
     {
-        public Vector2 AppliedScale { get; private set; }
-
         [Cached(typeof(Storyboard))]
         public Storyboard Storyboard { get; }
 

From b5e64d933c9d09196c0553d548e5dde0bbec8ed2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 12:54:36 +0900
Subject: [PATCH 1490/2100] Apply same fix to `DrawableStoryboardAnimation`

---
 .../Drawables/DrawableStoryboardAnimation.cs  | 43 ++++++++++++-------
 .../Drawables/DrawableStoryboardSprite.cs     |  6 +--
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 054a50456b..33f7a3c6f2 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -94,25 +94,19 @@ namespace osu.Game.Storyboards.Drawables
         [Resolved]
         private IBeatSyncProvider beatSyncProvider { get; set; }
 
+        [Resolved]
+        private TextureStore textureStore { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(TextureStore textureStore, Storyboard storyboard)
+        private void load(Storyboard storyboard)
         {
-            int frameIndex = 0;
-
-            Texture frameTexture = textureStore.Get(getFramePath(frameIndex));
-
-            if (frameTexture != null)
+            if (storyboard.UseSkinSprites)
             {
-                // sourcing from storyboard.
-                for (frameIndex = 0; frameIndex < Animation.FrameCount; frameIndex++)
-                    AddFrame(textureStore.Get(getFramePath(frameIndex)), Animation.FrameDelay);
-            }
-            else if (storyboard.UseSkinSprites)
-            {
-                // fallback to skin if required.
                 skin.SourceChanged += skinSourceChanged;
                 skinSourceChanged();
             }
+            else
+                addFramesFromStoryboardSource();
 
             Animation.ApplyTransforms(this);
         }
@@ -135,11 +129,28 @@ namespace osu.Game.Storyboards.Drawables
 
             // When reading from a skin, we match stables weird behaviour where `FrameCount` is ignored
             // and resources are retrieved until the end of the animation.
-            foreach (var texture in skin.GetTextures(Path.GetFileNameWithoutExtension(Animation.Path)!, default, default, true, string.Empty, out _))
-                AddFrame(texture, Animation.FrameDelay);
+            var skinTextures = skin.GetTextures(Path.GetFileNameWithoutExtension(Animation.Path)!, default, default, true, string.Empty, out _);
+
+            if (skinTextures.Length > 0)
+            {
+                foreach (var texture in skinTextures)
+                    AddFrame(texture, Animation.FrameDelay);
+            }
+            else
+            {
+                addFramesFromStoryboardSource();
+            }
         }
 
-        private string getFramePath(int i) => Animation.Path.Replace(".", $"{i}.");
+        private void addFramesFromStoryboardSource()
+        {
+            int frameIndex;
+            // sourcing from storyboard.
+            for (frameIndex = 0; frameIndex < Animation.FrameCount; frameIndex++)
+                AddFrame(textureStore.Get(getFramePath(frameIndex)), Animation.FrameDelay);
+
+            string getFramePath(int i) => Animation.Path.Replace(".", $"{i}.");
+        }
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 14132654d1..ad344b6bd4 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
@@ -78,9 +77,6 @@ namespace osu.Game.Storyboards.Drawables
         [Resolved]
         private ISkinSource skin { get; set; } = null!;
 
-        [Resolved]
-        private Storyboard storyboard { get; set; } = null!;
-
         [Resolved]
         private TextureStore textureStore { get; set; } = null!;
 
@@ -95,7 +91,7 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(Storyboard storyboard)
         {
             if (storyboard.UseSkinSprites)
             {

From bd66285bd47859569618a26eebbf2563d65d9f93 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 12:59:40 +0900
Subject: [PATCH 1491/2100] Rename parameter on `LegacySpriteText` to better
 imply the maximum size is per glyph

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

diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index f021a99102..7eb92126fa 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Skinning
     public sealed partial class LegacySpriteText : OsuSpriteText
     {
         private readonly LegacyFont font;
-        private readonly Vector2? maxSize;
+        private readonly Vector2? maxSizePerGlyph;
 
         private LegacyGlyphStore glyphStore = null!;
 
@@ -21,10 +21,10 @@ namespace osu.Game.Skinning
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(LegacyFont font, Vector2? maxSize = null)
+        public LegacySpriteText(LegacyFont font, Vector2? maxSizePerGlyph = null)
         {
             this.font = font;
-            this.maxSize = maxSize;
+            this.maxSizePerGlyph = maxSizePerGlyph;
 
             Shadow = false;
             UseFullGlyphHeight = false;
@@ -36,7 +36,7 @@ namespace osu.Game.Skinning
             Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
 
-            glyphStore = new LegacyGlyphStore(skin, maxSize);
+            glyphStore = new LegacyGlyphStore(skin, maxSizePerGlyph);
         }
 
         protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);

From 1316403180f1f4f095e71e205221eead5a481912 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 13:02:40 +0900
Subject: [PATCH 1492/2100] Fix inspection in new test scene

---
 .../Visual/Gameplay/TestSceneGameplayElementDimensions.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
index 20e6e5658c..ff7cf2a124 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 return texture;
             }
 
-            public ISkin? FindProvider(Func<ISkin, bool> lookupFunction) => this;
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => this;
             public IEnumerable<ISkin> AllSources => new[] { this };
         }
     }

From 71ac5cfc792a2aec35720e08f6d02d87e69995be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 14:14:37 +0900
Subject: [PATCH 1493/2100] Don't bother binding to friends changes for score
 display purposes

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 502303e80c..7471955493 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -13,7 +13,6 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
@@ -110,7 +109,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private IBindable<ScoringMode> scoreDisplayMode = null!;
 
-        private readonly IBindableList<APIUser> apiFriends = new BindableList<APIUser>();
+        private bool isFriend;
 
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
@@ -317,8 +316,7 @@ namespace osu.Game.Screens.Play.HUD
 
             HasQuit.BindValueChanged(_ => updateState());
 
-            apiFriends.BindTo(api.Friends);
-            apiFriends.BindCollectionChanged((_, _) => updateState());
+            isFriend = User != null && api.Friends.Any(u => User.OnlineID == u.Id);
         }
 
         protected override void LoadComplete()
@@ -397,7 +395,7 @@ namespace osu.Game.Screens.Play.HUD
                 panelColour = BackgroundColour ?? Color4Extensions.FromHex("ffd966");
                 textColour = TextColour ?? Color4Extensions.FromHex("2e576b");
             }
-            else if (apiFriends.Any(f => User?.Equals(f) == true))
+            else if (isFriend)
             {
                 panelColour = BackgroundColour ?? Color4Extensions.FromHex("ff549a");
                 textColour = TextColour ?? Color4.White;

From c6cc858967ccc3068aa0b19a7e308451b6e16d97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 15:27:30 +0900
Subject: [PATCH 1494/2100] Change implementation of "show speed changes" to
 require explicit ruleset support

---
 .../Edit/ScrollingHitObjectComposer.cs        | 37 +++++++------------
 .../ISupportConstantAlgorithmToggle.cs        | 15 ++++++++
 2 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/Scrolling/ISupportConstantAlgorithmToggle.cs

diff --git a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
index 0340354016..75305a0c20 100644
--- a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -28,34 +27,24 @@ namespace osu.Game.Rulesets.Edit
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (DrawableRuleset is DrawableScrollingRuleset<TObject> drawableScrollingRuleset)
+            if (DrawableRuleset is ISupportConstantAlgorithmToggle toggleRuleset)
             {
-                var originalVisualisationMethod = drawableScrollingRuleset.VisualisationMethod;
-
-                if (originalVisualisationMethod != ScrollVisualisationMethod.Constant)
+                LeftToolbox.Add(new EditorToolboxGroup("playfield")
                 {
-                    LeftToolbox.Add(new EditorToolboxGroup("playfield")
+                    Child = new FillFlowContainer
                     {
-                        Child = new FillFlowContainer
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 5),
+                        Children = new[]
                         {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(0, 5),
-                            Children = new[]
-                            {
-                                new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
-                            }
-                        },
-                    });
+                            new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
+                        }
+                    },
+                });
 
-                    showSpeedChanges.BindValueChanged(state =>
-                    {
-                        drawableScrollingRuleset.VisualisationMethod = state.NewValue == TernaryState.True
-                            ? originalVisualisationMethod
-                            : ScrollVisualisationMethod.Constant;
-                    }, true);
-                }
+                showSpeedChanges.BindValueChanged(state => toggleRuleset.ShowSpeedChanges.Value = state.NewValue == TernaryState.True, true);
             }
         }
     }
diff --git a/osu.Game/Rulesets/UI/Scrolling/ISupportConstantAlgorithmToggle.cs b/osu.Game/Rulesets/UI/Scrolling/ISupportConstantAlgorithmToggle.cs
new file mode 100644
index 0000000000..aaa635350e
--- /dev/null
+++ b/osu.Game/Rulesets/UI/Scrolling/ISupportConstantAlgorithmToggle.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.Bindables;
+
+namespace osu.Game.Rulesets.UI.Scrolling
+{
+    /// <summary>
+    /// Denotes a <see cref="IDrawableScrollingRuleset"/> which supports toggling constant algorithm for better display in the editor.
+    /// </summary>
+    public interface ISupportConstantAlgorithmToggle : IDrawableScrollingRuleset
+    {
+        public BindableBool ShowSpeedChanges { get; }
+    }
+}

From 41a8239e49d87fec622135874bddcf2660ae0000 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 15:27:50 +0900
Subject: [PATCH 1495/2100] Remvoe null default for mods which can't be null

---
 osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs | 2 +-
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 2 +-
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs     | 2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 136a78b343..d74e6194fb 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Catch.Edit
             return base.OnPressed(e);
         }
 
-        protected override DrawableRuleset<CatchHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) =>
+        protected override DrawableRuleset<CatchHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
             new DrawableCatchEditorRuleset(ruleset, beatmap, mods)
             {
                 TimeRangeMultiplier = { BindTarget = timeRangeMultiplier, }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 9bde9485b2..8e61baca81 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         protected override Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpacePosition) =>
             Playfield.GetColumnByPosition(screenSpacePosition);
 
-        protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+        protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
         {
             drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods);
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index cff2171cbd..fdc11be42c 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        protected override DrawableRuleset<OsuHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+        protected override DrawableRuleset<OsuHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             => new DrawableOsuEditorRuleset(ruleset, beatmap, mods);
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 295a016c7b..f9a6b5083e 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -307,7 +307,7 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="beatmap">The loaded beatmap.</param>
         /// <param name="mods">The mods to be applied.</param>
         /// <returns>An editor-relevant <see cref="DrawableRuleset{TObject}"/>.</returns>
-        protected virtual DrawableRuleset<TObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+        protected virtual DrawableRuleset<TObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             => (DrawableRuleset<TObject>)ruleset.CreateDrawableRulesetWith(beatmap, mods);
 
         #region Tool selection logic

From cb0226f84356ae0fe991cae3664590b3c6dcc708 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 15:28:13 +0900
Subject: [PATCH 1496/2100] Implement new interface-based speed change
 visualisation support on mania/taiko

---
 .../Edit/DrawableManiaEditorRuleset.cs        | 13 ++++++-
 .../Edit/DrawableTaikoEditorRuleset.cs        | 37 +++++++++++++++++++
 .../Edit/TaikoHitObjectComposer.cs            |  6 +++
 .../UI/DrawableTaikoRuleset.cs                |  7 +++-
 4 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index 1741dad5d6..7b019a2bdf 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -12,8 +14,10 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public partial class DrawableManiaEditorRuleset : DrawableManiaRuleset
+    public partial class DrawableManiaEditorRuleset : DrawableManiaRuleset, ISupportConstantAlgorithmToggle
     {
+        public BindableBool ShowSpeedChanges { get; set; } = new BindableBool();
+
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
         public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods)
@@ -21,6 +25,13 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ShowSpeedChanges.BindValueChanged(showChanges => VisualisationMethod = showChanges.NewValue ? ScrollVisualisationMethod.Sequential : ScrollVisualisationMethod.Constant, true);
+        }
+
         protected override Playfield CreatePlayfield() => new ManiaEditorPlayfield(Beatmap.Stages)
         {
             Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs b/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
new file mode 100644
index 0000000000..963ddec0b3
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.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.
+
+using System.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public partial class DrawableTaikoEditorRuleset : DrawableTaikoRuleset, ISupportConstantAlgorithmToggle
+    {
+        public BindableBool ShowSpeedChanges { get; set; } = new BindableBool();
+
+        public DrawableTaikoEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
+            : base(ruleset, beatmap, mods)
+        {
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ShowSpeedChanges.BindValueChanged(showChanges => VisualisationMethod = showChanges.NewValue ? ScrollVisualisationMethod.Overlapping : ScrollVisualisationMethod.Constant, true);
+        }
+
+        protected override double ComputeTimeRange()
+        {
+            // Adjust when we're using constant algorithm to not be sluggish.
+            double multiplier = ShowSpeedChanges.Value ? 1 : 4;
+            return base.ComputeTimeRange() / multiplier;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index fbad8c7fad..5ae4757b8f 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -2,9 +2,12 @@
 // 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;
 using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Taiko.Edit
@@ -25,6 +28,9 @@ namespace osu.Game.Rulesets.Taiko.Edit
             new SwellCompositionTool()
         };
 
+        protected override DrawableRuleset<TaikoHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
+            new DrawableTaikoEditorRuleset(ruleset, beatmap, mods);
+
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new TaikoBlueprintContainer(this);
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 979e03f201..2af4c0c2e8 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -64,6 +64,11 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             base.Update();
 
+            TimeRange.Value = ComputeTimeRange();
+        }
+
+        protected virtual double ComputeTimeRange()
+        {
             // Taiko scrolls at a constant 100px per 1000ms. More notes become visible as the playfield is lengthened.
             const float scroll_rate = 10;
 
@@ -72,7 +77,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             // 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;
+            return (Playfield.HitObjectContainer.DrawWidth / ratio) * scroll_rate;
         }
 
         protected override void UpdateAfterChildren()

From d7129da8ea708f5485e023a18012940b1d5d3dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Sep 2023 12:05:23 +0200
Subject: [PATCH 1497/2100] Fix `TestSceneDrawableStoryboardSprite` not
 displaying anything

---
 .../Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
index d20c7c2f7a..32693c2bb2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             layer.Elements.Clear();
             layer.Add(sprite);
 
-            return storyboard.CreateDrawable();
+            return storyboard.CreateDrawable().With(s => s.RelativeSizeAxes = Axes.Both);
         }
 
         private void assertStoryboardSourced()

From f2791d4f3e1c3067d8a2b9fcbab013edcd5eeefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Sep 2023 12:22:05 +0200
Subject: [PATCH 1498/2100] Move comment a bit to fix formatting

Would otherwise trigger IDE0055, but that isn't resolveable without
an inspection cycle with resharper, so just move in a more sane place.
---
 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 d74e6194fb..dc3a4416a5 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -25,8 +25,8 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit
 {
+    // we're also a ScrollingHitObjectComposer candidate, but can't be everything can we?
     public partial class CatchHitObjectComposer : DistancedHitObjectComposer<CatchHitObject>
-        // we're also a ScrollingHitObjectComposer candidate, but can't be everything can we?
     {
         private const float distance_snap_radius = 50;
 

From bf984388b364ba4a3a35139df08b09fa0aac93c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 19:12:55 +0900
Subject: [PATCH 1499/2100] Update clocks in line with framework changes

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs         | 2 --
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 2 --
 osu.Game/Screens/Edit/EditorClock.cs            | 2 --
 osu.Game/Screens/Play/GameplayClockContainer.cs | 2 --
 4 files changed, 8 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 9577d1e38b..62484fa12b 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -216,8 +216,6 @@ namespace osu.Game.Beatmaps
 
         public double FramesPerSecond => finalClockSource.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => finalClockSource.TimeInfo;
-
         #endregion
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 90cffab714..2af9916a6b 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -264,8 +264,6 @@ namespace osu.Game.Rulesets.UI
 
         public double FramesPerSecond => framedClock.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => framedClock.TimeInfo;
-
         public double StartTime => parentGameplayClock?.StartTime ?? 0;
 
         private readonly AudioAdjustments gameplayAdjustments = new AudioAdjustments();
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index e5e88a04d9..a05a873101 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -231,8 +231,6 @@ namespace osu.Game.Screens.Edit
 
         public double FramesPerSecond => underlyingClock.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
-
         public void ChangeSource(IClock source)
         {
             track.Value = source as Track;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 20bf6c3829..2478af1dd4 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -234,7 +234,5 @@ namespace osu.Game.Screens.Play
         public double ElapsedFrameTime => GameplayClock.ElapsedFrameTime;
 
         public double FramesPerSecond => GameplayClock.FramesPerSecond;
-
-        public FrameTimeInfo TimeInfo => GameplayClock.TimeInfo;
     }
 }

From 8a3d412ffc3374c4ad99cd4b26b00edf77e4cf35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 11:38:16 +0900
Subject: [PATCH 1500/2100] Remove mention of no-heated-gameplay-mechanics
 discussions

We're kinda at the point we're allowing this now.
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 792e2d646a..ce9fe4d053 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,6 @@ The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Curre
 
 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 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:
 
 - Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer).

From 2954ad78349e126482c02687f98fcf00055314ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 11:56:23 +0900
Subject: [PATCH 1501/2100] Update language across whole readme to read better

---
 README.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ce9fe4d053..a9dac3d6cf 100644
--- a/README.md
+++ b/README.md
@@ -12,33 +12,35 @@
 
 A free-to-win rhythm game. Rhythm is just a *click* away!
 
-The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Currently known by and released under the release codename "*lazer*". As in sharper than cutting-edge.
+This is the future – and final – iteration of the [osu!](https://osu.ppy.sh) game client and marks the beginning of an open era! Currently known by and released under the release codename "*lazer*". As in sharper than cutting-edge.
 
 ## Status
 
-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.
+This project is under constant development, but we do our best to keep things in a stable state. Players are encouraged to install from a release alongside their stable *osu!* client. This project will continue to evolve until we eventually reach the point where most users prefer it over the previous "osu!stable" release.
 
-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:
+A few resources are available as starting points to getting involved and understanding the project:
 
 - 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).
 
 ## Running osu!
 
-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:
+If you are just looking to give the game a whirl, you can grab the latest release for your platform:
 
-**Latest release:**
+### 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) |
 | ------------- | ------------- | ------------- | ------------- | ------------- |
 
-- The iOS testflight link may fill up (Apple has a hard limit of 10,000 users). We reset it occasionally when this happens. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements of link resets.
+You can also generally download a version for your current device from the [osu! site](https://osu.ppy.sh/home/download)
 
 If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
 
+**For iOS/iPadOS users**: The iOS testflight link fills up very fast (Apple has a hard limit of 10,000 users). We reset it occasionally. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements. Our goal is to get the game on mobile app stores in early 2024.
+
 ## Developing a custom ruleset
 
-osu! is designed to have extensible modular gameplay modes, called "rulesets". Building one of these allows a developer to harness the power of osu! for their own game style. To get started working on a ruleset, we have some templates available [here](https://github.com/ppy/osu/tree/master/Templates).
+osu! is designed to allow user-created gameplay variations, called "rulesets". Building one of these allows a developer to harness the power of the osu! beatmap library, game engine, and general UX for a new style of gameplay. To get started working on a ruleset, we have some templates available [here](https://github.com/ppy/osu/tree/master/Templates).
 
 You can see some examples of custom rulesets by visiting the [custom ruleset directory](https://github.com/ppy/osu/discussions/13096).
 

From c76853c32c6267110657ef7c31c81f58e47d7191 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 11:56:32 +0900
Subject: [PATCH 1502/2100] Add mention of new project

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a9dac3d6cf..2cf3b4bf6b 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ A few resources are available as starting points to getting involved and underst
 
 - 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).
+- Track our current efforts [towards full "ranked play" support](https://github.com/orgs/ppy/projects/13?query=is%3Aopen+sort%3Aupdated-desc)
 
 ## Running osu!
 

From fc6abae968011aecada1d7f81484b78f2a2b0d64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 11:56:49 +0900
Subject: [PATCH 1503/2100] Remove note about `dotnet` CLI tools not working
 (less relevant post-EF)

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 2cf3b4bf6b..3966a9258a 100644
--- a/README.md
+++ b/README.md
@@ -84,8 +84,6 @@ If you are not interested in debugging *osu!*, you can add `-c Release` to gain
 
 If the build fails, try to restore NuGet packages with `dotnet restore`.
 
-_Due to a historical feature gap between .NET Core and Xamarin, running `dotnet` CLI from the root directory will not work for most commands. This can be resolved by specifying a target `.csproj` or the helper project at `build/Desktop.proj`. Configurations have been provided to work around this issue for all supported IDEs mentioned above._
-
 ### 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 quickly achieved using included commands:

From 9629f49afbd26dcf65674b6cf0a2672e67018920 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 11:57:10 +0900
Subject: [PATCH 1504/2100] Update build instructions to be more clear about
 `slnf` files and mention `workload`s

---
 README.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3966a9258a..6009ff4d59 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,8 @@ You can see some examples of custom rulesets by visiting the [custom ruleset dir
 
 ## Developing osu!
 
+### Prerequisites
+
 Please make sure you have the following prerequisites:
 
 - A desktop platform with the [.NET 6.0 SDK](https://dotnet.microsoft.com/download) installed.
@@ -70,9 +72,19 @@ git pull
 
 ### Building
 
-Build configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this is provided [below](#contributing).
+#### From an IDE
 
-- Visual Studio / Rider users should load the project via one of the platform-specific `.slnf` files, rather than the main `.sln`. This will allow access to template run configurations.
+You should load the solution via one of the platform-specific `.slnf` files, rather than the main `.sln`. This will reduce dependencies and hide platforms that you don't care about. Valid `.slnf` files are:
+
+- `osu.Desktop.slnf` (most common)
+- `osu.Android.slnf`
+- `osu.iOS.slnf`
+
+Run configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this is provided [below](#contributing).
+
+To build for mobile platforms, you will likely need to run `sudo dotnet workload restore` if you haven't done so previously. This will install android/iOS tooling required to complete the build.
+
+#### From CLI
 
 You can also build and run *osu!* from the command-line with a single command:
 

From 262916787ecfde13d2499aa733611a845fa13e13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 13:27:00 +0900
Subject: [PATCH 1505/2100] Apply punctuation and terminology fixes

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6009ff4d59..946a6b03d9 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ A few resources are available as starting points to getting involved and underst
 
 - 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).
-- Track our current efforts [towards full "ranked play" support](https://github.com/orgs/ppy/projects/13?query=is%3Aopen+sort%3Aupdated-desc)
+- Track our current efforts [towards full "ranked play" support](https://github.com/orgs/ppy/projects/13?query=is%3Aopen+sort%3Aupdated-desc).
 
 ## Running osu!
 
@@ -33,7 +33,7 @@ If you are just looking to give the game a whirl, you can grab the latest releas
 | [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) |
 | ------------- | ------------- | ------------- | ------------- | ------------- |
 
-You can also generally download a version for your current device from the [osu! site](https://osu.ppy.sh/home/download)
+You can also generally download a version for your current device from the [osu! site](https://osu.ppy.sh/home/download).
 
 If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
 
@@ -80,9 +80,9 @@ You should load the solution via one of the platform-specific `.slnf` files, rat
 - `osu.Android.slnf`
 - `osu.iOS.slnf`
 
-Run configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this is provided [below](#contributing).
+Run configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `osu! (Tests)` project/configuration. More information on this is provided [below](#contributing).
 
-To build for mobile platforms, you will likely need to run `sudo dotnet workload restore` if you haven't done so previously. This will install android/iOS tooling required to complete the build.
+To build for mobile platforms, you will likely need to run `sudo dotnet workload restore` if you haven't done so previously. This will install Android/iOS tooling required to complete the build.
 
 #### From CLI
 

From 0eab4c5364d23e3bb996894ae3fd58b4842f0914 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 14:47:55 +0900
Subject: [PATCH 1506/2100] Reword sentence with multiple `and`s
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>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 946a6b03d9..f7a4936e50 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 
 A free-to-win rhythm game. Rhythm is just a *click* away!
 
-This is the future – and final – iteration of the [osu!](https://osu.ppy.sh) game client and marks the beginning of an open era! Currently known by and released under the release codename "*lazer*". As in sharper than cutting-edge.
+This is the future – and final – iteration of the [osu!](https://osu.ppy.sh) game client which marks the beginning of an open era! Currently known by and released under the release codename "*lazer*". As in sharper than cutting-edge.
 
 ## Status
 

From 8ef0ef09db1381df7fc0bf0f65701d4ca2ca8a1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 14:59:37 +0900
Subject: [PATCH 1507/2100] Reword release build disclaimer

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f7a4936e50..d5dc0723af 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ You can also build and run *osu!* from the command-line with a single command:
 dotnet run --project osu.Desktop
 ```
 
-If you are not interested in debugging *osu!*, you can add `-c Release` to gain performance. In this case, you must replace `Debug` with `Release` in any commands mentioned in this document.
+When running locally to do any kind of performance testing, make sure to add `-c Release` to the build command, as the overhead of running with the default `Debug` configuration can be large (especially when testing with local framework modifications as below).
 
 If the build fails, try to restore NuGet packages with `dotnet restore`.
 

From c4fc4199d190b6bff29d10c65341b9c7a011fca9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 21 Sep 2023 19:02:31 +0300
Subject: [PATCH 1508/2100] Use correct maximum size for droplets

---
 osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index 581259a9c4..c6c0839fba 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public partial class LegacyDropletPiece : LegacyCatchHitObjectPiece
     {
-        private static readonly Vector2 droplet_max_size = new Vector2(100);
+        private static readonly Vector2 droplet_max_size = new Vector2(82, 103);
 
         public LegacyDropletPiece()
         {

From ad86bf2d56cb85e5bd4b84e74a92d1ed63aaf578 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 21 Sep 2023 19:03:08 +0300
Subject: [PATCH 1509/2100] Revert redundant size limitations

Already handled by the sprites themselves being resized.
---
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
index 83f05fe6ec..5543a31ec9 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
@@ -48,13 +47,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-end", WrapMode.ClampToEdge, WrapMode.ClampToEdge)?.WithMaximumSize(new Vector2(128, 256)),
+                    Texture = skin.GetTexture("taiko-roll-end", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                     FillMode = FillMode.Fit,
                 },
                 body = new Sprite
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-middle", WrapMode.ClampToEdge, WrapMode.ClampToEdge)?.WithMaximumSize(new Vector2(2, 256)),
+                    Texture = skin.GetTexture("taiko-roll-middle", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                 },
                 headCircle = new LegacyCirclePiece
                 {

From 9af4e75dfc5dd5cdfd5e70c227d1a48e2747205c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 01:24:24 +0900
Subject: [PATCH 1510/2100] Disable clipboard export for song select textbox

In combination with https://github.com/ppy/osu-framework/pull/5997,
closes https://github.com/ppy/osu/issues/24867
---
 osu.Game/Screens/Select/FilterControl.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 38520a85b7..614c9bd7ec 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -254,6 +254,8 @@ namespace osu.Game.Screens.Select
 
             public OsuSpriteText FilterText { get; private set; }
 
+            protected override bool AllowClipboardExport => false;
+
             public FilterControlTextBox()
             {
                 Height += filter_text_size;

From f1258a396367d4ccec91977c34f40ca13cb4dd6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 01:26:38 +0900
Subject: [PATCH 1511/2100] 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 10cee77b09..20b0f220a3 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.914.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.922.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 d88b568244..049d4275a4 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.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.914.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index b754b156b3..5508c2ab03 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.914.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.922.0" />
   </ItemGroup>
 </Project>

From 5266cdc7224954c1cc466769b503c6ea481b36cd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 21 Sep 2023 20:36:34 +0300
Subject: [PATCH 1512/2100] Add explanatory note

---
 osu.Game/Screens/Select/FilterControl.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 614c9bd7ec..b7dc18e46a 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -254,6 +254,7 @@ namespace osu.Game.Screens.Select
 
             public OsuSpriteText FilterText { get; private set; }
 
+            // clipboard is disabled because one of the "cut" platform key bindings (shift-delete) conflicts with the beatmap deletion action.
             protected override bool AllowClipboardExport => false;
 
             public FilterControlTextBox()

From d73f06fc89e3bcebb93cff36db24287d8ae6e7ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Sep 2023 20:01:59 +0200
Subject: [PATCH 1513/2100] Add test coverage for delete hotkey

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 0bff40f258..43a7da0c28 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -25,6 +25,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
@@ -1087,6 +1088,25 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("0 matching shown", () => songSelect.ChildrenOfType<FilterControl>().Single().InformationalText == "0 matches");
         }
 
+        [Test]
+        public void TestDeleteHotkey()
+        {
+            createSongSelect();
+
+            addRulesetImportStep(0);
+            AddAssert("3 matching shown", () => songSelect.ChildrenOfType<FilterControl>().Single().InformationalText == "3 matches");
+
+            AddStep("press shift-delete", () =>
+            {
+                InputManager.PressKey(Key.ShiftLeft);
+                InputManager.Key(Key.Delete);
+                InputManager.ReleaseKey(Key.ShiftLeft);
+            });
+            AddUntilStep("delete dialog shown", () => DialogOverlay.CurrentDialog, Is.InstanceOf<BeatmapDeleteDialog>);
+            AddStep("confirm deletion", () => DialogOverlay.CurrentDialog!.PerformAction<PopupDialogDangerousButton>());
+            AddAssert("0 matching shown", () => songSelect.ChildrenOfType<FilterControl>().Single().InformationalText == "0 matches");
+        }
+
         private void waitForInitialSelection()
         {
             AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);

From 9301a1907abdc0f97bc5f7486fb55aea20e61e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Sep 2023 21:05:41 +0200
Subject: [PATCH 1514/2100] Rewrite `TestFriendScore` assertions to constraint
 model

Allows to clearly see what the failure is:

	TearDown : System.TimeoutException : "friend score is pink" timed out: Expected: some item equal to "#FF549A"
	  But was:  < "#FFFFFF", "#7FCC33", "#444444" >

The #7FCC33 colour is used for the first score on the leaderboard.
---
 .../Visual/Gameplay/TestSceneGameplayLeaderboard.cs      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 65f943d36b..df1d56c94d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.PolygonExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -161,10 +160,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             int playerNumber = 1;
 
             AddRepeatStep("add 3 other players", () => createRandomScore(new APIUser { Username = $"Player {playerNumber++}" }), 3);
-            AddUntilStep("there are no pink color score", () => leaderboard.ChildrenOfType<Box>().All(b => b.Colour != Color4Extensions.FromHex("ff549a")));
+            AddUntilStep("no pink color scores",
+                () => leaderboard.ChildrenOfType<Box>().Select(b => ((Colour4)b.Colour).ToHex()),
+                () => Does.Not.Contain("#FF549A"));
 
             AddRepeatStep("add 3 friend score", () => createRandomScore(friend), 3);
-            AddUntilStep("there are pink color for friend score", () => leaderboard.GetScoreByUsername("my friend").ChildrenOfType<Box>().Any(b => b.Colour == Color4Extensions.FromHex("ff549a")));
+            AddUntilStep("friend score is pink",
+                () => leaderboard.GetScoreByUsername("my friend").ChildrenOfType<Box>().Select(b => ((Colour4)b.Colour).ToHex()),
+                () => Does.Contain("#FF549A"));
         }
 
         private void addLocalPlayer()

From e45d45632421c1091a93428b824f65f06a943cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Sep 2023 21:09:24 +0200
Subject: [PATCH 1515/2100] Fix `TestFriendScore` intermittently failing due to
 randomness

If `createRandomScore()` happened to randomly pick the highest total
score when called with `friend` as the sole argument, that particular
score would not be pink.

`GetScoreByUsername()` would arbitrarily pick the first score for the
user, so in this particular case where a friend had the number 1 score,
the test would wrongly fail.

Fix by checking whether any of the 3 added friend scores have received
the pink colour. Because there is more than 1 friend score in the test,
doing so ensures that at least one of those should eventually become
pink (because, obviously, you can't have two scores at number 1).
---
 .../Visual/Gameplay/TestSceneGameplayLeaderboard.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index df1d56c94d..193e8b2571 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
@@ -165,8 +166,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                 () => Does.Not.Contain("#FF549A"));
 
             AddRepeatStep("add 3 friend score", () => createRandomScore(friend), 3);
-            AddUntilStep("friend score is pink",
-                () => leaderboard.GetScoreByUsername("my friend").ChildrenOfType<Box>().Select(b => ((Colour4)b.Colour).ToHex()),
+            AddUntilStep("at least one friend score is pink",
+                () => leaderboard.GetAllScoresForUsername("my friend")
+                                 .SelectMany(score => score.ChildrenOfType<Box>())
+                                 .Select(b => ((Colour4)b.Colour).ToHex()),
                 () => Does.Contain("#FF549A"));
         }
 
@@ -211,10 +214,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }
 
-            public GameplayLeaderboardScore GetScoreByUsername(string username)
-            {
-                return Flow.FirstOrDefault(i => i.User?.Username == username);
-            }
+            public IEnumerable<GameplayLeaderboardScore> GetAllScoresForUsername(string username)
+                => Flow.Where(i => i.User?.Username == username);
         }
     }
 }

From 600651795b88563e77e5e8b3120aa71367329aee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 15:23:22 +0900
Subject: [PATCH 1516/2100] Change `FramedBeatmapClock` to always be decoupled

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs         | 10 +++-------
 osu.Game/Screens/Edit/EditorClock.cs            |  2 +-
 osu.Game/Screens/Play/GameplayClockContainer.cs |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 62484fa12b..1626fec9bd 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -13,6 +13,8 @@ using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Screens.Play;
 
+#pragma warning disable CS0618
+
 namespace osu.Game.Beatmaps
 {
     /// <summary>
@@ -66,19 +68,13 @@ namespace osu.Game.Beatmaps
 
         public bool IsRewinding { get; private set; }
 
-        public bool IsCoupled
-        {
-            get => decoupledClock.IsCoupled;
-            set => decoupledClock.IsCoupled = value;
-        }
-
         public FramedBeatmapClock(bool applyOffsets = false)
         {
             this.applyOffsets = applyOffsets;
 
             // A decoupled clock is used to ensure precise time values even when the host audio subsystem is not reporting
             // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
-            decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
+            decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
 
             if (applyOffsets)
             {
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index a05a873101..108552b61c 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Edit
 
             this.beatDivisor = beatDivisor ?? new BindableBeatDivisor();
 
-            underlyingClock = new FramedBeatmapClock(applyOffsets: true) { IsCoupled = false };
+            underlyingClock = new FramedBeatmapClock(applyOffsets: true);
             AddInternal(underlyingClock);
         }
 
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 2478af1dd4..6e069297d4 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
 
             InternalChildren = new Drawable[]
             {
-                GameplayClock = new FramedBeatmapClock(applyOffsets) { IsCoupled = false },
+                GameplayClock = new FramedBeatmapClock(applyOffsets),
                 Content
             };
         }

From 3f27be1f330103ced3937de808107376b350bcd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 15:24:03 +0900
Subject: [PATCH 1517/2100] Replace most usages of
 `DecoupleableInterpolatingFramedClock`

Except `FramedBeatmapClock`, which is the high-effort one.
---
 .../Visual/Gameplay/TestSceneStoryboard.cs          |  4 +---
 osu.Game/Screens/Menu/IntroTriangles.cs             | 13 +++----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index a6663f3086..893b9f11f4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -106,14 +106,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             if (storyboard != null)
                 storyboardContainer.Remove(storyboard, true);
 
-            var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
-            storyboardContainer.Clock = decoupledClock;
+            storyboardContainer.Clock = new FramedClock(Beatmap.Value.Track);
 
             storyboard = toLoad.CreateDrawable(SelectedMods.Value);
             storyboard.Passing = false;
 
             storyboardContainer.Add(storyboard);
-            decoupledClock.ChangeSource(Beatmap.Value.Track);
         }
 
         private void loadStoryboard(string filename, Action<Storyboard>? setUpStoryboard = null)
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index a9c86b10c4..808680b9e5 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Screens.Menu
 
         private Sample welcome;
 
-        private DecoupleableInterpolatingFramedClock decoupledClock;
         private TrianglesIntroSequence intro;
 
         public IntroTriangles([CanBeNull] Func<MainMenu> createNextScreen = null)
@@ -59,18 +58,12 @@ namespace osu.Game.Screens.Menu
             {
                 PrepareMenuLoad();
 
-                decoupledClock = new DecoupleableInterpolatingFramedClock
-                {
-                    IsCoupled = false
-                };
-
-                if (UsingThemedIntro)
-                    decoupledClock.ChangeSource(Track);
+                var decouplingClock = new DecouplingClock(UsingThemedIntro ? Track : null);
 
                 LoadComponentAsync(intro = new TrianglesIntroSequence(logo, () => FadeInBackground())
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Clock = decoupledClock,
+                    Clock = new InterpolatingFramedClock(decouplingClock),
                     LoadMenu = LoadMenu
                 }, _ =>
                 {
@@ -94,7 +87,7 @@ namespace osu.Game.Screens.Menu
                         StartTrack();
 
                     // no-op for the case of themed intro, no harm in calling for both scenarios as a safety measure.
-                    decoupledClock.Start();
+                    decouplingClock.Start();
                 });
             }
         }

From 117cd74af671877a05600e261a93323a39fcd7e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 15:32:29 +0900
Subject: [PATCH 1518/2100] Update usage of
 `DecoupleableInterpolatingFramedClock` in `FramedBeatmapClock`

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs       | 33 +++++++++----------
 .../Screens/Play/GameplayClockContainer.cs    |  3 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 1626fec9bd..acd10cccf3 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -13,8 +13,6 @@ using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Screens.Play;
 
-#pragma warning disable CS0618
-
 namespace osu.Game.Beatmaps
 {
     /// <summary>
@@ -55,7 +53,7 @@ namespace osu.Game.Beatmaps
 
         private IDisposable? beatmapOffsetSubscription;
 
-        private readonly DecoupleableInterpolatingFramedClock decoupledClock;
+        private readonly DecouplingClock decoupledTrack;
 
         [Resolved]
         private OsuConfigManager config { get; set; } = null!;
@@ -74,13 +72,13 @@ namespace osu.Game.Beatmaps
 
             // A decoupled clock is used to ensure precise time values even when the host audio subsystem is not reporting
             // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
-            decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
+            decoupledTrack = new DecouplingClock();
 
             if (applyOffsets)
             {
                 // Audio timings in general with newer BASS versions don't match stable.
                 // This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
-                platformOffsetClock = new OffsetCorrectionClock(decoupledClock, ExternalPauseFrequencyAdjust) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
+                platformOffsetClock = new OffsetCorrectionClock(decoupledTrack, ExternalPauseFrequencyAdjust) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
 
                 // User global offset (set in settings) should also be applied.
                 userGlobalOffsetClock = new OffsetCorrectionClock(platformOffsetClock, ExternalPauseFrequencyAdjust);
@@ -90,7 +88,7 @@ namespace osu.Game.Beatmaps
             }
             else
             {
-                finalClockSource = decoupledClock;
+                finalClockSource = new InterpolatingFramedClock(decoupledTrack);
             }
         }
 
@@ -120,13 +118,12 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
-            if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < decoupledClock.CurrentTime - 100)
+            // TODO: necessary?
+            if (Source.CurrentTime < decoupledTrack.CurrentTime - 100)
             {
                 // InterpolatingFramedClock won't interpolate backwards unless its source has an ElapsedFrameTime.
                 // See https://github.com/ppy/osu-framework/blob/ba1385330cc501f34937e08257e586c84e35d772/osu.Framework/Timing/InterpolatingFramedClock.cs#L91-L93
                 // This is not always the case here when doing large seeks.
-                // (Of note, this is not an issue if the source is adjustable, as the source is seeked to be in time by DecoupleableInterpolatingFramedClock).
-                // Rather than trying to get around this by fixing the framework clock stack, let's work around it for now.
                 Seek(Source.CurrentTime);
             }
             else
@@ -156,43 +153,43 @@ namespace osu.Game.Beatmaps
         public void ChangeSource(IClock? source)
         {
             Track = source as Track ?? new TrackVirtual(60000);
-            decoupledClock.ChangeSource(source);
+            decoupledTrack.ChangeSource(Track);
         }
 
-        public IClock? Source => decoupledClock.Source;
+        public IClock Source => decoupledTrack.Source;
 
         public void Reset()
         {
-            decoupledClock.Reset();
+            decoupledTrack.Reset();
             finalClockSource.ProcessFrame();
         }
 
         public void Start()
         {
-            decoupledClock.Start();
+            decoupledTrack.Start();
             finalClockSource.ProcessFrame();
         }
 
         public void Stop()
         {
-            decoupledClock.Stop();
+            decoupledTrack.Stop();
             finalClockSource.ProcessFrame();
         }
 
         public bool Seek(double position)
         {
-            bool success = decoupledClock.Seek(position - TotalAppliedOffset);
+            bool success = decoupledTrack.Seek(position - TotalAppliedOffset);
             finalClockSource.ProcessFrame();
 
             return success;
         }
 
-        public void ResetSpeedAdjustments() => decoupledClock.ResetSpeedAdjustments();
+        public void ResetSpeedAdjustments() => decoupledTrack.ResetSpeedAdjustments();
 
         public double Rate
         {
-            get => decoupledClock.Rate;
-            set => decoupledClock.Rate = value;
+            get => decoupledTrack.Rate;
+            set => decoupledTrack.Rate = value;
         }
 
         #endregion
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6e069297d4..ba034b079f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -194,7 +194,8 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private void ensureSourceClockSet()
         {
-            if (GameplayClock.Source == null)
+            // TODO: does this need to exist?
+            if (GameplayClock.Source != SourceClock)
                 ChangeSource(SourceClock);
         }
 

From 04e6ec87158a0117f366b4ef8dc8289b18a6e285 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 17:02:31 +0900
Subject: [PATCH 1519/2100] Fix interpolation not being applied when
 `applyOffsets` is set

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

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index acd10cccf3..338a5d3056 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -74,11 +74,13 @@ namespace osu.Game.Beatmaps
             // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
             decoupledTrack = new DecouplingClock();
 
+            var interpolatedTrack = new InterpolatingFramedClock(decoupledTrack);
+
             if (applyOffsets)
             {
                 // Audio timings in general with newer BASS versions don't match stable.
                 // This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
-                platformOffsetClock = new OffsetCorrectionClock(decoupledTrack, ExternalPauseFrequencyAdjust) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
+                platformOffsetClock = new OffsetCorrectionClock(interpolatedTrack, ExternalPauseFrequencyAdjust) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
 
                 // User global offset (set in settings) should also be applied.
                 userGlobalOffsetClock = new OffsetCorrectionClock(platformOffsetClock, ExternalPauseFrequencyAdjust);
@@ -88,7 +90,7 @@ namespace osu.Game.Beatmaps
             }
             else
             {
-                finalClockSource = new InterpolatingFramedClock(decoupledTrack);
+                finalClockSource = new InterpolatingFramedClock(interpolatedTrack);
             }
         }
 

From 21a2e27e5fff1adfdb3ac8eae52804919ac987a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 18:39:55 +0900
Subject: [PATCH 1520/2100] Simplify some pieces of `FramedBeatmapClock`

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 338a5d3056..7a12528453 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -28,16 +28,6 @@ namespace osu.Game.Beatmaps
     {
         private readonly bool applyOffsets;
 
-        /// <summary>
-        /// The length of the underlying beatmap track. Will default to 60 seconds if unavailable.
-        /// </summary>
-        public double TrackLength => Track.Length;
-
-        /// <summary>
-        /// The underlying beatmap track, if available.
-        /// </summary>
-        public Track Track { get; private set; } = new TrackVirtual(60000);
-
         /// <summary>
         /// The total frequency adjustment from pause transforms. Should eventually be handled in a better way.
         /// </summary>
@@ -154,8 +144,7 @@ namespace osu.Game.Beatmaps
 
         public void ChangeSource(IClock? source)
         {
-            Track = source as Track ?? new TrackVirtual(60000);
-            decoupledTrack.ChangeSource(Track);
+            decoupledTrack.ChangeSource(source as Track ?? new TrackVirtual(60000));
         }
 
         public IClock Source => decoupledTrack.Source;

From 5f634f2812b42c6e6d404b19c2dc015db80b3575 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 18:45:34 +0900
Subject: [PATCH 1521/2100] Remove unnecessary encapsulation workaround

The new implementation of `DecouplingClock` will not mutate the
underlying clock in any way (unless attempting to start it when
approaching from a negative time value).

This should be quite safe as a result.
---
 osu.Game/Beatmaps/FramedBeatmapClock.cs |  5 +----
 osu.Game/OsuGameBase.cs                 | 11 +----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 7a12528453..cd349e6c29 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -142,10 +142,7 @@ namespace osu.Game.Beatmaps
 
         #region Delegation of IAdjustableClock / ISourceChangeableClock to decoupled clock.
 
-        public void ChangeSource(IClock? source)
-        {
-            decoupledTrack.ChangeSource(source as Track ?? new TrackVirtual(60000));
-        }
+        public void ChangeSource(IClock? source) => decoupledTrack.ChangeSource(source);
 
         public IClock Source => decoupledTrack.Source;
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 75b46a0a4d..c946362124 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -441,16 +441,7 @@ namespace osu.Game
             }
         }
 
-        private void onTrackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction)
-        {
-            // FramedBeatmapClock uses a decoupled clock internally which will mutate the source if it is an `IAdjustableClock`.
-            // We don't want this for now, as the intention of beatmapClock is to be a read-only source for beat sync components.
-            //
-            // Encapsulating in a FramedClock will avoid any mutations.
-            var framedClock = new FramedClock(beatmap.Track);
-
-            beatmapClock.ChangeSource(framedClock);
-        }
+        private void onTrackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction) => beatmapClock.ChangeSource(beatmap.Track);
 
         protected virtual void InitialiseFonts()
         {

From df08c4e1adf701068e9c00dd2e2fd40d248c9bb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 18:49:44 +0900
Subject: [PATCH 1522/2100] Disable decoupling for `OsuGameBase`'s beatmap
 implementation

This avoids it ever mutating the underlying track (aka attempting to start
it). Resolves the one caveat mentioned in
aeef92fa710648d4a00edc523e13c17ac6104125.
---
 osu.Game/Beatmaps/FramedBeatmapClock.cs         | 8 ++++----
 osu.Game/OsuGameBase.cs                         | 2 +-
 osu.Game/Screens/Edit/EditorClock.cs            | 2 +-
 osu.Game/Screens/Play/GameplayClockContainer.cs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index cd349e6c29..d738333a98 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -56,14 +56,14 @@ namespace osu.Game.Beatmaps
 
         public bool IsRewinding { get; private set; }
 
-        public FramedBeatmapClock(bool applyOffsets = false)
+        public FramedBeatmapClock(bool applyOffsets, bool requireDecoupling)
         {
             this.applyOffsets = applyOffsets;
 
-            // A decoupled clock is used to ensure precise time values even when the host audio subsystem is not reporting
-            // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
-            decoupledTrack = new DecouplingClock();
+            decoupledTrack = new DecouplingClock { AllowDecoupling = requireDecoupling };
 
+            // An interpolating clock is used to ensure precise time values even when the host audio subsystem is not reporting
+            // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
             var interpolatedTrack = new InterpolatingFramedClock(decoupledTrack);
 
             if (applyOffsets)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c946362124..1f46eb0c0d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -215,7 +215,7 @@ namespace osu.Game
         /// For now, this is used as a source specifically for beat synced components.
         /// Going forward, it could potentially be used as the single source-of-truth for beatmap timing.
         /// </summary>
-        private readonly FramedBeatmapClock beatmapClock = new FramedBeatmapClock(true);
+        private readonly FramedBeatmapClock beatmapClock = new FramedBeatmapClock(applyOffsets: true, requireDecoupling: false);
 
         protected override Container<Drawable> Content => content;
 
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 108552b61c..d4de1bae5f 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Edit
 
             this.beatDivisor = beatDivisor ?? new BindableBeatDivisor();
 
-            underlyingClock = new FramedBeatmapClock(applyOffsets: true);
+            underlyingClock = new FramedBeatmapClock(applyOffsets: true, requireDecoupling: true);
             AddInternal(underlyingClock);
         }
 
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ba034b079f..2a27d33047 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
 
             InternalChildren = new Drawable[]
             {
-                GameplayClock = new FramedBeatmapClock(applyOffsets),
+                GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling: true),
                 Content
             };
         }

From a451ab75dd4a72dcce21428ffffb27f4cf26cdc5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 19:10:14 +0900
Subject: [PATCH 1523/2100] Remove hopefully-unnecessary workaround

It was causing issues with the new implementation.
---
 osu.Game/Beatmaps/FramedBeatmapClock.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index d738333a98..c83874ded3 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -5,7 +5,6 @@ using System;
 using System.Diagnostics;
 using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
@@ -110,16 +109,7 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
-            // TODO: necessary?
-            if (Source.CurrentTime < decoupledTrack.CurrentTime - 100)
-            {
-                // InterpolatingFramedClock won't interpolate backwards unless its source has an ElapsedFrameTime.
-                // See https://github.com/ppy/osu-framework/blob/ba1385330cc501f34937e08257e586c84e35d772/osu.Framework/Timing/InterpolatingFramedClock.cs#L91-L93
-                // This is not always the case here when doing large seeks.
-                Seek(Source.CurrentTime);
-            }
-            else
-                finalClockSource.ProcessFrame();
+            finalClockSource.ProcessFrame();
 
             if (Clock.ElapsedFrameTime != 0)
                 IsRewinding = Clock.ElapsedFrameTime < 0;

From a1e298930c6a0e697f9f3f2cf80be6d2c3b3704c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 19:39:15 +0900
Subject: [PATCH 1524/2100] Remove second hopefully-unnecessary workaround

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 2a27d33047..4c3aa301a6 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -160,21 +160,6 @@ namespace osu.Game.Screens.Play
 
             Seek(StartTime);
 
-            // This is a workaround for the fact that DecoupleableInterpolatingFramedClock doesn't seek the source
-            // if the source is not IsRunning. (see https://github.com/ppy/osu-framework/blob/2102638056dfcf85d21b4d85266d53b5dd018767/osu.Framework/Timing/DecoupleableInterpolatingFramedClock.cs#L209-L210)
-            // I hope to remove this once we knock some sense into clocks in general.
-            //
-            // Without this seek, the multiplayer spectator start sequence breaks:
-            // - Individual clients' clocks are never updated to their expected time
-            // - The sync manager thinks they are running behind
-            // - Gameplay doesn't start when it should (until a timeout occurs because nothing is happening for 10+ seconds)
-            //
-            // In addition, we use `CurrentTime` for this seek instead of `StartTime` as the above seek may have applied inherent
-            // offsets which need to be accounted for (ie. FramedBeatmapClock.TotalAppliedOffset).
-            //
-            // See https://github.com/ppy/osu/pull/24451/files/87fee001c786b29db34063ef3350e9a9f024d3ab#diff-28ca02979641e2d98a15fe5d5e806f56acf60ac100258a059fa72503b6cc54e8.
-            (SourceClock as IAdjustableClock)?.Seek(CurrentTime);
-
             if (!wasPaused || startClock)
                 Start();
         }

From 0200b63fd385eb8ed42b480d86d09e13e5b152e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 19:53:55 +0900
Subject: [PATCH 1525/2100] Add note about beatmap offset not being reapplied
 correctly on `ChangeSource`

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

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index c83874ded3..a3e1b9ae24 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -95,6 +95,7 @@ namespace osu.Game.Beatmaps
                 userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
                 userAudioOffset.BindValueChanged(offset => userGlobalOffsetClock.Offset = offset.NewValue, true);
 
+                // TODO: this doesn't update when using ChangeSource() to change beatmap.
                 beatmapOffsetSubscription = realm.SubscribeToPropertyChanged(
                     r => r.Find<BeatmapInfo>(beatmap.Value.BeatmapInfo.ID)?.UserSettings,
                     settings => settings.Offset,

From 59d6e6751255558aab0cbdba7de97105437dd8b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 04:10:57 +0900
Subject: [PATCH 1526/2100] Add missing `TestManualClock.Reset` implementation
 for safe measure

---
 osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 1d568a9dc2..63ebe5187f 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -188,6 +188,8 @@ namespace osu.Game.Tests.OnlinePlay
 
             public void Reset()
             {
+                IsRunning = false;
+                CurrentTime = 0;
             }
 
             public void ResetSpeedAdjustments()

From 586311d508c28ffb486de78e5e490639714b746a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 13:16:51 +0900
Subject: [PATCH 1527/2100] Fix souce clock not always being transferred to
 `FramedBeatmapClock` in time

---
 .../Spectate/MultiSpectatorPlayer.cs          |  2 +-
 .../Screens/Play/GameplayClockContainer.cs    | 29 ++-----------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 930bea4497..18a890c2b8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override void Update()
         {
             // The player clock's running state is controlled externally, but the local pausing state needs to be updated to start/stop gameplay.
-            if (GameplayClockContainer.SourceClock.IsRunning)
+            if (GameplayClockContainer.IsRunning)
                 GameplayClockContainer.Start();
             else
                 GameplayClockContainer.Stop();
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 4c3aa301a6..38e8fe0dc7 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -23,11 +23,6 @@ namespace osu.Game.Screens.Play
 
         public bool IsRewinding => GameplayClock.IsRewinding;
 
-        /// <summary>
-        /// The source clock. Should generally not be used for any timekeeping purposes.
-        /// </summary>
-        public IClock SourceClock { get; private set; }
-
         /// <summary>
         /// Invoked when a seek has been performed via <see cref="Seek"/>
         /// </summary>
@@ -62,8 +57,6 @@ namespace osu.Game.Screens.Play
         /// <param name="applyOffsets">Whether to apply platform, user and beatmap offsets to the mix.</param>
         public GameplayClockContainer(IClock sourceClock, bool applyOffsets = false)
         {
-            SourceClock = sourceClock;
-
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
@@ -71,6 +64,8 @@ namespace osu.Game.Screens.Play
                 GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling: true),
                 Content
             };
+
+            GameplayClock.ChangeSource(sourceClock);
         }
 
         /// <summary>
@@ -83,8 +78,6 @@ namespace osu.Game.Screens.Play
 
             isPaused.Value = false;
 
-            ensureSourceClockSet();
-
             PrepareStart();
 
             // The case which caused this to be added is FrameStabilityContainer, which manages its own current and elapsed time.
@@ -153,8 +146,6 @@ namespace osu.Game.Screens.Play
 
             Stop();
 
-            ensureSourceClockSet();
-
             if (time != null)
                 StartTime = time.Value;
 
@@ -168,21 +159,7 @@ namespace osu.Game.Screens.Play
         /// Changes the source clock.
         /// </summary>
         /// <param name="sourceClock">The new source.</param>
-        protected void ChangeSource(IClock sourceClock) => GameplayClock.ChangeSource(SourceClock = sourceClock);
-
-        /// <summary>
-        /// Ensures that the <see cref="GameplayClock"/> is set to <see cref="SourceClock"/>, if it hasn't been given a source yet.
-        /// This is usually done before a seek to avoid accidentally seeking only the adjustable source in decoupled mode,
-        /// but not the actual source clock.
-        /// That will pretty much only happen on the very first call of this method, as the source clock is passed in the constructor,
-        /// but it is not yet set on the adjustable source there.
-        /// </summary>
-        private void ensureSourceClockSet()
-        {
-            // TODO: does this need to exist?
-            if (GameplayClock.Source != SourceClock)
-                ChangeSource(SourceClock);
-        }
+        protected void ChangeSource(IClock sourceClock) => GameplayClock.ChangeSource(sourceClock);
 
         #region IAdjustableClock
 

From bf08fbe1962b613597fad898a5c75ee0baa9530f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 13:29:46 +0900
Subject: [PATCH 1528/2100] Set source directly in `FramedBeatmapClock` ctor

This isn't required, but avoids creating a temporary `StopwatchClock`
and generally just makes debug easier with less state changes.
---
 osu.Game/Beatmaps/FramedBeatmapClock.cs         | 4 ++--
 osu.Game/Screens/Play/GameplayClockContainer.cs | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index a3e1b9ae24..495a30b87c 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -55,11 +55,11 @@ namespace osu.Game.Beatmaps
 
         public bool IsRewinding { get; private set; }
 
-        public FramedBeatmapClock(bool applyOffsets, bool requireDecoupling)
+        public FramedBeatmapClock(bool applyOffsets, bool requireDecoupling, IClock? source = null)
         {
             this.applyOffsets = applyOffsets;
 
-            decoupledTrack = new DecouplingClock { AllowDecoupling = requireDecoupling };
+            decoupledTrack = new DecouplingClock(source) { AllowDecoupling = requireDecoupling };
 
             // An interpolating clock is used to ensure precise time values even when the host audio subsystem is not reporting
             // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 38e8fe0dc7..ace4778ac7 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -61,11 +61,9 @@ namespace osu.Game.Screens.Play
 
             InternalChildren = new Drawable[]
             {
-                GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling: true),
+                GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling: true, sourceClock),
                 Content
             };
-
-            GameplayClock.ChangeSource(sourceClock);
         }
 
         /// <summary>

From 3cb928fe6f4d09e43bd0336d22e53d90dde4c4cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 14:06:05 +0900
Subject: [PATCH 1529/2100] Add note about test not calling `ProcessFrame`

---
 osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 63ebe5187f..d601f187d8 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -15,6 +15,9 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.OnlinePlay
 {
+    // NOTE: This test scene never calls ProcessFrame on clocks.
+    // The current tests are fine without this as they are testing very static scenarios, but it's worth knowing
+    // if adding further tests to this class.
     [HeadlessTest]
     public partial class TestSceneCatchUpSyncManager : OsuTestScene
     {

From 6629a47ed38daff0356122f61d8676037e7e4319 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 14:10:26 +0900
Subject: [PATCH 1530/2100] Fix `FramedBeatmapClock`'s source not being
 processed

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

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 495a30b87c..5fdabaab46 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -110,6 +110,9 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
+            if (decoupledTrack.Source is IFrameBasedClock framedClock)
+                framedClock.ProcessFrame();
+
             finalClockSource.ProcessFrame();
 
             if (Clock.ElapsedFrameTime != 0)

From 8367bb6bee4ea92dc97771eb343f056cdd60d45d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 14:26:33 +0900
Subject: [PATCH 1531/2100] Don't apply decoupling to `SpectatorPlayerClock`s

See inline comment for reasoning. It's a bit complicated.
---
 .../TestSceneDrumSampleTriggerSource.cs                      | 2 +-
 osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs       | 2 +-
 osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs     | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs        | 2 +-
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs      | 2 +-
 .../Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs          | 2 +-
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs  | 5 ++++-
 osu.Game/Screens/Play/GameplayClockContainer.cs              | 5 +++--
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs        | 2 +-
 9 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index ced2e4b98c..6c925f566b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            gameplayClock = new GameplayClockContainer(manualClock)
+            gameplayClock = new GameplayClockContainer(manualClock, false, false)
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
diff --git a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
index d67a3cb824..4b3163ad89 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.NonVisual
         private partial class TestGameplayClockContainer : GameplayClockContainer
         {
             public TestGameplayClockContainer(IFrameBasedClock underlyingClock)
-                : base(underlyingClock)
+                : base(underlyingClock, false, false)
             {
                 AdjustmentsFromMods.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(2.0));
             }
diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index d601f187d8..7b0b211899 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.OnlinePlay
         [SetUp]
         public void Setup()
         {
-            syncManager = new SpectatorSyncManager(master = new GameplayClockContainer(new TestManualClock()));
+            syncManager = new SpectatorSyncManager(master = new GameplayClockContainer(new TestManualClock(), false, false));
             player1 = syncManager.CreateManagedClock();
             player2 = syncManager.CreateManagedClock();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index aa89342926..22600172dd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock());
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
 
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.ChildrenOfType<SkinComponentsContainer>().First();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 81ce088b9d..f1e9c831a6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock());
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
 
         [Cached]
         public readonly EditorClipboard Clipboard = new EditorClipboard();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index a8580ebf77..782cbb0a85 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock());
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
 
         private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 18a890c2b8..8526e11e12 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -67,7 +67,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
         {
-            var gameplayClockContainer = new GameplayClockContainer(spectatorPlayerClock);
+            // Importantly, we don't want to apply decoupling because SpectatorPlayerClock updates its IsRunning directly.
+            // If we applied decoupling, this state change wouldn't actually cause the clock to stop.
+            // TODO: Can we just use Start/Stop rather than this workaround, now that DecouplingClock is more sane?
+            var gameplayClockContainer = new GameplayClockContainer(spectatorPlayerClock, applyOffsets: false, requireDecoupling: false);
             clockAdjustmentsFromMods.BindAdjustments(gameplayClockContainer.AdjustmentsFromMods);
             return gameplayClockContainer;
         }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ace4778ac7..e6a38a9946 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -55,13 +55,14 @@ namespace osu.Game.Screens.Play
         /// </summary>
         /// <param name="sourceClock">The source <see cref="IClock"/> used for timing.</param>
         /// <param name="applyOffsets">Whether to apply platform, user and beatmap offsets to the mix.</param>
-        public GameplayClockContainer(IClock sourceClock, bool applyOffsets = false)
+        /// <param name="requireDecoupling">Whether decoupling logic should be applied on the source clock.</param>
+        public GameplayClockContainer(IClock sourceClock, bool applyOffsets, bool requireDecoupling)
         {
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
             {
-                GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling: true, sourceClock),
+                GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling, sourceClock),
                 Content
             };
         }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 489a4ef8b3..9ecabd9c6b 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play
         /// <param name="beatmap">The beatmap to be used for time and metadata references.</param>
         /// <param name="skipTargetTime">The latest time which should be used when introducing gameplay. Will be used when skipping forward.</param>
         public MasterGameplayClockContainer(WorkingBeatmap beatmap, double skipTargetTime)
-            : base(beatmap.Track, true)
+            : base(beatmap.Track, applyOffsets: true, requireDecoupling: true)
         {
             this.beatmap = beatmap;
             this.skipTargetTime = skipTargetTime;

From a3e4d1993331bd9dc27d482c13def9c6b7019126 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 14:32:31 +0900
Subject: [PATCH 1532/2100] Update tests which were not using an
 `IAdjustableClock` as `GameplayClockContainer` source

---
 osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
index 4b3163ad89..65113add2d 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Screens.Play;
@@ -16,7 +17,7 @@ namespace osu.Game.Tests.NonVisual
         [TestCase(1)]
         public void TestTrueGameplayRateWithGameplayAdjustment(double underlyingClockRate)
         {
-            var framedClock = new FramedClock(new ManualClock { Rate = underlyingClockRate });
+            var framedClock = new TrackVirtual(60000) { Frequency = { Value = underlyingClockRate } };
             var gameplayClock = new TestGameplayClockContainer(framedClock);
 
             Assert.That(gameplayClock.GetTrueGameplayRate(), Is.EqualTo(2));
@@ -24,7 +25,7 @@ namespace osu.Game.Tests.NonVisual
 
         private partial class TestGameplayClockContainer : GameplayClockContainer
         {
-            public TestGameplayClockContainer(IFrameBasedClock underlyingClock)
+            public TestGameplayClockContainer(IClock underlyingClock)
                 : base(underlyingClock, false, false)
             {
                 AdjustmentsFromMods.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(2.0));

From c40bd741383107ec806680f4346468e224ea3dc1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 14:40:10 +0900
Subject: [PATCH 1533/2100] Update usages of `GameplayClockContainer` not using
 an adjustable source

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 22600172dd..f8226eb21d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -6,11 +6,11 @@ using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Mods;
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new TrackVirtual(60000), false, false);
 
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.ChildrenOfType<SkinComponentsContainer>().First();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index f1e9c831a6..656873e9ed 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -4,10 +4,10 @@
 #nullable disable
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Overlays.SkinEditor;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new TrackVirtual(60000), false, false);
 
         [Cached]
         public readonly EditorClipboard Clipboard = new EditorClipboard();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 782cbb0a85..4cb0d5c0ff 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -8,11 +8,11 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new TrackVirtual(60000), false, false);
 
         private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
 

From faa0481fc6291226cf0c836f2f33c7f0f14831a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 16:11:02 +0900
Subject: [PATCH 1534/2100] Fix editor operating directly on track rather than
 decoupled clock

---
 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 1cdca5754d..75d9820680 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -859,7 +859,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            Beatmap.Value.Track.Stop();
+            clock.Stop();
 
             if (seekToStart)
             {

From 251a85db435b4eb7958f4fb7dc444639b580b977 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 16:18:43 +0900
Subject: [PATCH 1535/2100] Fix `StopUsingBeatmapClock` not transferring time
 and running state

---
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 9ecabd9c6b..70d9ecd3e7 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -187,7 +187,13 @@ namespace osu.Game.Screens.Play
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-            ChangeSource(new TrackVirtual(beatmap.Track.Length));
+
+            var virtualTrack = new TrackVirtual(beatmap.Track.Length);
+            virtualTrack.Seek(CurrentTime);
+            if (IsRunning)
+                virtualTrack.Start();
+            ChangeSource(virtualTrack);
+
             addSourceClockAdjustments();
         }
 

From d019cb5167acdd6e77190a11993c4e3ddf0a1b02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 22:02:18 +0900
Subject: [PATCH 1536/2100] Update in line with framed clock changes

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs | 7 ++-----
 osu.Game/Screens/Menu/IntroTriangles.cs | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 5fdabaab46..316d1f8a34 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Beatmaps
 
         private IDisposable? beatmapOffsetSubscription;
 
-        private readonly DecouplingClock decoupledTrack;
+        private readonly DecouplingFramedClock decoupledTrack;
 
         [Resolved]
         private OsuConfigManager config { get; set; } = null!;
@@ -59,7 +59,7 @@ namespace osu.Game.Beatmaps
         {
             this.applyOffsets = applyOffsets;
 
-            decoupledTrack = new DecouplingClock(source) { AllowDecoupling = requireDecoupling };
+            decoupledTrack = new DecouplingFramedClock(source) { AllowDecoupling = requireDecoupling };
 
             // An interpolating clock is used to ensure precise time values even when the host audio subsystem is not reporting
             // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
@@ -110,9 +110,6 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
-            if (decoupledTrack.Source is IFrameBasedClock framedClock)
-                framedClock.ProcessFrame();
-
             finalClockSource.ProcessFrame();
 
             if (Clock.ElapsedFrameTime != 0)
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 808680b9e5..aab3afcd24 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Menu
             {
                 PrepareMenuLoad();
 
-                var decouplingClock = new DecouplingClock(UsingThemedIntro ? Track : null);
+                var decouplingClock = new DecouplingFramedClock(UsingThemedIntro ? Track : null);
 
                 LoadComponentAsync(intro = new TrianglesIntroSequence(logo, () => FadeInBackground())
                 {

From 292273edbe6e14671c6ef03e6a44504b20736c23 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 23 Sep 2023 06:31:26 +0300
Subject: [PATCH 1537/2100] Add test scene

---
 osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
index ac80463d3a..97e1cae11c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
@@ -64,7 +64,8 @@ namespace osu.Game.Tests.Visual.Online
             new[] { "Plain", "This is plain comment" },
             new[] { "Pinned", "This is pinned comment" },
             new[] { "Link", "Please visit https://osu.ppy.sh" },
-
+            new[] { "Big Image", "![](Backgrounds/bg1)" },
+            new[] { "Small Image", "![](Cursor/cursortrail)" },
             new[]
             {
                 "Heading", @"# Heading 1

From 7c40072c4707a9fab3b3bf4c8ce743ddc871e3e7 Mon Sep 17 00:00:00 2001
From: Fabian van Oeffelt <fabiano2002@gmx.de>
Date: Sat, 23 Sep 2023 13:18:49 +0200
Subject: [PATCH 1538/2100] Get first Spinner,Slider or HitCircle instead of
 only HitCircle Fixes bug

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index b74b722bad..49c6fa65ed 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -61,11 +61,11 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
         {
+            OsuHitObject firstObject = drawableRuleset.Beatmap.HitObjects.Where(o => o is Spinner || o is Slider || o is HitCircle).First();
             // 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
-            bubbleSize = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.90f);
-            bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimePreempt * 2;
-
+            bubbleSize = (float)firstObject.Radius * 1.90f;
+            bubbleFade = firstObject.TimePreempt * 2;
             // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
             drawableRuleset.Playfield.DisplayJudgements.Value = false;
 

From 734ee0e68b62ec90c9ebf0d71de460e1211c3235 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 24 Sep 2023 02:22:50 +0300
Subject: [PATCH 1539/2100] Simplify code

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 49c6fa65ed..9c0e43e96f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -61,11 +61,13 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
         {
-            OsuHitObject firstObject = drawableRuleset.Beatmap.HitObjects.Where(o => o is Spinner || o is Slider || o is HitCircle).First();
+            OsuHitObject firstObject = drawableRuleset.Beatmap.HitObjects.First();
+
             // 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
             bubbleSize = (float)firstObject.Radius * 1.90f;
             bubbleFade = firstObject.TimePreempt * 2;
+
             // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
             drawableRuleset.Playfield.DisplayJudgements.Value = false;
 

From 3c62521e69ff091b54cf9685eaa000fed1fd81ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 Sep 2023 10:50:07 +0900
Subject: [PATCH 1540/2100] Fix OAuth refresh attempt when no network available
 causing full logout

---
 osu.Game/Online/API/OAuth.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs
index 58306c1938..1f26ab5458 100644
--- a/osu.Game/Online/API/OAuth.cs
+++ b/osu.Game/Online/API/OAuth.cs
@@ -99,9 +99,14 @@ namespace osu.Game.Online.API
                     return true;
                 }
             }
+            catch (HttpRequestException)
+            {
+                // Network failure.
+                return false;
+            }
             catch
             {
-                //todo: potentially only kill the refresh token on certain exception types.
+                // Force a full re-reauthentication.
                 Token.Value = null;
                 return false;
             }

From 793d1bf9706dcbf6b26363b3085283898bc3033c Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 25 Sep 2023 12:52:49 +0200
Subject: [PATCH 1541/2100] Add ability to search for difficulty names

---
 .../Select/Carousel/CarouselBeatmap.cs        |  2 +
 osu.Game/Screens/Select/FilterCriteria.cs     | 47 ++++++++++++-------
 osu.Game/Screens/Select/FilterQueryParser.cs  | 19 ++++++++
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 6917bd1da2..f433e71cc3 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -64,6 +64,8 @@ namespace osu.Game.Screens.Select.Carousel
 
             if (!match) return false;
 
+            match &= criteria.DifficultySearchTerms.All(term => term.Matches(BeatmapInfo.DifficultyName));
+
             if (criteria.SearchTerms.Length > 0)
             {
                 var searchableTerms = BeatmapInfo.GetSearchableTerms();
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index a2ae114126..aa3909fa0e 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Screens.Select
         };
 
         public OptionalTextFilter[] SearchTerms = Array.Empty<OptionalTextFilter>();
+        public OptionalTextFilter[] DifficultySearchTerms = Array.Empty<OptionalTextFilter>();
 
         public RulesetInfo? Ruleset;
         public bool AllowConvertedBeatmaps;
@@ -64,24 +65,7 @@ namespace osu.Game.Screens.Select
             {
                 searchText = value;
 
-                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();
+                SearchTerms = getTermsFromSearchText(value);
 
                 SearchNumber = null;
 
@@ -90,6 +74,11 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        public string DifficultySearchText
+        {
+            set => DifficultySearchTerms = getTermsFromSearchText(value);
+        }
+
         /// <summary>
         /// Hashes from the <see cref="BeatmapCollection"/> to filter to.
         /// </summary>
@@ -97,6 +86,28 @@ namespace osu.Game.Screens.Select
 
         public IRulesetFilterCriteria? RulesetCriteria { get; set; }
 
+        private static OptionalTextFilter[] getTermsFromSearchText(string searchText)
+        {
+            List<OptionalTextFilter> terms = new List<OptionalTextFilter>();
+
+            string remainingText = searchText;
+
+            // 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
+            }));
+
+            return terms.ToArray();
+        }
+
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct
         {
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 1238173b41..797493189d 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -19,8 +19,27 @@ namespace osu.Game.Screens.Select
             @"\b(?<key>\w+)(?<op>(:|=|(>|<)(:|=)?))(?<value>("".*""[!]?)|(\S*))",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
+        private static readonly Regex difficulty_query_syntax_regex = new Regex(
+            @"(\s|^)((\[(?>\[(?<level>)|[^[\]]+|\](?<-level>))*(?(level)(?!))\](\s|$))|(\[.*))",
+            RegexOptions.Compiled);
+
         internal static void ApplyQueries(FilterCriteria criteria, string query)
         {
+            foreach (Match match in difficulty_query_syntax_regex.Matches(query))
+            {
+                // Trim the first character because it's always '[' (ignoring spaces)
+                string cleanDifficultyQuery = match.Value.Trim(' ')[1..];
+
+                if (cleanDifficultyQuery.EndsWith(']'))
+                    cleanDifficultyQuery = cleanDifficultyQuery[..^1];
+
+                criteria.DifficultySearchText = cleanDifficultyQuery;
+
+                // Insert whitespace if necessary so that the words before and after the difficulty query aren't joined together.
+                bool insertWhitespace = match.Value.StartsWith(' ') && match.Value.EndsWith(' ');
+                query = query.Replace(match.Value, insertWhitespace ? " " : "");
+            }
+
             foreach (Match match in query_syntax_regex.Matches(query))
             {
                 string key = match.Groups["key"].Value.ToLowerInvariant();

From ab57cbf6f5a1d438963469f4dea27974755559e7 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 25 Sep 2023 12:53:17 +0200
Subject: [PATCH 1542/2100] Add `TestSceneDifficultySearch`

---
 .../SongSelect/TestSceneDifficultySearch.cs   | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs

diff --git a/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs b/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
new file mode 100644
index 0000000000..63963d1101
--- /dev/null
+++ b/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
@@ -0,0 +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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Carousel;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.SongSelect
+{
+    public partial class TestSceneDifficultySearch : OsuTestScene
+    {
+        private static readonly (string title, string difficultyName)[] beatmaps =
+        {
+            ("Title1", "Diff1"),
+            ("Title1", "Diff2"),
+            ("My[Favourite]Song", "Expert"),
+            ("Title", "My Favourite Diff"),
+            ("Another One", "diff ]with [[] brackets]]]"),
+        };
+
+        [TestCase("[1]", new[] { 0 })]
+        [TestCase("[1", new[] { 0 })]
+        [TestCase("My[Favourite", new[] { 2 })]
+        [TestCase("My[Favourite]", new[] { 2 })]
+        [TestCase("My[Favourite]Song", new[] { 2 })]
+        [TestCase("Favourite]", new[] { 2 })]
+        [TestCase("[Diff", new[] { 0, 1, 3, 4 })]
+        [TestCase("[Diff]", new[] { 0, 1, 3, 4 })]
+        [TestCase("[Favourite]", new[] { 3 })]
+        [TestCase("Title1 [Diff]", new[] { 0, 1 })]
+        [TestCase("Title1[Diff]", new int[] { })]
+        [TestCase("[diff ]with]", new[] { 4 })]
+        [TestCase("[diff ]with [[] brackets]]]]", new[] { 4 })]
+        public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
+        {
+            var carouselBeatmaps = createCarouselBeatmaps().ToList();
+
+            AddStep("filter beatmaps", () =>
+            {
+                var criteria = new FilterCriteria();
+                FilterQueryParser.ApplyQueries(criteria, query);
+                carouselBeatmaps.ForEach(b => b.Filter(criteria));
+            });
+
+            AddAssert("filtered correctly", () => carouselBeatmaps.All(b =>
+            {
+                int index = carouselBeatmaps.IndexOf(b);
+
+                bool filtered = b.Filtered.Value;
+
+                return filtered != expectedBeatmapIndexes.Contains(index);
+            }));
+        }
+
+        private static IEnumerable<CarouselBeatmap> createCarouselBeatmaps()
+        {
+            return beatmaps.Select(info => new CarouselBeatmap(new BeatmapInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Title = info.title
+                },
+                DifficultyName = info.difficultyName
+            }));
+        }
+    }
+}

From 74896fd6b2f271dfd5ec01c01aa04526a72125c3 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 25 Sep 2023 13:38:47 +0200
Subject: [PATCH 1543/2100] Fix multiple difficulty search queries not working
 in some cases.

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 797493189d..58e25adb5b 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -25,8 +25,12 @@ namespace osu.Game.Screens.Select
 
         internal static void ApplyQueries(FilterCriteria criteria, string query)
         {
-            foreach (Match match in difficulty_query_syntax_regex.Matches(query))
+            while (true)
             {
+                var match = difficulty_query_syntax_regex.Matches(query).FirstOrDefault();
+
+                if (match is null) break;
+
                 // Trim the first character because it's always '[' (ignoring spaces)
                 string cleanDifficultyQuery = match.Value.Trim(' ')[1..];
 

From 59d3143645ce5af731bd52fc4a08fc12cc0268be Mon Sep 17 00:00:00 2001
From: Fabian van Oeffelt <fabiano2002@gmx.de>
Date: Mon, 25 Sep 2023 16:53:40 +0200
Subject: [PATCH 1544/2100] Fix SR/BPM Display in Playlist rooms

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 8d08de4168..cfae890323 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -32,6 +32,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Match
 {
@@ -437,6 +438,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
             }
             else
             {
+                var localBeatmap = selected.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineID == selected.Beatmap.OnlineID);
+                UserModsSelectOverlay.Beatmap = beatmapManager.GetWorkingBeatmap(localBeatmap);
                 UserModsSection?.Show();
                 UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());
             }

From 2a3391d83b0e1832a8127d2b8a9b7b6f3e940efb Mon Sep 17 00:00:00 2001
From: Fabian van Oeffelt <fabiano2002@gmx.de>
Date: Mon, 25 Sep 2023 16:56:34 +0200
Subject: [PATCH 1545/2100] Remove unused namepace

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index cfae890323..f9482b810a 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -32,7 +32,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
-using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Match
 {

From 2040dcabe067a9daa54f6d6cab490d3c97f4ef45 Mon Sep 17 00:00:00 2001
From: Fabian van Oeffelt <fabiano2002@gmx.de>
Date: Mon, 25 Sep 2023 17:51:39 +0200
Subject: [PATCH 1546/2100] Improve Code Quality

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index f9482b810a..ab29ac6d06 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -437,7 +437,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             }
             else
             {
-                var localBeatmap = selected.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineID == selected.Beatmap.OnlineID);
+                var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineID == selected.Beatmap.OnlineID);
                 UserModsSelectOverlay.Beatmap = beatmapManager.GetWorkingBeatmap(localBeatmap);
                 UserModsSection?.Show();
                 UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());

From 57c00e728b534baec9ff0f035cbf279f6927d0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Sep 2023 14:11:14 +0200
Subject: [PATCH 1547/2100] Update classic scoring algorithm to closer match
 stable score V1

---
 .../Scoring/Legacy/ScoreInfoExtensions.cs     | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index 980b742585..ba56e32268 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -27,44 +27,37 @@ namespace osu.Game.Scoring.Legacy
                                      .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));
+            return convertStandardisedToClassic(rulesetId, score, maxBasicJudgements);
         }
 
         /// <summary>
-        /// Returns a ballpark multiplier which gives a similar "feel" for how large scores should get when displayed in "classic" mode.
+        /// Returns a ballpark "classic" score which gives a similar "feel" to stable.
         /// This is different per ruleset to match the different algorithms used in the scoring implementation.
         /// </summary>
-        private static double getStandardisedToClassicMultiplier(int rulesetId)
+        /// <remarks>
+        /// The coefficients chosen here were determined by a least-squares fit performed over all beatmaps
+        /// with the goal of minimising the relative error of maximum possible base score (without bonus).
+        /// The constant coefficients (100000, 1 / 10d) - while being detrimental to the least-squares fit - are forced,
+        /// so that every 10 points in standardised mode converts to at least 1 point in classic mode.
+        /// This is done to account for bonus judgements in a way that does not reorder scores.
+        /// </remarks>
+        private static long convertStandardisedToClassic(int rulesetId, long standardisedTotalScore, int objectCount)
         {
-            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;
+                    return (long)Math.Round((objectCount * objectCount * 32.57 + 100000) * standardisedTotalScore / ScoreProcessor.MAX_SCORE);
 
                 case 1:
-                    multiplier = 22;
-                    break;
+                    return (long)Math.Round((objectCount * 1109 + 100000) * standardisedTotalScore / ScoreProcessor.MAX_SCORE);
 
                 case 2:
-                    multiplier = 28;
-                    break;
+                    return (long)Math.Round(Math.Pow(standardisedTotalScore / ScoreProcessor.MAX_SCORE * objectCount, 2) * 21.62 + standardisedTotalScore / 10d);
 
                 case 3:
-                    multiplier = 16;
-                    break;
+                default:
+                    return standardisedTotalScore;
             }
-
-            return multiplier;
         }
 
         public static int? GetCountGeki(this ScoreInfo scoreInfo)

From 72c61c3a6a879d66221bf85ed697bd5c7b7d7545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 25 Sep 2023 19:14:22 +0200
Subject: [PATCH 1548/2100] Update osu! scoring tests to match updated formulae

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index e5e96d2033..17a4c80f7f 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -45,9 +45,9 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [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, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.Ok, 2)]
-        [TestCase(ScoringMode.Classic, HitResult.Great, 36)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, 11_670)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, 23_341)]
+        [TestCase(ScoringMode.Classic, HitResult.Great, 100_033)]
         public void TestSingleOsuHit(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
         {
             scoreProcessor.ApplyBeatmap(beatmap);
@@ -84,17 +84,17 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [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, 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.Meh, HitResult.Great, 7_975)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 15_949)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 30_398)]
+        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 49_546)]
+        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 49_546)]
         [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 11)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 54_189)]
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 9)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 36)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 36)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 49_289)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 100_003)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 100_015)]
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
         {
             var minResult = new TestJudgement(hitResult).MinResult;

From 567bc8fcd346573f1b9086f6636c2020624bc04d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 14:13:51 +0900
Subject: [PATCH 1549/2100] Ensure `DrawableStoryboardSprite`'s texture size
 propagates corectly on skin change

---
 .../Storyboards/Drawables/DrawableStoryboardSprite.cs    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index ad344b6bd4..87c09c3e5e 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -104,7 +104,14 @@ namespace osu.Game.Storyboards.Drawables
             Sprite.ApplyTransforms(this);
         }
 
-        private void skinSourceChanged() => Texture = skin.GetTexture(Sprite.Path) ?? textureStore.Get(Sprite.Path);
+        private void skinSourceChanged()
+        {
+            // Setting texture will only update the size if it's zero.
+            // So let's force an update by setting to zero.
+            Size = Vector2.Zero;
+
+            Texture = skin.GetTexture(Sprite.Path) ?? textureStore.Get(Sprite.Path);
+        }
 
         protected override void Dispose(bool isDisposing)
         {

From d1d82d2b4952a179b5d55ac6f1ed144d07770993 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 15:00:56 +0900
Subject: [PATCH 1550/2100] Improve notification display when score import
 fails

---
 osu.Game/Database/RealmArchiveModelImporter.cs | 2 +-
 osu.Game/Scoring/ScoreImporter.cs              | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmArchiveModelImporter.cs b/osu.Game/Database/RealmArchiveModelImporter.cs
index 9d06c14b4b..d2de00d476 100644
--- a/osu.Game/Database/RealmArchiveModelImporter.cs
+++ b/osu.Game/Database/RealmArchiveModelImporter.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Database
                     return imported;
                 }
 
-                notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import failed!";
+                notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import failed! Check logs for more information.";
                 notification.State = ProgressNotificationState.Cancelled;
             }
             else
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index b85b6a066e..5af53c6f7b 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -62,6 +62,11 @@ namespace osu.Game.Scoring
                     api.Queue(req);
                     return null;
                 }
+                catch (Exception)
+                {
+                    Logger.Log($@"Score '{archive.Name}' failed to import: failed to parse replay headers.", LoggingTarget.Database);
+                    return null;
+                }
             }
         }
 

From ae31a8fadfaf92bf477f050b3f02f5b4fc267839 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 16:19:53 +0900
Subject: [PATCH 1551/2100] Reduce delay before loading beatmap after selection
 change at song select

This was originally set high because of performance concerns. We have
since improved things quite drastically. Even with a very low debounce
my song select is amazingly smooth.

This is about as low as we can got unless we want chaos when key
repeating left/right arrows (it's not as bad as you think, maybe worth
testing during review and see if it feels more expected?).

Of note, stable has key repeat disabled on left/right arrows and zero
debounce.

Addresses concerns in https://github.com/ppy/osu/discussions/24916.
---
 osu.Game/Screens/Select/SongSelect.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 34ee0ae4e8..9c2b1cfe37 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -525,7 +525,11 @@ namespace osu.Game.Screens.Select
             if (beatmapInfoNoDebounce == null)
                 run();
             else
-                selectionChangedDebounce = Scheduler.AddDelayed(run, 200);
+            {
+                // Intentionally slightly higher than repeat_tick_rate to avoid loading songs when holding left / right arrows.
+                // See https://github.com/ppy/osu-framework/blob/master/osu.Framework/Input/InputManager.cs#L44
+                selectionChangedDebounce = Scheduler.AddDelayed(run, 80);
+            }
 
             if (beatmap?.Equals(beatmapInfoPrevious) != true)
             {

From b1561b650f13aee7db98dcda3a5e10dd67029604 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 16:39:36 +0900
Subject: [PATCH 1552/2100] Rename test scene, add xmldoc and increase scale
 factor to something absurdly high

---
 ...tDimensions.cs => TestScenePlayerMaxDimensions.cs} | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneGameplayElementDimensions.cs => TestScenePlayerMaxDimensions.cs} (83%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
similarity index 83%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
rename to osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index ff7cf2a124..0d7a114c28 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -14,7 +14,14 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public partial class TestSceneGameplayElementDimensions : TestSceneAllRulesetPlayers
+    /// <summary>
+    /// Upscales all gameplay sprites by a huge amount, to aid in manually checking skin texture size limits
+    /// on individual elements.
+    /// </summary>
+    /// <remarks>
+    /// The HUD is hidden as it does't really affect game balance if HUD elements are larger than they should be.
+    /// </remarks>
+    public partial class TestScenePlayerMaxDimensions : TestSceneAllRulesetPlayers
     {
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
@@ -61,7 +68,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
 
                 if (texture != null)
-                    texture.ScaleAdjust /= 5f;
+                    texture.ScaleAdjust /= 40f;
 
                 return texture;
             }

From 5150c5a64369ead0388136bfee902ffe71983c04 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 16:58:50 +0900
Subject: [PATCH 1553/2100] Adjust osu!mania "major" barlines to be less
 visually distracting

Applies to both "triangles" and "argon" skins.
---
 .../Skinning/Default/DefaultBarLine.cs        | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
index cd85901a65..806b9e0f93 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -33,25 +34,28 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
                 RelativeSizeAxes = Axes.Both,
             });
 
-            Vector2 size = new Vector2(22, 6);
-            const float line_offset = 4;
+            const float major_extension = 10;
 
-            AddInternal(leftAnchor = new Circle
+            AddInternal(leftAnchor = new Box
             {
                 Name = "Left anchor",
+                Blending = BlendingParameters.Additive,
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreRight,
-                Size = size,
-                X = -line_offset,
+                Width = major_extension,
+                RelativeSizeAxes = Axes.Y,
+                Colour = ColourInfo.GradientHorizontal(Colour4.Transparent, Colour4.White),
             });
 
-            AddInternal(rightAnchor = new Circle
+            AddInternal(rightAnchor = new Box
             {
                 Name = "Right anchor",
+                Blending = BlendingParameters.Additive,
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreLeft,
-                Size = size,
-                X = line_offset,
+                Width = major_extension,
+                RelativeSizeAxes = Axes.Y,
+                Colour = ColourInfo.GradientHorizontal(Colour4.White, Colour4.Transparent),
             });
 
             major = ((DrawableBarLine)drawableHitObject).Major.GetBoundCopy();
@@ -66,7 +70,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
         private void updateMajor(ValueChangedEvent<bool> major)
         {
             mainLine.Alpha = major.NewValue ? 0.5f : 0.2f;
-            leftAnchor.Alpha = rightAnchor.Alpha = major.NewValue ? 1 : 0;
+            leftAnchor.Alpha = rightAnchor.Alpha = major.NewValue ? mainLine.Alpha * 0.3f : 0;
         }
     }
 }

From 9949480ccd8d3ecca504cf58dfb2aabe8dbdd441 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 17:06:51 +0900
Subject: [PATCH 1554/2100] Add minor edge smoothing to fix flickering of
 barlines

In most cases.

Closes https://github.com/ppy/osu/issues/15184.
---
 osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
index 806b9e0f93..ef75e9df11 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
@@ -26,9 +26,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
         {
             RelativeSizeAxes = Axes.Both;
 
+            // Avoid flickering due to no anti-aliasing of boxes by default.
+            var edgeSmoothness = new Vector2(0.3f);
+
             AddInternal(mainLine = new Box
             {
                 Name = "Bar line",
+                EdgeSmoothness = edgeSmoothness,
                 Anchor = Anchor.BottomCentre,
                 Origin = Anchor.BottomCentre,
                 RelativeSizeAxes = Axes.Both,
@@ -39,6 +43,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
             AddInternal(leftAnchor = new Box
             {
                 Name = "Left anchor",
+                EdgeSmoothness = edgeSmoothness,
                 Blending = BlendingParameters.Additive,
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreRight,
@@ -50,6 +55,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
             AddInternal(rightAnchor = new Box
             {
                 Name = "Right anchor",
+                EdgeSmoothness = edgeSmoothness,
                 Blending = BlendingParameters.Additive,
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreLeft,

From 859155dda194066a5b06709112d5d4ec94004b78 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 26 Sep 2023 13:48:18 +0900
Subject: [PATCH 1555/2100] Cap maximum spinner RPM based on OD

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 5ef670c739..ca88701c07 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -18,6 +18,16 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class Spinner : OsuHitObject, IHasDuration
     {
+        /// <summary>
+        /// The RPM required to clear the spinner at ODs [ 0, 5, 10 ].
+        /// </summary>
+        private static readonly (int min, int mid, int max) clear_rpm_range = (90, 150, 225);
+
+        /// <summary>
+        /// The RPM required to complete the spinner and receive full score at ODs [ 0, 5, 10 ].
+        /// </summary>
+        private static readonly (int min, int mid, int max) complete_rpm_range = (250, 380, 430);
+
         public double EndTime
         {
             get => StartTime + Duration;
@@ -52,13 +62,16 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            const double maximum_rotations_per_second = 477f / 60f;
+            // The average RPS required over the length of the spinner to clear the spinner.
+            double minRps = IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, clear_rpm_range) / 60;
+
+            // The RPS required over the length of the spinner to receive full score (all normal + bonus ticks).
+            double maxRps = IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, complete_rpm_range) / 60;
 
             double secondsDuration = Duration / 1000;
-            double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, 1.5, 2.5, 3.75);
 
-            SpinsRequired = (int)(secondsDuration * minimumRotationsPerSecond);
-            MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration) - bonus_spins_gap;
+            SpinsRequired = (int)(minRps * secondsDuration);
+            MaximumBonusSpins = (int)(maxRps * secondsDuration) - bonus_spins_gap;
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)

From 40a548d372467047693b50352e25ebf217239775 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 17:30:30 +0900
Subject: [PATCH 1556/2100] Adjust new test scene to not be super broken

---
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index 0d7a114c28..a8ed44c7f8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
 
                 if (texture != null)
-                    texture.ScaleAdjust /= 40f;
+                    texture.ScaleAdjust /= 8f;
 
                 return texture;
             }

From 19a442a32a50f363204a51d81350d002f9c2355f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 26 Sep 2023 17:46:03 +0900
Subject: [PATCH 1557/2100] Fix incorrect change in taiko score simulator

---
 osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index f3f318f2f2..d4538d3c00 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             {
                 int oldScoreIncrease = scoreIncrease;
 
-                scoreIncrease += (int)(scoreIncrease / 35f * 2 * (difficultyPeppyStars + 1)) * (Math.Min(100, combo) / 10);
+                scoreIncrease += scoreIncrease / 35 * 2 * (difficultyPeppyStars + 1) * (Math.Min(100, combo) / 10);
 
                 if (hitObject is Swell)
                 {

From 05c9f0f9cc5fb811a341ec95e9cc18438afd7792 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 26 Sep 2023 18:11:27 +0900
Subject: [PATCH 1558/2100] Fix bonus requirement not considering number of
 normal ticks

---
 .../TestSceneSpinner.cs                       | 36 ++++++++++++++++++-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs      |  2 +-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 8cfd674f88..b1d9c453d6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -43,7 +43,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("Pitch starts low", () => getSpinningSample().Frequency.Value < 0.8);
             AddUntilStep("Pitch increases", () => getSpinningSample().Frequency.Value > 0.8);
 
-            PausableSkinnableSound getSpinningSample() => drawableSpinner.ChildrenOfType<PausableSkinnableSound>().FirstOrDefault(s => s.Samples.Any(i => i.LookupNames.Any(l => l.Contains("spinnerspin"))));
+            PausableSkinnableSound getSpinningSample() =>
+                drawableSpinner.ChildrenOfType<PausableSkinnableSound>().FirstOrDefault(s => s.Samples.Any(i => i.LookupNames.Any(l => l.Contains("spinnerspin"))));
         }
 
         [TestCase(false)]
@@ -64,6 +65,39 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("Short spinner implicitly completes", () => drawableSpinner.Progress == 1);
         }
 
+        [TestCase(0, 4, 6)]
+        [TestCase(5, 7, 10)]
+        [TestCase(10, 11, 8)]
+        public void TestSpinnerSpinRequirements(int od, int normalTicks, int bonusTicks)
+        {
+            Spinner spinner = null;
+
+            AddStep("add spinner", () => SetContents(_ =>
+            {
+                spinner = new Spinner
+                {
+                    StartTime = Time.Current,
+                    EndTime = Time.Current + 3000,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
+                    }
+                };
+
+                spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { OverallDifficulty = od });
+
+                return drawableSpinner = new TestDrawableSpinner(spinner, true)
+                {
+                    Anchor = Anchor.Centre,
+                    Depth = depthIndex++,
+                    Scale = new Vector2(0.75f)
+                };
+            }));
+
+            AddAssert("number of normal ticks matches", () => spinner.SpinsRequired, () => Is.EqualTo(normalTicks));
+            AddAssert("number of bonus ticks matches", () => spinner.MaximumBonusSpins, () => Is.EqualTo(bonusTicks));
+        }
+
         private Drawable testSingle(float circleSize, bool auto = false, double length = 3000)
         {
             const double delay = 2000;
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index ca88701c07..aca55c6bd9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             double secondsDuration = Duration / 1000;
 
             SpinsRequired = (int)(minRps * secondsDuration);
-            MaximumBonusSpins = (int)(maxRps * secondsDuration) - bonus_spins_gap;
+            MaximumBonusSpins = Math.Max(0, (int)(maxRps * secondsDuration) - SpinsRequired - bonus_spins_gap);
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)

From 12585c9f2764539a1feb60a6449cbf2c3c66bd0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Sep 2023 16:40:18 +0200
Subject: [PATCH 1559/2100] Fix flaky editor beatmap creation test

Came up as a failure when locally running tests for
ppy/osu-framework#6001 - but the test is actually a previously-known
flaky that I couldn't reproduce the failure of until the aforementioned
PR.

This appears to be a simple race; the test scene queries the track
length from update thread, but the length is actually set on the audio
thread. So it's not unreasonable that given unlucky timing, the length
will not be set by `TrackBass` before it is queried.

To fix, switch assert to until step. I'm generally not really willing
to give this more time of day until this change is proven insufficient.
---
 osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 920e560018..e6c3eea925 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Tests.Visual.Editing
             });
 
             AddAssert("track is not virtual", () => Beatmap.Value.Track is not TrackVirtual);
-            AddAssert("track length changed", () => Beatmap.Value.Track.Length > 60000);
+            AddUntilStep("track length changed", () => Beatmap.Value.Track.Length > 60000);
 
             AddStep("test play", () => Editor.TestGameplay());
 

From 84682b42273cae37a0f814a422ebc36b4970c340 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 16:49:59 +0900
Subject: [PATCH 1560/2100] Add test coverage of incorrect version on missing
 `skin.ini`

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 35 ++++++++++++-----------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 1c1ebe271e..ab3e099c3a 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("test skin", "skinner"), "skin.osk"));
 
             // When the import filename doesn't match, it should be appended (and update the skin.ini).
-            assertCorrectMetadata(import1, "test skin [skin]", "skinner", osu);
+            assertCorrectMetadata(import1, "test skin [skin]", "skinner", 1.0m, osu);
         });
 
         [Test]
@@ -36,7 +36,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("test skin", "skinner", iniFilename: "Skin.InI"), "skin.osk"));
 
             // When the import filename doesn't match, it should be appended (and update the skin.ini).
-            assertCorrectMetadata(import1, "test skin [skin]", "skinner", osu);
+            assertCorrectMetadata(import1, "test skin [skin]", "skinner", 1.0m, osu);
         });
 
         [Test]
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("test skin", "skinner", includeSectionHeader: false), "skin.osk"));
 
             // When the import filename doesn't match, it should be appended (and update the skin.ini).
-            assertCorrectMetadata(import1, "test skin [skin]", "skinner", osu);
+            assertCorrectMetadata(import1, "test skin [skin]", "skinner", 1.0m, osu);
         });
 
         [Test]
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("test skin", "skinner"), "test skin.osk"));
 
             // When the import filename matches it shouldn't be appended.
-            assertCorrectMetadata(import1, "test skin", "skinner", osu);
+            assertCorrectMetadata(import1, "test skin", "skinner", 1.0m, osu);
         });
 
         [Test]
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithNonIniFile(), "test skin.osk"));
 
             // When the import filename matches it shouldn't be appended.
-            assertCorrectMetadata(import1, "test skin", "Unknown", osu);
+            assertCorrectMetadata(import1, "test skin", "Unknown", SkinConfiguration.LATEST_VERSION, osu);
         });
 
         [Test]
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createEmptyOsk(), "test skin.osk"));
 
             // When the import filename matches it shouldn't be appended.
-            assertCorrectMetadata(import1, "test skin", "Unknown", osu);
+            assertCorrectMetadata(import1, "test skin", "Unknown", SkinConfiguration.LATEST_VERSION, osu);
         });
 
         #endregion
@@ -102,7 +102,7 @@ namespace osu.Game.Tests.Skins.IO
         public Task TestImportUpperCasedOskArchive() => runSkinTest(async osu =>
         {
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "name 1.OsK"));
-            assertCorrectMetadata(import1, "name 1", "author 1", osu);
+            assertCorrectMetadata(import1, "name 1", "author 1", 1.0m, osu);
 
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "name 1.oSK"));
 
@@ -115,14 +115,14 @@ namespace osu.Game.Tests.Skins.IO
             MemoryStream exportStream = new MemoryStream();
 
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "custom.osk"));
-            assertCorrectMetadata(import1, "name 1 [custom]", "author 1", osu);
+            assertCorrectMetadata(import1, "name 1 [custom]", "author 1", 1.0m, osu);
 
             await new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportToStreamAsync(import1, exportStream);
 
             string exportFilename = import1.GetDisplayString();
 
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(exportStream, $"{exportFilename}.osk"));
-            assertCorrectMetadata(import2, "name 1 [custom]", "author 1", osu);
+            assertCorrectMetadata(import2, "name 1 [custom]", "author 1", 1.0m, osu);
 
             assertImportedOnce(import1, import2);
         });
@@ -133,14 +133,14 @@ namespace osu.Game.Tests.Skins.IO
             MemoryStream exportStream = new MemoryStream();
 
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 『1』", "author 1"), "custom.osk"));
-            assertCorrectMetadata(import1, "name 『1』 [custom]", "author 1", osu);
+            assertCorrectMetadata(import1, "name 『1』 [custom]", "author 1", 1.0m, osu);
 
             await new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportToStreamAsync(import1, exportStream);
 
             string exportFilename = import1.GetDisplayString().GetValidFilename();
 
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(exportStream, $"{exportFilename}.osk"));
-            assertCorrectMetadata(import2, "name 『1』 [custom]", "author 1", osu);
+            assertCorrectMetadata(import2, "name 『1』 [custom]", "author 1", 1.0m, osu);
         });
 
         [Test]
@@ -150,7 +150,7 @@ namespace osu.Game.Tests.Skins.IO
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "my custom skin 1"), batchImport);
 
             assertImportedOnce(import1, import2);
-            assertCorrectMetadata(import1, "name 1 [my custom skin 1]", "author 1", osu);
+            assertCorrectMetadata(import1, "name 1 [my custom skin 1]", "author 1", 1.0m, osu);
         });
 
         #endregion
@@ -183,8 +183,8 @@ namespace osu.Game.Tests.Skins.IO
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("test skin v2.1", "skinner"), "skin.osk"));
 
             assertImportedBoth(import1, import2);
-            assertCorrectMetadata(import1, "test skin v2 [skin]", "skinner", osu);
-            assertCorrectMetadata(import2, "test skin v2.1 [skin]", "skinner", osu);
+            assertCorrectMetadata(import1, "test skin v2 [skin]", "skinner", 1.0m, osu);
+            assertCorrectMetadata(import2, "test skin v2.1 [skin]", "skinner", 1.0m, osu);
         });
 
         [Test]
@@ -194,8 +194,8 @@ namespace osu.Game.Tests.Skins.IO
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "my custom skin 2"));
 
             assertImportedBoth(import1, import2);
-            assertCorrectMetadata(import1, "name 1 [my custom skin 1]", "author 1", osu);
-            assertCorrectMetadata(import2, "name 1 [my custom skin 2]", "author 1", osu);
+            assertCorrectMetadata(import1, "name 1 [my custom skin 1]", "author 1", 1.0m, osu);
+            assertCorrectMetadata(import2, "name 1 [my custom skin 2]", "author 1", 1.0m, osu);
         });
 
         [Test]
@@ -264,7 +264,7 @@ namespace osu.Game.Tests.Skins.IO
 
         #endregion
 
-        private void assertCorrectMetadata(Live<SkinInfo> import1, string name, string creator, OsuGameBase osu)
+        private void assertCorrectMetadata(Live<SkinInfo> import1, string name, string creator, decimal version, OsuGameBase osu)
         {
             import1.PerformRead(i =>
             {
@@ -276,6 +276,7 @@ namespace osu.Game.Tests.Skins.IO
 
                 Assert.That(instance.Configuration.SkinInfo.Name, Is.EqualTo(name));
                 Assert.That(instance.Configuration.SkinInfo.Creator, Is.EqualTo(creator));
+                Assert.That(instance.Configuration.LegacyVersion, Is.EqualTo(version));
             });
         }
 

From c44cca2c23042554cfdc8062939917575c8f15d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 16:45:38 +0900
Subject: [PATCH 1561/2100] Fix skin version being incorrectly set to `1.0`
 when skin is missing `skin.ini`

Closes https://github.com/ppy/osu/issues/24939.
---
 osu.Game/Skinning/Skin.cs         | 9 ++++++++-
 osu.Game/Skinning/SkinImporter.cs | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 5ae4852288..ccf49d722f 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -105,7 +105,14 @@ namespace osu.Game.Skinning
                 Debug.Assert(Configuration != null);
             }
             else
-                Configuration = new SkinConfiguration();
+            {
+                Configuration = new SkinConfiguration
+                {
+                    // generally won't be hit as we always write a `skin.ini` on import, but best be safe than sorry.
+                    // see https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/Graphics/Skinning/SkinManager.cs#L297-L298
+                    LegacyVersion = SkinConfiguration.LATEST_VERSION,
+                };
+            }
 
             // skininfo files may be null for default skin.
             foreach (SkinComponentsContainerLookup.TargetArea skinnableTarget in Enum.GetValues<SkinComponentsContainerLookup.TargetArea>())
diff --git a/osu.Game/Skinning/SkinImporter.cs b/osu.Game/Skinning/SkinImporter.cs
index f2103a45c4..1b6fa7f4ed 100644
--- a/osu.Game/Skinning/SkinImporter.cs
+++ b/osu.Game/Skinning/SkinImporter.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Skinning
             string nameLine = @$"Name: {item.Name}";
             string authorLine = @$"Author: {item.Creator}";
 
-            string[] newLines =
+            List<string> newLines = new List<string>
             {
                 @"// The following content was automatically added by osu! during import, based on filename / folder metadata.",
                 @"[General]",
@@ -130,6 +130,10 @@ namespace osu.Game.Skinning
 
             if (existingFile == null)
             {
+                // skins without a skin.ini are supposed to import using the "latest version" spec.
+                // see https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/Graphics/Skinning/SkinManager.cs#L297-L298
+                newLines.Add($"Version: {SkinConfiguration.LATEST_VERSION}");
+
                 // In the case a skin doesn't have a skin.ini yet, let's create one.
                 writeNewSkinIni();
             }

From 3708e79577472e2c5284fc635eb65a9dd022545f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 16:55:03 +0900
Subject: [PATCH 1562/2100] Adjust logging to still expose the underlying
 exception

---
 osu.Game/Scoring/ScoreImporter.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 5af53c6f7b..2314dbb63b 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -52,19 +52,19 @@ namespace osu.Game.Scoring
                 {
                     return new DatabasedLegacyScoreDecoder(rulesets, beatmaps()).Parse(stream).ScoreInfo;
                 }
-                catch (LegacyScoreDecoder.BeatmapNotFoundException e)
+                catch (LegacyScoreDecoder.BeatmapNotFoundException notFound)
                 {
-                    Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
+                    Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{notFound.Hash}' could be found.", LoggingTarget.Database);
 
                     // In the case of a missing beatmap, let's attempt to resolve it and show a prompt to the user to download the required beatmap.
-                    var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = e.Hash });
-                    req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, e.Hash));
+                    var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = notFound.Hash });
+                    req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, notFound.Hash));
                     api.Queue(req);
                     return null;
                 }
-                catch (Exception)
+                catch (Exception e)
                 {
-                    Logger.Log($@"Score '{archive.Name}' failed to import: failed to parse replay headers.", LoggingTarget.Database);
+                    Logger.Log($@"Failed to parse headers of score '{archive.Name}': {e}.", LoggingTarget.Database);
                     return null;
                 }
             }

From 2481c0b64bc2158d710f8cdc57d6efcc4b05f5f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 17:02:47 +0900
Subject: [PATCH 1563/2100] Don't show replay import "missing beatmap"
 notifications during stable import

Closes https://github.com/ppy/osu/issues/24926.
---
 osu.Game/Beatmaps/BeatmapImporter.cs           |  2 +-
 osu.Game/Database/RealmArchiveModelImporter.cs |  5 +++--
 osu.Game/Scoring/ScoreImporter.cs              | 14 +++++++++-----
 osu.Game/Skinning/SkinImporter.cs              |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index b497b8e8dc..e89e5339e1 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -280,7 +280,7 @@ namespace osu.Game.Beatmaps
 
         public override string HumanisedModelName => "beatmap";
 
-        protected override BeatmapSetInfo? CreateModel(ArchiveReader reader)
+        protected override BeatmapSetInfo? CreateModel(ArchiveReader reader, ImportParameters parameters)
         {
             // let's make sure there are actually .osu files to import.
             string? mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
diff --git a/osu.Game/Database/RealmArchiveModelImporter.cs b/osu.Game/Database/RealmArchiveModelImporter.cs
index 9d06c14b4b..581ed41f75 100644
--- a/osu.Game/Database/RealmArchiveModelImporter.cs
+++ b/osu.Game/Database/RealmArchiveModelImporter.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Database
 
             try
             {
-                model = CreateModel(archive);
+                model = CreateModel(archive, parameters);
 
                 if (model == null)
                     return null;
@@ -474,8 +474,9 @@ namespace osu.Game.Database
         /// Actual expensive population should be done in <see cref="Populate"/>; this should just prepare for duplicate checking.
         /// </summary>
         /// <param name="archive">The archive to create the model for.</param>
+        /// <param name="parameters">Parameters to further configure the import process.</param>
         /// <returns>A model populated with minimal information. Returning a null will abort importing silently.</returns>
-        protected abstract TModel? CreateModel(ArchiveReader archive);
+        protected abstract TModel? CreateModel(ArchiveReader archive, ImportParameters parameters);
 
         /// <summary>
         /// Populate the provided model completely from the given archive.
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index b85b6a066e..28e70cff4f 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Scoring
             this.api = api;
         }
 
-        protected override ScoreInfo? CreateModel(ArchiveReader archive)
+        protected override ScoreInfo? CreateModel(ArchiveReader archive, ImportParameters parameters)
         {
             string name = archive.Filenames.First(f => f.EndsWith(".osr", StringComparison.OrdinalIgnoreCase));
 
@@ -56,10 +56,14 @@ namespace osu.Game.Scoring
                 {
                     Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
 
-                    // In the case of a missing beatmap, let's attempt to resolve it and show a prompt to the user to download the required beatmap.
-                    var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = e.Hash });
-                    req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, e.Hash));
-                    api.Queue(req);
+                    if (!parameters.Batch)
+                    {
+                        // In the case of a missing beatmap, let's attempt to resolve it and show a prompt to the user to download the required beatmap.
+                        var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = e.Hash });
+                        req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, e.Hash));
+                        api.Queue(req);
+                    }
+
                     return null;
                 }
             }
diff --git a/osu.Game/Skinning/SkinImporter.cs b/osu.Game/Skinning/SkinImporter.cs
index f2103a45c4..b543197296 100644
--- a/osu.Game/Skinning/SkinImporter.cs
+++ b/osu.Game/Skinning/SkinImporter.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
 
         protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path).ToLowerInvariant() == @".osk";
 
-        protected override SkinInfo CreateModel(ArchiveReader archive) => new SkinInfo { Name = archive.Name ?? @"No name" };
+        protected override SkinInfo? CreateModel(ArchiveReader archive, ImportParameters parameters) => new SkinInfo { Name = archive.Name ?? @"No name" };
 
         private const string unknown_creator_string = @"Unknown";
 

From 3705c4c8d5b9cac2422ab1cb8e44244c1f5de085 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 17:16:45 +0900
Subject: [PATCH 1564/2100] Avoid potentially incorrect size adjustment when
 texture doesn't change

---
 .../Storyboards/Drawables/DrawableStoryboardSprite.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 87c09c3e5e..68892a6fc1 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -106,11 +106,11 @@ namespace osu.Game.Storyboards.Drawables
 
         private void skinSourceChanged()
         {
-            // Setting texture will only update the size if it's zero.
-            // So let's force an update by setting to zero.
-            Size = Vector2.Zero;
-
             Texture = skin.GetTexture(Sprite.Path) ?? textureStore.Get(Sprite.Path);
+
+            // Setting texture will only update the size if it's zero.
+            // So let's force an explicit update.
+            Size = new Vector2(Texture.DisplayWidth, Texture.DisplayHeight);
         }
 
         protected override void Dispose(bool isDisposing)

From 175cf68bd6003e61210929642ebf501725ad4b4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 18:13:07 +0900
Subject: [PATCH 1565/2100] Avoid re-fetching `WorkingBeatmap`

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index ab29ac6d06..2974035127 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -437,8 +437,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             }
             else
             {
-                var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineID == selected.Beatmap.OnlineID);
-                UserModsSelectOverlay.Beatmap = beatmapManager.GetWorkingBeatmap(localBeatmap);
+                UserModsSelectOverlay.Beatmap = Beatmap.Value;
                 UserModsSection?.Show();
                 UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());
             }

From a639e51ddb8c0de208ea5a6f7b54ffff5487370e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 18:17:25 +0900
Subject: [PATCH 1566/2100] Fix value not updating after missing beatmap is
 imported

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2974035127..b8887b3161 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -437,7 +437,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
             }
             else
             {
-                UserModsSelectOverlay.Beatmap = Beatmap.Value;
                 UserModsSection?.Show();
                 UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());
             }
@@ -453,7 +452,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
             var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineID == beatmap.OnlineID);
 
-            Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
+            UserModsSelectOverlay.Beatmap = Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
         protected virtual void UpdateMods()

From e314913aeb0f509b526198af5871ea49269c5952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Sep 2023 11:18:38 +0200
Subject: [PATCH 1567/2100] Handle null texture case

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 68892a6fc1..ec875219b6 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Storyboards.Drawables
 
             // Setting texture will only update the size if it's zero.
             // So let's force an explicit update.
-            Size = new Vector2(Texture.DisplayWidth, Texture.DisplayHeight);
+            Size = new Vector2(Texture?.DisplayWidth ?? 0, Texture?.DisplayHeight ?? 0);
         }
 
         protected override void Dispose(bool isDisposing)

From 16e752e07d9d2d37d0ddeb4f849c6a900cc0321d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 18:54:47 +0900
Subject: [PATCH 1568/2100] Add basic structure and test coverage for extended
 info on mod icon

---
 .../Visual/UserInterface/TestSceneModIcon.cs  | 52 +++++++++++++++++++
 osu.Game/Rulesets/Mods/IMod.cs                |  6 +++
 osu.Game/Rulesets/Mods/Mod.cs                 |  3 ++
 osu.Game/Rulesets/Mods/ModRateAdjust.cs       |  2 +
 osu.Game/Rulesets/UI/ModIcon.cs               | 37 +++++++++++--
 5 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
index 897d5fd9f5..15b3e5f310 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
@@ -1,10 +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.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.UI;
@@ -25,6 +29,54 @@ namespace osu.Game.Tests.Visual.UserInterface
                     ChildrenEnumerable = Ruleset.Value.CreateInstance().CreateAllMods().Select(m => new ModIcon(m)),
                 };
             });
+
+            AddStep("toggle selected", () =>
+            {
+                foreach (var icon in this.ChildrenOfType<ModIcon>())
+                    icon.Selected.Toggle();
+            });
+        }
+
+        [Test]
+        public void TestShowRateAdjusts()
+        {
+            AddStep("create mod icons", () =>
+            {
+                Child = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Full,
+                    ChildrenEnumerable = Ruleset.Value.CreateInstance().CreateAllMods()
+                                                .OfType<ModRateAdjust>()
+                                                .SelectMany((m) =>
+                                                {
+                                                    List<ModIcon> icons = new List<ModIcon> { new ModIcon(m) };
+
+                                                    for (double i = m.SpeedChange.MinValue; i < m.SpeedChange.MaxValue; i += m.SpeedChange.Precision * 10)
+                                                    {
+                                                        m = (ModRateAdjust)m.DeepClone();
+                                                        m.SpeedChange.Value = i;
+                                                        icons.Add(new ModIcon(m));
+                                                    }
+
+                                                    return icons;
+                                                }),
+                };
+            });
+
+            AddStep("adjust rates", () =>
+            {
+                foreach (var icon in this.ChildrenOfType<ModIcon>())
+                {
+                    if (icon.Mod is ModRateAdjust rateAdjust)
+                    {
+                        if (RNG.NextDouble() > 0.9)
+                            rateAdjust.SpeedChange.Value = rateAdjust.SpeedChange.Default;
+                        else
+                            rateAdjust.SpeedChange.Value = RNG.NextDouble(rateAdjust.SpeedChange.MinValue, rateAdjust.SpeedChange.MaxValue);
+                    }
+                }
+            });
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/Mods/IMod.cs b/osu.Game/Rulesets/Mods/IMod.cs
index 05b2510e53..06c470ff2a 100644
--- a/osu.Game/Rulesets/Mods/IMod.cs
+++ b/osu.Game/Rulesets/Mods/IMod.cs
@@ -19,6 +19,12 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         string Name { get; }
 
+        /// <summary>
+        /// Short import information to display on the mod icon. For example, a rate adjust mod's rate
+        /// or similarly important setting.
+        /// </summary>
+        string ExtendedIconInformation { get; }
+
         /// <summary>
         /// The user readable description of this mod.
         /// </summary>
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index a9ecf89df1..a0bdc9ff51 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Rulesets.Mods
 
         public abstract string Acronym { get; }
 
+        [JsonIgnore]
+        public virtual string ExtendedIconInformation => string.Empty;
+
         [JsonIgnore]
         public virtual IconUsage? Icon => null;
 
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index 7b55ba4ad0..5dad01e015 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -28,5 +28,7 @@ namespace osu.Game.Rulesets.Mods
         public override Type[] IncompatibleMods => new[] { typeof(ModTimeRamp), typeof(ModAdaptiveSpeed), typeof(ModRateAdjust) };
 
         public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N2}x";
+
+        public override string ExtendedIconInformation => SettingDescription;
     }
 }
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index bf212ad72f..58f7f2c90d 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Mods;
 using osuTK;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
 
 namespace osu.Game.Rulesets.UI
@@ -27,9 +28,9 @@ namespace osu.Game.Rulesets.UI
     {
         public readonly BindableBool Selected = new BindableBool();
 
-        private readonly SpriteIcon modIcon;
-        private readonly SpriteText modAcronym;
-        private readonly SpriteIcon background;
+        private SpriteIcon modIcon;
+        private SpriteText modAcronym;
+        private SpriteIcon background;
 
         private const float size = 80;
 
@@ -55,6 +56,10 @@ namespace osu.Game.Rulesets.UI
 
         private Color4 backgroundColour;
 
+        private Sprite extendedBackground;
+
+        private OsuSpriteText extendedText;
+
         /// <summary>
         /// Construct a new instance.
         /// </summary>
@@ -64,8 +69,12 @@ namespace osu.Game.Rulesets.UI
         {
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
             this.showTooltip = showTooltip;
+        }
 
-            Size = new Vector2(size);
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            AutoSizeAxes = Axes.Both;
 
             Children = new Drawable[]
             {
@@ -77,6 +86,23 @@ namespace osu.Game.Rulesets.UI
                     Icon = OsuIcon.ModBg,
                     Shadow = true,
                 },
+                extendedBackground = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
+                    X = size - 3,
+                    Size = new Vector2(120, 55),
+                },
+                extendedText = new OsuSpriteText
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Font = OsuFont.Default.With(size: 30f, weight: FontWeight.Bold),
+                    UseFullGlyphHeight = false,
+                    X = size,
+                    Text = mod.ExtendedIconInformation,
+                },
                 modAcronym = new OsuSpriteText
                 {
                     Origin = Anchor.Centre,
@@ -129,7 +155,8 @@ namespace osu.Game.Rulesets.UI
 
         private void updateColour()
         {
-            background.Colour = Selected.Value ? backgroundColour.Lighten(0.2f) : backgroundColour;
+            extendedText.Colour = background.Colour = Selected.Value ? backgroundColour.Lighten(0.2f) : backgroundColour;
+            extendedBackground.Colour = Selected.Value ? backgroundColour.Darken(2.4f) : backgroundColour.Darken(2.8f);
         }
     }
 }

From 192eb541c0df560b126aca56fa8a9d8eb0d1c166 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 19:03:02 +0900
Subject: [PATCH 1569/2100] Adjust sizing to work better with expansion (no
 more centre anchoring)

---
 osu.Game/Rulesets/UI/ModIcon.cs | 105 ++++++++++++++++++++------------
 1 file changed, 66 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 58f7f2c90d..7d1ca412a7 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Rulesets.UI
 
         private OsuSpriteText extendedText;
 
+        private Container extendedContent;
+
         /// <summary>
         /// Construct a new instance.
         /// </summary>
@@ -67,6 +69,9 @@ namespace osu.Game.Rulesets.UI
         /// <param name="showTooltip">Whether a tooltip describing the mod should display on hover.</param>
         public ModIcon(IMod mod, bool showTooltip = true)
         {
+            AutoSizeAxes = Axes.X;
+            Height = size;
+
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
             this.showTooltip = showTooltip;
         }
@@ -74,52 +79,68 @@ namespace osu.Game.Rulesets.UI
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
-            AutoSizeAxes = Axes.Both;
-
             Children = new Drawable[]
             {
-                background = new SpriteIcon
+                new Container
                 {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Name = "main content",
                     Size = new Vector2(size),
-                    Icon = OsuIcon.ModBg,
-                    Shadow = true,
+                    Children = new Drawable[]
+                    {
+                        background = new SpriteIcon
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Size = new Vector2(size),
+                            Icon = OsuIcon.ModBg,
+                            Shadow = true,
+                        },
+                        modAcronym = new OsuSpriteText
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Colour = OsuColour.Gray(84),
+                            Alpha = 0,
+                            Font = OsuFont.Numeric.With(null, 22f),
+                            UseFullGlyphHeight = false,
+                            Text = mod.Acronym
+                        },
+                        modIcon = new SpriteIcon
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Colour = OsuColour.Gray(84),
+                            Size = new Vector2(45),
+                            Icon = FontAwesome.Solid.Question
+                        },
+                    }
                 },
-                extendedBackground = new Sprite
+                extendedContent = new Container
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
-                    X = size - 3,
+                    Name = "extended content",
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
                     Size = new Vector2(120, 55),
-                },
-                extendedText = new OsuSpriteText
-                {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    Font = OsuFont.Default.With(size: 30f, weight: FontWeight.Bold),
-                    UseFullGlyphHeight = false,
-                    X = size,
-                    Text = mod.ExtendedIconInformation,
-                },
-                modAcronym = new OsuSpriteText
-                {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    Colour = OsuColour.Gray(84),
-                    Alpha = 0,
-                    Font = OsuFont.Numeric.With(null, 22f),
-                    UseFullGlyphHeight = false,
-                    Text = mod.Acronym
-                },
-                modIcon = new SpriteIcon
-                {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    Colour = OsuColour.Gray(84),
-                    Size = new Vector2(45),
-                    Icon = FontAwesome.Solid.Question
+                    X = size - 23,
+                    Children = new Drawable[]
+                    {
+                        extendedBackground = new Sprite
+                        {
+                            Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
+                            Size = new Vector2(120, 55),
+                        },
+                        extendedText = new OsuSpriteText
+                        {
+                            Font = OsuFont.Default.With(size: 30f, weight: FontWeight.Bold),
+                            UseFullGlyphHeight = false,
+                            Text = mod.ExtendedIconInformation,
+                            X = 5,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                    }
                 },
             };
         }
@@ -151,6 +172,12 @@ namespace osu.Game.Rulesets.UI
 
             backgroundColour = colours.ForModType(value.Type);
             updateColour();
+
+            bool hasExtended = !string.IsNullOrEmpty(mod.ExtendedIconInformation);
+
+            extendedContent.Alpha = hasExtended ? 1 : 0;
+
+            extendedText.Text = mod.ExtendedIconInformation;
         }
 
         private void updateColour()

From 6e602929a4e3a59b88446cb7bb2c38b23ea3476a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 19:16:31 +0900
Subject: [PATCH 1570/2100] Add support for tracking settings changes

---
 osu.Game/Rulesets/UI/ModIcon.cs | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 7d1ca412a7..6101efc436 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -18,6 +18,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
+using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -44,6 +45,9 @@ namespace osu.Game.Rulesets.UI
             get => mod;
             set
             {
+                if (mod == value)
+                    return;
+
                 mod = value;
 
                 if (IsLoaded)
@@ -62,6 +66,8 @@ namespace osu.Game.Rulesets.UI
 
         private Container extendedContent;
 
+        private ModSettingChangeTracker modSettingsChangeTracker;
+
         /// <summary>
         /// Construct a new instance.
         /// </summary>
@@ -123,7 +129,7 @@ namespace osu.Game.Rulesets.UI
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     Size = new Vector2(120, 55),
-                    X = size - 23,
+                    X = size - 22,
                     Children = new Drawable[]
                     {
                         extendedBackground = new Sprite
@@ -156,6 +162,14 @@ namespace osu.Game.Rulesets.UI
 
         private void updateMod(IMod value)
         {
+            modSettingsChangeTracker?.Dispose();
+
+            if (value is Mod actualMod)
+            {
+                modSettingsChangeTracker = new ModSettingChangeTracker(new[] { actualMod });
+                modSettingsChangeTracker.SettingChanged = _ => updateMod(actualMod);
+            }
+
             modAcronym.Text = value.Acronym;
             modIcon.Icon = value.Icon ?? FontAwesome.Solid.Question;
 
@@ -185,5 +199,11 @@ namespace osu.Game.Rulesets.UI
             extendedText.Colour = background.Colour = Selected.Value ? backgroundColour.Lighten(0.2f) : backgroundColour;
             extendedBackground.Colour = Selected.Value ? backgroundColour.Darken(2.4f) : backgroundColour.Darken(2.8f);
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            modSettingsChangeTracker?.Dispose();
+        }
     }
 }

From 9f4df2988094a19838a7d8b5e574020c933ff607 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 19:16:23 +0900
Subject: [PATCH 1571/2100] Adjust fade durations at player loader to better
 hide mod jank

---
 osu.Game/Screens/Play/PlayerLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 872425e3fd..4054e456b9 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Screens.Play
 
             contentIn();
 
-            MetadataInfo.Delay(750).FadeIn(500);
+            MetadataInfo.Delay(750).FadeIn(500, Easing.OutQuint);
 
             // after an initial delay, start the debounced load check.
             // this will continue to execute even after resuming back on restart.
@@ -420,7 +420,7 @@ namespace osu.Game.Screens.Play
         {
             MetadataInfo.Loading = true;
 
-            content.FadeInFromZero(400);
+            content.FadeInFromZero(500, Easing.OutQuint);
             content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
 
             settingsScroll.FadeInFromZero(500, Easing.Out)

From 1246f151869a99a7d7f404cc6a3c80e522f98f82 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 19:21:10 +0900
Subject: [PATCH 1572/2100] Don't show extended information where it duplicates
 already visible information

---
 .../Online/Leaderboards/LeaderboardScoreTooltip.cs     |  2 +-
 osu.Game/Rulesets/UI/ModIcon.cs                        | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
index 0b2e401f57..48e6be1b17 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Online.Leaderboards
                     Spacing = new Vector2(2f, 0f),
                     Children = new Drawable[]
                     {
-                        new ModIcon(mod, showTooltip: false).With(icon =>
+                        new ModIcon(mod, showTooltip: false, showExtendedInformation: false).With(icon =>
                         {
                             icon.Origin = Anchor.CentreLeft;
                             icon.Anchor = Anchor.CentreLeft;
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 6101efc436..f13ed0d89d 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -38,7 +38,9 @@ namespace osu.Game.Rulesets.UI
         public virtual LocalisableString TooltipText => showTooltip ? ((mod as Mod)?.IconTooltip ?? mod.Name) : null;
 
         private IMod mod;
+
         private readonly bool showTooltip;
+        private readonly bool showExtendedInformation;
 
         public IMod Mod
         {
@@ -73,13 +75,15 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         /// <param name="mod">The mod to be displayed</param>
         /// <param name="showTooltip">Whether a tooltip describing the mod should display on hover.</param>
-        public ModIcon(IMod mod, bool showTooltip = true)
+        /// <param name="showExtendedInformation">Whether to display a mod's extended information, if available.</param>
+        public ModIcon(IMod mod, bool showTooltip = true, bool showExtendedInformation = true)
         {
             AutoSizeAxes = Axes.X;
             Height = size;
 
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
             this.showTooltip = showTooltip;
+            this.showExtendedInformation = showExtendedInformation;
         }
 
         [BackgroundDependencyLoader]
@@ -187,9 +191,9 @@ namespace osu.Game.Rulesets.UI
             backgroundColour = colours.ForModType(value.Type);
             updateColour();
 
-            bool hasExtended = !string.IsNullOrEmpty(mod.ExtendedIconInformation);
+            bool showExtended = showExtendedInformation && !string.IsNullOrEmpty(mod.ExtendedIconInformation);
 
-            extendedContent.Alpha = hasExtended ? 1 : 0;
+            extendedContent.Alpha = showExtended ? 1 : 0;
 
             extendedText.Text = mod.ExtendedIconInformation;
         }

From 83bf1efc1cff73e82356915e5963f454ff0342af Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Wed, 27 Sep 2023 16:29:29 +0300
Subject: [PATCH 1573/2100] Add `color` search alias for `colour` settings

---
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs             | 1 +
 .../Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index 065534eec4..30eca0636c 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Rulesets.Mania
                 },
                 new SettingsCheckbox
                 {
+                    Keywords = new[] { "color" },
                     LabelText = RulesetSettingsStrings.TimingBasedColouring,
                     Current = config.GetBindable<bool>(ManiaRulesetSetting.TimingBasedNoteColouring),
                 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
index 9efdfa9955..69566d85f4 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 },
                 new SettingsCheckbox
                 {
-                    Keywords = new[] { "combo", "override" },
+                    Keywords = new[] { "combo", "override", "color" },
                     LabelText = SkinSettingsStrings.BeatmapColours,
                     Current = config.GetBindable<bool>(OsuSetting.BeatmapColours)
                 },
@@ -47,6 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 },
                 new SettingsSlider<float>
                 {
+                    Keywords = new[] { "color" },
                     LabelText = GraphicsSettingsStrings.ComboColourNormalisation,
                     Current = comboColourNormalisation,
                     DisplayAsPercentage = true,

From edf40cc091191d3e4ffdac906992afcfdd1bbfed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Sep 2023 17:09:42 +0200
Subject: [PATCH 1574/2100] Fix nullability inspection

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

diff --git a/osu.Game/Skinning/SkinImporter.cs b/osu.Game/Skinning/SkinImporter.cs
index b543197296..40585a3fd2 100644
--- a/osu.Game/Skinning/SkinImporter.cs
+++ b/osu.Game/Skinning/SkinImporter.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
 
         protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path).ToLowerInvariant() == @".osk";
 
-        protected override SkinInfo? CreateModel(ArchiveReader archive, ImportParameters parameters) => new SkinInfo { Name = archive.Name ?? @"No name" };
+        protected override SkinInfo CreateModel(ArchiveReader archive, ImportParameters parameters) => new SkinInfo { Name = archive.Name ?? @"No name" };
 
         private const string unknown_creator_string = @"Unknown";
 

From 7908b36b398ebd75576fa797eeb05471c3afab08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 15:15:09 +0900
Subject: [PATCH 1575/2100] Flash dialog popup when attempting to exit editor
 while exit is being blocked

---
 osu.Game/Overlays/Dialog/PopupDialog.cs | 27 +++++++++++++++++++++++++
 osu.Game/Screens/Edit/Editor.cs         |  5 ++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 2e9087fdbd..36a9baac67 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -3,6 +3,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
+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.Containers;
@@ -28,6 +31,9 @@ namespace osu.Game.Overlays.Dialog
         private readonly Vector2 ringMinifiedSize = new Vector2(20f);
         private readonly Vector2 buttonsEnterSpacing = new Vector2(0f, 50f);
 
+        private readonly Box flashLayer;
+        private Sample flashSample = null!;
+
         private readonly Container content;
         private readonly Container ring;
         private readonly FillFlowContainer<PopupDialogButton> buttonsContainer;
@@ -208,6 +214,13 @@ namespace osu.Game.Overlays.Dialog
                             AutoSizeAxes = Axes.Y,
                             Direction = FillDirection.Vertical,
                         },
+                        flashLayer = new Box
+                        {
+                            Alpha = 0,
+                            RelativeSizeAxes = Axes.Both,
+                            Blending = BlendingParameters.Additive,
+                            Colour = Color4Extensions.FromHex(@"221a21"),
+                        },
                     },
                 },
             };
@@ -217,6 +230,12 @@ namespace osu.Game.Overlays.Dialog
             Show();
         }
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            flashSample = audio.Samples.Get(@"UI/default-select-disabled");
+        }
+
         /// <summary>
         /// Programmatically clicks the first <see cref="PopupDialogOkButton"/>.
         /// </summary>
@@ -232,6 +251,14 @@ namespace osu.Game.Overlays.Dialog
             Scheduler.AddOnce(() => Buttons.OfType<T>().FirstOrDefault()?.TriggerClick());
         }
 
+        public void Flash()
+        {
+            flashLayer.FadeInFromZero(80, Easing.OutQuint)
+                      .Then()
+                      .FadeOutFromOne(1500, Easing.OutQuint);
+            flashSample.Play();
+        }
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.Repeat) return false;
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 1cdca5754d..1b2e4785db 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -714,8 +714,11 @@ namespace osu.Game.Screens.Edit
                 }
 
                 // if the dialog is already displayed, block exiting until the user explicitly makes a decision.
-                if (dialogOverlay.CurrentDialog is PromptForSaveDialog)
+                if (dialogOverlay.CurrentDialog is PromptForSaveDialog saveDialog)
+                {
+                    saveDialog.Flash();
                     return true;
+                }
 
                 if (isNewBeatmap || HasUnsavedChanges)
                 {

From 4d5b2477dc92cf231f0221581ba16d30d29e9080 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 15:59:06 +0900
Subject: [PATCH 1576/2100] Fix failing song select tack transfer test by using
 a real track

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 43a7da0c28..6737ec9739 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -312,7 +312,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             createSongSelect();
 
-            addRulesetImportStep(0);
+            // We need to use one real beatmap to trigger the "same-track-transfer" logic that we're looking to test here.
+            // See `SongSelect.ensurePlayingSelected` and `WorkingBeatmap.TryTransferTrack`.
+            AddStep("import test beatmap", () => manager.Import(new ImportTask(TestResources.GetTestBeatmapForImport())).WaitSafely());
             addRulesetImportStep(0);
 
             checkMusicPlaying(true);
@@ -321,6 +323,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("manual pause", () => music.TogglePause());
             checkMusicPlaying(false);
+
+            // Track should not have changed, so music should still not be playing.
             AddStep("select next difficulty", () => songSelect!.Carousel.SelectNext(skipDifficulties: false));
             checkMusicPlaying(false);
 

From 7d74d84e6c24e6938d27fae0d7322e113df4be94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 16:47:41 +0900
Subject: [PATCH 1577/2100] Display mod icons using stable ordering

In discussion with nanaya, we likely want this now that we're adding the
ability for some icons to be extended. Historically mod icons have been
displayed in a stable but arbitrary order (based on their position in
the `Mods` enum).

This change aims to make them stable across lazer scores (where they are
stored based on .. the order the user selected them).
---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs     |  3 ++-
 .../Online/Leaderboards/LeaderboardScoreTooltip.cs   |  2 +-
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs    |  3 ++-
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs   |  2 +-
 .../Profile/Sections/Ranks/DrawableProfileScore.cs   | 12 +++++-------
 osu.Game/Rulesets/Mods/ModExtensions.cs              |  5 +++++
 osu.Game/Screens/Play/HUD/ModDisplay.cs              |  2 +-
 osu.Game/Screens/Play/HUD/ModFlowDisplay.cs          |  2 +-
 8 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 229cfd2aa6..136c9cc8e7 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -31,6 +31,7 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Utils;
 
 namespace osu.Game.Online.Leaderboards
@@ -242,7 +243,7 @@ namespace osu.Game.Online.Leaderboards
                                     Origin = Anchor.BottomRight,
                                     AutoSizeAxes = Axes.Both,
                                     Direction = FillDirection.Horizontal,
-                                    ChildrenEnumerable = Score.Mods.Select(mod => new ModIcon(mod) { Scale = new Vector2(0.375f) })
+                                    ChildrenEnumerable = Score.Mods.AsOrdered().Select(mod => new ModIcon(mod) { Scale = new Vector2(0.375f) })
                                 },
                             },
                         },
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
index 0b2e401f57..a8c3b7f587 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Online.Leaderboards
             topScoreStatistics.Clear();
             bottomScoreStatistics.Clear();
 
-            foreach (var mod in score.Mods)
+            foreach (var mod in score.Mods.AsOrdered())
             {
                 modStatistics.Add(new ModCell(mod));
             }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 615a3e39af..1fc997fdad 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -24,6 +24,7 @@ using osu.Framework.Localisation;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring.Drawables;
 
 namespace osu.Game.Overlays.BeatmapSet.Scores
@@ -195,7 +196,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 Direction = FillDirection.Horizontal,
                 AutoSizeAxes = Axes.Both,
                 Spacing = new Vector2(1),
-                ChildrenEnumerable = score.Mods.Select(m => new ModIcon(m)
+                ChildrenEnumerable = score.Mods.AsOrdered().Select(m => new ModIcon(m)
                 {
                     AutoSizeAxes = Axes.Both,
                     Scale = new Vector2(0.3f)
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index c92b79cb4d..72e590b009 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -275,7 +275,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 set
                 {
                     modsContainer.Clear();
-                    modsContainer.Children = value.Select(mod => new ModIcon(mod)
+                    modsContainer.Children = value.AsOrdered().Select(mod => new ModIcon(mod)
                     {
                         AutoSizeAxes = Axes.Both,
                         Scale = new Vector2(0.25f),
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 529e78a7cf..c26f2f19ba 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -15,6 +15,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring.Drawables;
 using osu.Game.Utils;
@@ -48,6 +49,8 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
         {
+            var ruleset = rulesets.GetRuleset(Score.RulesetID)?.CreateInstance() ?? throw new InvalidOperationException($"Ruleset with ID of {Score.RulesetID} not found locally");
+
             AddInternal(new ProfileItemContainer
             {
                 Children = new Drawable[]
@@ -132,14 +135,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                         Origin = Anchor.CentreRight,
                                         Direction = FillDirection.Horizontal,
                                         Spacing = new Vector2(2),
-                                        Children = Score.Mods.Select(mod =>
+                                        Children = Score.Mods.Select(m => m.ToMod(ruleset)).AsOrdered().Select(mod => new ModIcon(mod)
                                         {
-                                            var ruleset = rulesets.GetRuleset(Score.RulesetID) ?? throw new InvalidOperationException($"Ruleset with ID of {Score.RulesetID} not found locally");
-
-                                            return new ModIcon(mod.ToMod(ruleset.CreateInstance()))
-                                            {
-                                                Scale = new Vector2(0.35f)
-                                            };
+                                            Scale = new Vector2(0.35f)
                                         }).ToList(),
                                     }
                                 }
diff --git a/osu.Game/Rulesets/Mods/ModExtensions.cs b/osu.Game/Rulesets/Mods/ModExtensions.cs
index aa106f1203..bd2d42f3eb 100644
--- a/osu.Game/Rulesets/Mods/ModExtensions.cs
+++ b/osu.Game/Rulesets/Mods/ModExtensions.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;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Scoring;
@@ -28,5 +29,9 @@ namespace osu.Game.Rulesets.Mods
                 }
             };
         }
+
+        public static IEnumerable<Mod> AsOrdered(this IEnumerable<Mod> mods) => mods
+                                                                                .OrderBy(m => m.Type)
+                                                                                .ThenBy(m => m.Acronym);
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index c064cdb040..ba948b516e 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             iconsContainer.Clear();
 
-            foreach (Mod mod in mods.NewValue)
+            foreach (Mod mod in mods.NewValue.AsOrdered())
                 iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
 
             appearTransform();
diff --git a/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs b/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs
index 0b2ce10ac3..f9cf025b47 100644
--- a/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play.HUD
 
             Spacing = new Vector2(0, -12 * iconScale);
 
-            foreach (Mod mod in current.Value)
+            foreach (Mod mod in current.Value.AsOrdered())
             {
                 Add(new ModIcon(mod)
                 {

From 2800920ed97b129767bb5b1ac76a7b01c95d6f78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 16:10:55 +0900
Subject: [PATCH 1578/2100] Adjust font size slightly for better display when
 small

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

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index f13ed0d89d..a7bd8b4556 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.UI
                         },
                         extendedText = new OsuSpriteText
                         {
-                            Font = OsuFont.Default.With(size: 30f, weight: FontWeight.Bold),
+                            Font = OsuFont.Default.With(size: 34f, weight: FontWeight.Bold),
                             UseFullGlyphHeight = false,
                             Text = mod.ExtendedIconInformation,
                             X = 5,

From b8953e8ce1761d113e33193c489318012b148034 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 16:19:06 +0900
Subject: [PATCH 1579/2100] Code quality pass

---
 .../Visual/UserInterface/TestSceneModIcon.cs  |  9 ++++-----
 osu.Game/Rulesets/UI/ModIcon.cs               | 20 +++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
index 15b3e5f310..11cd122c99 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Direction = FillDirection.Full,
                     ChildrenEnumerable = Ruleset.Value.CreateInstance().CreateAllMods()
                                                 .OfType<ModRateAdjust>()
-                                                .SelectMany((m) =>
+                                                .SelectMany(m =>
                                                 {
                                                     List<ModIcon> icons = new List<ModIcon> { new ModIcon(m) };
 
@@ -70,10 +70,9 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     if (icon.Mod is ModRateAdjust rateAdjust)
                     {
-                        if (RNG.NextDouble() > 0.9)
-                            rateAdjust.SpeedChange.Value = rateAdjust.SpeedChange.Default;
-                        else
-                            rateAdjust.SpeedChange.Value = RNG.NextDouble(rateAdjust.SpeedChange.MinValue, rateAdjust.SpeedChange.MaxValue);
+                        rateAdjust.SpeedChange.Value = RNG.NextDouble() > 0.9
+                            ? rateAdjust.SpeedChange.Default
+                            : RNG.NextDouble(rateAdjust.SpeedChange.MinValue, rateAdjust.SpeedChange.MaxValue);
                     }
                 }
             });
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index a7bd8b4556..8aee7e22e6 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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.Graphics;
 using osu.Framework.Allocation;
@@ -29,13 +27,13 @@ namespace osu.Game.Rulesets.UI
     {
         public readonly BindableBool Selected = new BindableBool();
 
-        private SpriteIcon modIcon;
-        private SpriteText modAcronym;
-        private SpriteIcon background;
+        private SpriteIcon modIcon = null!;
+        private SpriteText modAcronym = null!;
+        private SpriteIcon background = null!;
 
         private const float size = 80;
 
-        public virtual LocalisableString TooltipText => showTooltip ? ((mod as Mod)?.IconTooltip ?? mod.Name) : null;
+        public virtual LocalisableString TooltipText => showTooltip ? ((mod as Mod)?.IconTooltip ?? mod.Name) : string.Empty;
 
         private IMod mod;
 
@@ -58,17 +56,17 @@ namespace osu.Game.Rulesets.UI
         }
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         private Color4 backgroundColour;
 
-        private Sprite extendedBackground;
+        private Sprite extendedBackground = null!;
 
-        private OsuSpriteText extendedText;
+        private OsuSpriteText extendedText = null!;
 
-        private Container extendedContent;
+        private Container extendedContent = null!;
 
-        private ModSettingChangeTracker modSettingsChangeTracker;
+        private ModSettingChangeTracker? modSettingsChangeTracker;
 
         /// <summary>
         /// Construct a new instance.

From 2ff376daa42384d7b394bd0471fef91f94e3ed52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 18:30:38 +0900
Subject: [PATCH 1580/2100] Adjust to include shadow, and use new main
 background sprite which includes shadow

---
 osu.Game/Rulesets/UI/ModIcon.cs | 85 +++++++++++++++++----------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 8aee7e22e6..f0b6a27bde 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -2,21 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK.Graphics;
 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.Cursor;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osuTK;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Localisation;
-using osu.Game.Configuration;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -29,9 +29,9 @@ namespace osu.Game.Rulesets.UI
 
         private SpriteIcon modIcon = null!;
         private SpriteText modAcronym = null!;
-        private SpriteIcon background = null!;
+        private Sprite background = null!;
 
-        private const float size = 80;
+        public static readonly Vector2 MOD_ICON_SIZE = new Vector2(80);
 
         public virtual LocalisableString TooltipText => showTooltip ? ((mod as Mod)?.IconTooltip ?? mod.Name) : string.Empty;
 
@@ -76,8 +76,9 @@ namespace osu.Game.Rulesets.UI
         /// <param name="showExtendedInformation">Whether to display a mod's extended information, if available.</param>
         public ModIcon(IMod mod, bool showTooltip = true, bool showExtendedInformation = true)
         {
+            // May expand due to expanded content, so autosize here.
             AutoSizeAxes = Axes.X;
-            Height = size;
+            Height = MOD_ICON_SIZE.Y;
 
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
             this.showTooltip = showTooltip;
@@ -89,21 +90,50 @@ namespace osu.Game.Rulesets.UI
         {
             Children = new Drawable[]
             {
+                extendedContent = new Container
+                {
+                    Name = "extended content",
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Size = new Vector2(116, MOD_ICON_SIZE.Y),
+                    X = MOD_ICON_SIZE.X - 22,
+                    Children = new Drawable[]
+                    {
+                        extendedBackground = new Sprite
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            FillMode = FillMode.Fit,
+                            Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            //Scale = SHADOW_FUDGE
+                        },
+                        extendedText = new OsuSpriteText
+                        {
+                            Font = OsuFont.Default.With(size: 34f, weight: FontWeight.Bold),
+                            UseFullGlyphHeight = false,
+                            Text = mod.ExtendedIconInformation,
+                            X = 5,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                    }
+                },
                 new Container
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     Name = "main content",
-                    Size = new Vector2(size),
+                    Size = MOD_ICON_SIZE,
                     Children = new Drawable[]
                     {
-                        background = new SpriteIcon
+                        background = new Sprite
                         {
-                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            FillMode = FillMode.Fit,
+                            Texture = textures.Get("Icons/BeatmapDetails/mod-icon"),
                             Anchor = Anchor.Centre,
-                            Size = new Vector2(size),
-                            Icon = OsuIcon.ModBg,
-                            Shadow = true,
+                            Origin = Anchor.Centre,
                         },
                         modAcronym = new OsuSpriteText
                         {
@@ -125,31 +155,6 @@ namespace osu.Game.Rulesets.UI
                         },
                     }
                 },
-                extendedContent = new Container
-                {
-                    Name = "extended content",
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    Size = new Vector2(120, 55),
-                    X = size - 22,
-                    Children = new Drawable[]
-                    {
-                        extendedBackground = new Sprite
-                        {
-                            Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
-                            Size = new Vector2(120, 55),
-                        },
-                        extendedText = new OsuSpriteText
-                        {
-                            Font = OsuFont.Default.With(size: 34f, weight: FontWeight.Bold),
-                            UseFullGlyphHeight = false,
-                            Text = mod.ExtendedIconInformation,
-                            X = 5,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        },
-                    }
-                },
             };
         }
 

From d4cf6e100fbd42d35c418263e45f231ae6d5914e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 18:40:00 +0900
Subject: [PATCH 1581/2100] Update other usages of `OsuIcon.ModBg` and remove

---
 osu.Game/Graphics/OsuIcon.cs           |  4 +++-
 osu.Game/Rulesets/UI/ModSwitchSmall.cs | 24 +++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Graphics/OsuIcon.cs b/osu.Game/Graphics/OsuIcon.cs
index 1f4d6a62da..15af8f000b 100644
--- a/osu.Game/Graphics/OsuIcon.cs
+++ b/osu.Game/Graphics/OsuIcon.cs
@@ -89,6 +89,8 @@ namespace osu.Game.Graphics
         public static IconUsage ModSpunOut => Get(0xe046);
         public static IconUsage ModSuddenDeath => Get(0xe047);
         public static IconUsage ModTarget => Get(0xe048);
-        public static IconUsage ModBg => Get(0xe04a);
+
+        // Use "Icons/BeatmapDetails/mod-icon" instead
+        // public static IconUsage ModBg => Get(0xe04a);
     }
 }
diff --git a/osu.Game/Rulesets/UI/ModSwitchSmall.cs b/osu.Game/Rulesets/UI/ModSwitchSmall.cs
index b6058c16ce..927379c684 100644
--- a/osu.Game/Rulesets/UI/ModSwitchSmall.cs
+++ b/osu.Game/Rulesets/UI/ModSwitchSmall.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
@@ -23,8 +24,8 @@ namespace osu.Game.Rulesets.UI
 
         private readonly IMod mod;
 
-        private readonly SpriteIcon background;
-        private readonly SpriteIcon? modIcon;
+        private Drawable background = null!;
+        private SpriteIcon? modIcon;
 
         private Color4 activeForegroundColour;
         private Color4 inactiveForegroundColour;
@@ -36,19 +37,24 @@ namespace osu.Game.Rulesets.UI
         {
             this.mod = mod;
 
-            AutoSizeAxes = Axes.Both;
+            Size = new Vector2(DEFAULT_SIZE);
+        }
 
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures, OsuColour colours, OverlayColourProvider? colourProvider)
+        {
             FillFlowContainer contentFlow;
             ModSwitchTiny tinySwitch;
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
-                background = new SpriteIcon
+                background = new Sprite
                 {
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode = FillMode.Fit,
+                    Texture = textures.Get("Icons/BeatmapDetails/mod-icon"),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(DEFAULT_SIZE),
-                    Icon = OsuIcon.ModBg
                 },
                 contentFlow = new FillFlowContainer
                 {
@@ -78,11 +84,7 @@ namespace osu.Game.Rulesets.UI
                 });
                 tinySwitch.Scale = new Vector2(0.3f);
             }
-        }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, OverlayColourProvider? colourProvider)
-        {
             inactiveForegroundColour = colourProvider?.Background5 ?? colours.Gray3;
             activeForegroundColour = colours.ForModType(mod.Type);
 

From fc4390884fbb70260c88d76dc6e945b613600d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Sep 2023 12:02:57 +0200
Subject: [PATCH 1582/2100] Add `GetDisplayScore()` extension for
 `SoloScoreInfo`

To be used server-side for ppy/osu-queue-score-statistics#134.
---
 osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index 980b742585..2cf4d0f957 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Scoring.Legacy
@@ -16,6 +17,9 @@ namespace osu.Game.Scoring.Legacy
         public static long GetDisplayScore(this ScoreInfo scoreInfo, ScoringMode mode)
             => getDisplayScore(scoreInfo.Ruleset.OnlineID, scoreInfo.TotalScore, mode, scoreInfo.MaximumStatistics);
 
+        public static long GetDisplayScore(this SoloScoreInfo soloScoreInfo, ScoringMode mode)
+            => getDisplayScore(soloScoreInfo.RulesetID, soloScoreInfo.TotalScore, mode, soloScoreInfo.MaximumStatistics);
+
         private static long getDisplayScore(int rulesetId, long score, ScoringMode mode, IReadOnlyDictionary<HitResult, int> maximumStatistics)
         {
             if (mode == ScoringMode.Standardised)

From e0e222c1fa5fa0012d3de7936fff697a67140283 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 22:10:30 +0900
Subject: [PATCH 1583/2100] Include mention of what to do when not using field
 in xmldoc
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/Mods/IMod.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/IMod.cs b/osu.Game/Rulesets/Mods/IMod.cs
index 06c470ff2a..ce2d123884 100644
--- a/osu.Game/Rulesets/Mods/IMod.cs
+++ b/osu.Game/Rulesets/Mods/IMod.cs
@@ -20,8 +20,9 @@ namespace osu.Game.Rulesets.Mods
         string Name { get; }
 
         /// <summary>
-        /// Short import information to display on the mod icon. For example, a rate adjust mod's rate
+        /// Short important information to display on the mod icon. For example, a rate adjust mod's rate
         /// or similarly important setting.
+        /// Use <see cref="string.Empty"/> if the icon should not display any additional info.
         /// </summary>
         string ExtendedIconInformation { get; }
 

From b1f680337167558d1d514dcf6b15c130ccaed5a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 22:11:03 +0900
Subject: [PATCH 1584/2100] Remove unused commented code
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/UI/ModIcon.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index f0b6a27bde..578db6dc5d 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -106,7 +106,6 @@ namespace osu.Game.Rulesets.UI
                             Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            //Scale = SHADOW_FUDGE
                         },
                         extendedText = new OsuSpriteText
                         {

From e4fd3b65f4f10d06ad69b812bef7bb5a64419437 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 22:18:28 +0900
Subject: [PATCH 1585/2100] Avoid recreating `ModSettingChangeTracker` unless
 required

---
 osu.Game/Rulesets/UI/ModIcon.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 578db6dc5d..8c7c380a59 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.UI
             if (value is Mod actualMod)
             {
                 modSettingsChangeTracker = new ModSettingChangeTracker(new[] { actualMod });
-                modSettingsChangeTracker.SettingChanged = _ => updateMod(actualMod);
+                modSettingsChangeTracker.SettingChanged = _ => updateExtendedInformation();
             }
 
             modAcronym.Text = value.Acronym;
@@ -193,10 +193,14 @@ namespace osu.Game.Rulesets.UI
             backgroundColour = colours.ForModType(value.Type);
             updateColour();
 
+            updateExtendedInformation();
+        }
+
+        private void updateExtendedInformation()
+        {
             bool showExtended = showExtendedInformation && !string.IsNullOrEmpty(mod.ExtendedIconInformation);
 
             extendedContent.Alpha = showExtended ? 1 : 0;
-
             extendedText.Text = mod.ExtendedIconInformation;
         }
 

From f340bb99e807801a1a4ee1c1b1e9790859a7a4eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 22:23:45 +0900
Subject: [PATCH 1586/2100] Nudge text right 1 pixel

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

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 8c7c380a59..5fd1507039 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.UI
                             Font = OsuFont.Default.With(size: 34f, weight: FontWeight.Bold),
                             UseFullGlyphHeight = false,
                             Text = mod.ExtendedIconInformation,
-                            X = 5,
+                            X = 6,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         },

From 39d5025969b41590fa6001cb498fa2a12a276d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Sep 2023 16:58:21 +0200
Subject: [PATCH 1587/2100] 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 049d4275a4..58e18d3187 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.928.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From c0728f0b2eeac4741cc236d44000221a75016c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Sep 2023 18:35:15 +0200
Subject: [PATCH 1588/2100] Replace local sort with new utility method

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

diff --git a/osu.Game/Overlays/Mods/ModSettingsArea.cs b/osu.Game/Overlays/Mods/ModSettingsArea.cs
index fe1d683d59..6158c2c70f 100644
--- a/osu.Game/Overlays/Mods/ModSettingsArea.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsArea.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Mods
         {
             modSettingsFlow.Clear();
 
-            foreach (var mod in SelectedMods.Value.OrderBy(mod => mod.Type).ThenBy(mod => mod.Acronym))
+            foreach (var mod in SelectedMods.Value.AsOrdered())
             {
                 var settings = mod.CreateSettingsControls().ToList();
 

From 9a49f44db0325178c9ef13d7e6ccc1347cc54c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Sep 2023 18:42:05 +0200
Subject: [PATCH 1589/2100] Use `AsOrdered()` when presenting mod presets too

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 2 +-
 osu.Game/Overlays/Mods/ModPresetTooltip.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index d755825a95..571021b0f8 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Overlays.Mods
 
         private void updateState()
         {
-            scrollContent.ChildrenEnumerable = saveableMods.Select(mod => new ModPresetRow(mod));
+            scrollContent.ChildrenEnumerable = saveableMods.AsOrdered().Select(mod => new ModPresetRow(mod));
             useCurrentModsButton.Enabled.Value = checkSelectedModsDiffersFromSaved();
         }
 
diff --git a/osu.Game/Overlays/Mods/ModPresetTooltip.cs b/osu.Game/Overlays/Mods/ModPresetTooltip.cs
index 8e8259de45..077bd14751 100644
--- a/osu.Game/Overlays/Mods/ModPresetTooltip.cs
+++ b/osu.Game/Overlays/Mods/ModPresetTooltip.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Mods
                 return;
 
             lastPreset = preset;
-            Content.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
+            Content.ChildrenEnumerable = preset.Mods.AsOrdered().Select(mod => new ModPresetRow(mod));
         }
 
         protected override void PopIn() => this.FadeIn(transition_duration, Easing.OutQuint);

From 9e90374a904b182eaf5e1020809fc09dab667d48 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 28 Sep 2023 16:48:29 -0700
Subject: [PATCH 1590/2100] Flash discard changes dialog popup when force
 quitting room/playlist creation with changes

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index b8887b3161..2cd8e45d28 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -371,8 +371,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 return true;
 
             // if the dialog is already displayed, block exiting until the user explicitly makes a decision.
-            if (dialogOverlay.CurrentDialog is ConfirmDiscardChangesDialog)
+            if (dialogOverlay.CurrentDialog is ConfirmDiscardChangesDialog discardChangesDialog)
+            {
+                discardChangesDialog.Flash();
                 return false;
+            }
 
             dialogOverlay.Push(new ConfirmDiscardChangesDialog(() =>
             {

From c0234ff254f0a4144abd5a893c1a3581aba9bbad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 12:44:26 +0900
Subject: [PATCH 1591/2100] Reduce approach circle's final opacity to match
 stable

Closes #24941.
---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 2f1cf57ebe..4de9a57acb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -191,7 +191,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             CirclePiece.FadeInFromZero(HitObject.TimeFadeIn);
 
-            ApproachCircle.FadeIn(Math.Min(HitObject.TimeFadeIn * 2, HitObject.TimePreempt));
+            ApproachCircle.FadeTo(0.9f, Math.Min(HitObject.TimeFadeIn * 2, HitObject.TimePreempt));
             ApproachCircle.ScaleTo(1f, HitObject.TimePreempt);
             ApproachCircle.Expire(true);
         }

From 81485c548c84226d4e6f59e9b7f221b376eb449d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 14:19:26 +0900
Subject: [PATCH 1592/2100] Move `LegacyLastTickOffset` specification to
 generation code and stop passing everywhere

---
 .../Beatmaps/CatchBeatmapConverter.cs         |  1 -
 .../Objects/JuiceStream.cs                    |  4 +---
 .../Editor/TestSceneSliderSplitting.cs        |  1 -
 .../Beatmaps/OsuBeatmapConverter.cs           |  1 -
 .../Sliders/SliderSelectionBlueprint.cs       |  1 -
 .../Mods/OsuModStrictTracking.cs              |  5 ++---
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  6 ++---
 .../Objects/SliderTailCircle.cs               |  2 +-
 .../Beatmaps/SliderEventGenerationTest.cs     | 16 +++++++-------
 .../Rulesets/Objects/Legacy/ConvertSlider.cs  |  4 +---
 .../Rulesets/Objects/SliderEventGenerator.cs  | 22 ++++++++++++++-----
 .../Objects/Types/IHasLegacyLastTickOffset.cs | 14 ------------
 12 files changed, 32 insertions(+), 45 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 5e8a0b1216..6a24c26844 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -41,7 +41,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         X = xPositionData?.X ?? 0,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
-                        LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0,
                         LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y,
                         SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1
                     }.Yield();
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 724bdc3401..87d316d36d 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Catch.Objects
             int nodeIndex = 0;
             SliderEventDescriptor? lastEvent = null;
 
-            foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken))
+            foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), cancellationToken))
             {
                 // generate tiny droplets since the last point
                 if (lastEvent != null)
@@ -162,7 +162,5 @@ namespace osu.Game.Rulesets.Catch.Objects
         public double Distance => Path.Distance;
 
         public IList<IList<HitSampleInfo>> NodeSamples { get; set; } = new List<IList<HitSampleInfo>>();
-
-        public double? LegacyLastTickOffset { get; set; }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index 8ba97892fe..7315344295 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -163,7 +163,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 slider = new Slider
                 {
                     Position = new Vector2(0, 50),
-                    LegacyLastTickOffset = 36, // This is necessary for undo to retain the sample control point
                     Path = new SliderPath(new[]
                     {
                         new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index f3aaf831d3..3c051a6bb1 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         Position = positionData?.Position ?? Vector2.Zero,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
-                        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,
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 6685507ee0..02023decd6 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -315,7 +315,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     StartTime = HitObject.StartTime,
                     Position = HitObject.Position + splitControlPoints[0].Position,
                     NewCombo = HitObject.NewCombo,
-                    LegacyLastTickOffset = HitObject.LegacyLastTickOffset,
                     Samples = HitObject.Samples.Select(s => s.With()).ToList(),
                     RepeatCount = HitObject.RepeatCount,
                     NodeSamples = HitObject.NodeSamples.Select(n => (IList<HitSampleInfo>)n.Select(s => s.With()).ToList()).ToList(),
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
index 9b5d405025..78062a0632 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
@@ -96,14 +96,13 @@ namespace osu.Game.Rulesets.Osu.Mods
                 Position = original.Position;
                 NewCombo = original.NewCombo;
                 ComboOffset = original.ComboOffset;
-                LegacyLastTickOffset = original.LegacyLastTickOffset;
                 TickDistanceMultiplier = original.TickDistanceMultiplier;
                 SliderVelocityMultiplier = original.SliderVelocityMultiplier;
             }
 
             protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
             {
-                var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken);
+                var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), cancellationToken);
 
                 foreach (var e in sliderEvents)
                 {
@@ -130,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                             });
                             break;
 
-                        case SliderEventType.LegacyLastTick:
+                        case SliderEventType.LastTick:
                             AddNested(TailCircle = new StrictTrackingSliderTailCircle(this)
                             {
                                 RepeatIndex = e.SpanIndex,
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index e05dbd8ea6..9736c69e17 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -71,8 +71,6 @@ namespace osu.Game.Rulesets.Osu.Objects
             }
         }
 
-        public double? LegacyLastTickOffset { get; set; }
-
         /// <summary>
         /// The position of the cursor at the point of completion of this <see cref="Slider"/> if it was hit
         /// with as few movements as possible. This is set and used by difficulty calculation.
@@ -179,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.CreateNestedHitObjects(cancellationToken);
 
-            var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken);
+            var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), cancellationToken);
 
             foreach (var e in sliderEvents)
             {
@@ -206,7 +204,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                         });
                         break;
 
-                    case SliderEventType.LegacyLastTick:
+                    case SliderEventType.LastTick:
                         // we need to use the LegacyLastTick here for compatibility reasons (difficulty).
                         // it is *okay* to use this because the TailCircle is not used for any meaningful purpose in gameplay.
                         // if this is to change, we should revisit this.
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index b4574791d2..fb81936837 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     /// <summary>
     /// Note that this should not be used for timing correctness.
-    /// See <see cref="SliderEventType.LegacyLastTick"/> usage in <see cref="Slider"/> for more information.
+    /// See <see cref="SliderEventType.LastTick"/> usage in <see cref="Slider"/> for more information.
     /// </summary>
     public class SliderTailCircle : SliderEndCircle
     {
diff --git a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
index a26c8121dd..37a91c8611 100644
--- a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
+++ b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestSingleSpan()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, null).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1).ToArray();
 
             Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
             Assert.That(events[0].Time, Is.EqualTo(start_time));
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestRepeat()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 2, null).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 2).ToArray();
 
             Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
             Assert.That(events[0].Time, Is.EqualTo(start_time));
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestNonEvenTicks()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, 300, span_duration, 2, null).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, 300, span_duration, 2).ToArray();
 
             Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
             Assert.That(events[0].Time, Is.EqualTo(start_time));
@@ -83,12 +83,12 @@ namespace osu.Game.Tests.Beatmaps
         }
 
         [Test]
-        public void TestLegacyLastTickOffset()
+        public void TestLastTickOffset()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, 100).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1).ToArray();
 
-            Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LegacyLastTick));
-            Assert.That(events[2].Time, Is.EqualTo(900));
+            Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LastTick));
+            Assert.That(events[2].Time, Is.EqualTo(span_duration + SliderEventGenerator.LAST_TICK_OFFSET));
         }
 
         [Test]
@@ -97,7 +97,7 @@ namespace osu.Game.Tests.Beatmaps
             const double velocity = 5;
             const double min_distance = velocity * 10;
 
-            var events = SliderEventGenerator.Generate(start_time, span_duration, velocity, velocity, span_duration, 2, 0).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, velocity, velocity, span_duration, 2).ToArray();
 
             Assert.Multiple(() =>
             {
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index d91ecf956a..ab8fd2c662 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -13,7 +13,7 @@ using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {
-    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset, IHasSliderVelocity
+    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasSliderVelocity
     {
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second.
@@ -59,7 +59,5 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             Velocity = scoringDistance / timingPoint.BeatLength;
         }
-
-        public double LegacyLastTickOffset => 36;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index 7013d32cbc..b3477a5fde 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -10,9 +10,17 @@ namespace osu.Game.Rulesets.Objects
 {
     public static class SliderEventGenerator
     {
-        // ReSharper disable once MethodOverloadWithOptionalParameter
+        /// <summary>
+        /// Historically, slider's final tick (aka the place where the slider would receive a final judgement) was offset by -36 ms. Originally this was
+        /// done to workaround a technical detail (unimportant), but over the years it has become an expectation of players that you don't need to hold
+        /// until the true end of the slider. This very small amount of leniency makes it easier to jump away from fast sliders to the next hit object.
+        ///
+        /// After discussion on how this should be handled going forward, players have unanimously stated that this lenience should remain in some way.
+        /// </summary>
+        public const double LAST_TICK_OFFSET = -36;
+
         public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
-                                                                  double? legacyLastTickOffset, CancellationToken cancellationToken = default)
+                                                                  CancellationToken cancellationToken = default)
         {
             // A very lenient maximum length of a slider for ticks to be generated.
             // This exists for edge cases such as /b/1573664 where the beatmap has been edited by the user, and should never be reached in normal usage.
@@ -76,14 +84,14 @@ namespace osu.Game.Rulesets.Objects
 
             int finalSpanIndex = spanCount - 1;
             double finalSpanStartTime = startTime + finalSpanIndex * spanDuration;
-            double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) - (legacyLastTickOffset ?? 0));
+            double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + LAST_TICK_OFFSET);
             double finalProgress = (finalSpanEndTime - finalSpanStartTime) / spanDuration;
 
             if (spanCount % 2 == 0) finalProgress = 1 - finalProgress;
 
             yield return new SliderEventDescriptor
             {
-                Type = SliderEventType.LegacyLastTick,
+                Type = SliderEventType.LastTick,
                 SpanIndex = finalSpanIndex,
                 SpanStartTime = finalSpanStartTime,
                 Time = finalSpanEndTime,
@@ -173,7 +181,11 @@ namespace osu.Game.Rulesets.Objects
     public enum SliderEventType
     {
         Tick,
-        LegacyLastTick,
+
+        /// <summary>
+        /// Occurs just before the tail. See <see cref="SliderEventGenerator.LAST_TICK_OFFSET"/>.
+        /// </summary>
+        LastTick,
         Head,
         Tail,
         Repeat
diff --git a/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs b/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs
deleted file mode 100644
index caf22c3023..0000000000
--- a/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs
+++ /dev/null
@@ -1,14 +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.Rulesets.Objects.Types
-{
-    /// <summary>
-    /// A type of <see cref="HitObject"/> which may require the last tick to be offset.
-    /// This is specific to osu!stable conversion, and should not be used elsewhere.
-    /// </summary>
-    public interface IHasLegacyLastTickOffset
-    {
-        double LegacyLastTickOffset { get; }
-    }
-}

From d7119674e8b5063d5350fbed78046aa873865a45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 14:40:44 +0900
Subject: [PATCH 1593/2100] Update comments to better explain what `LastTick`
 is doing

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs        |  4 ++--
 osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs       |  2 +-
 .../Objects/Drawables/DrawableSlider.cs               |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs               | 11 +++++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 87d316d36d..fb1a86d8c0 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -104,8 +104,8 @@ namespace osu.Game.Rulesets.Catch.Objects
                     }
                 }
 
-                // this also includes LegacyLastTick and this is used for TinyDroplet generation above.
-                // this means that the final segment of TinyDroplets are increasingly mistimed where LegacyLastTickOffset is being applied.
+                // this also includes LastTick and this is used for TinyDroplet generation above.
+                // this means that the final segment of TinyDroplets are increasingly mistimed where LastTick is being applied.
                 lastEvent = e;
 
                 switch (e.Type)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
index 9537f8b388..e1123807cd 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             d.HitObjectApplied += _ =>
             {
-                // slider tails are a painful edge case, as their start time is offset 36ms back (see `LegacyLastTick`).
+                // slider tails are a painful edge case, as their start time is offset 36ms back (see `LastTick`).
                 // 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()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 1a6a0a9ecc..77e60a1690 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public override void PlaySamples()
         {
             // rather than doing it this way, we should probably attach the sample to the tail circle.
-            // this can only be done after we stop using LegacyLastTick.
+            // this can only be done if we stop using LastTick.
             if (!TailCircle.SamplePlaysOnlyOnHit || TailCircle.IsHit)
                 base.PlaySamples();
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 9736c69e17..443e4229d2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -205,9 +205,10 @@ namespace osu.Game.Rulesets.Osu.Objects
                         break;
 
                     case SliderEventType.LastTick:
-                        // we need to use the LegacyLastTick here for compatibility reasons (difficulty).
-                        // it is *okay* to use this because the TailCircle is not used for any meaningful purpose in gameplay.
-                        // if this is to change, we should revisit this.
+                        // Of note, we are directly mapping LastTick (instead of `SliderEventType.Tail`)  to SliderTailCircle.
+                        // It is required as difficulty calculation and gameplay relies on reading this value.
+                        // (although it is displayed in classic skins, which may be a concern).
+                        // If this is to change, we should revisit this.
                         AddNested(TailCircle = new SliderTailCircle(this)
                         {
                             RepeatIndex = e.SpanIndex,
@@ -262,7 +263,9 @@ namespace osu.Game.Rulesets.Osu.Objects
             if (HeadCircle != null)
                 HeadCircle.Samples = this.GetNodeSamples(0);
 
-            // The samples should be attached to the slider tail, however this can only be done after LegacyLastTick is removed otherwise they would play earlier than they're intended to.
+            // The samples should be attached to the slider tail, however this can only be done if LastTick is removed otherwise they would play earlier than they're intended to.
+            // (see mapping logic in `CreateNestedHitObjects` above)
+            //
             // For now, the samples are played by the slider itself at the correct end time.
             TailSamples = this.GetNodeSamples(repeatCount + 1);
         }

From 55c623ff02d12c6d2d2d995903f9eb707310210d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 14:47:55 +0900
Subject: [PATCH 1594/2100] Apply NRT to `TestSceneSliderInput`

---
 .../TestSceneSliderInput.cs                        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 644524f532..4020d22910 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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;
@@ -33,7 +31,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         private const double time_during_slide_4 = 3800;
         private const double time_slider_end = 4000;
 
-        private List<JudgementResult> judgementResults;
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
+
+        private const float slider_path_length = 25;
+
+        private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
         [Test]
         public void TestPressBothKeysSimultaneouslyAndReleaseOne()
@@ -333,10 +335,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.SmallTickMiss;
 
-        private ScoreAccessibleReplayPlayer currentPlayer;
-
-        private const float slider_path_length = 25;
-
         private void performTest(List<ReplayFrame> frames)
         {
             AddStep("load player", () =>
@@ -375,7 +373,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 };
 
                 LoadScreen(currentPlayer = p);
-                judgementResults = new List<JudgementResult>();
+                judgementResults.Clear();
             });
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);

From 135d2497e7fe918c6a7bb9cc2fc1c542c40223c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 15:15:39 +0900
Subject: [PATCH 1595/2100] Add gameplay test coverage around last tick of
 slider

This includes proposed changes as per
https://github.com/ppy/osu/issues/22805#issuecomment-1740377493.
---
 .../TestSceneSliderInput.cs                   | 81 +++++++++++++++----
 1 file changed, 66 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 4020d22910..a9d8860369 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -37,6 +37,58 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
+        [Test]
+        public void TestTrackingAtTailButNotLastTick()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 350 },
+                new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 380 },
+            }, new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 10f,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(slider_path_length * 10, 0),
+                    new Vector2(slider_path_length * 10, slider_path_length),
+                    new Vector2(0, slider_path_length),
+                }),
+            });
+
+            AddAssert("Full judgement awarded", assertMaxJudge);
+        }
+
+        [Test]
+        public void TestTrackingAtLastTickButNotTail()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 350 },
+                new OsuReplayFrame { Position = new Vector2(100, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 380 },
+            }, new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 10f,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(slider_path_length * 10, 0),
+                    new Vector2(slider_path_length * 10, slider_path_length),
+                    new Vector2(0, slider_path_length),
+                }),
+            });
+
+            AddAssert("Full judgement awarded", assertMaxJudge);
+        }
+
         [Test]
         public void TestPressBothKeysSimultaneouslyAndReleaseOne()
         {
@@ -335,26 +387,25 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.SmallTickMiss;
 
-        private void performTest(List<ReplayFrame> frames)
+        private void performTest(List<ReplayFrame> frames, Slider? slider = null)
         {
+            slider ??= new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 0.1f,
+                Path = new SliderPath(PathType.PerfectCurve, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(slider_path_length, 0),
+                }, slider_path_length),
+            };
+
             AddStep("load player", () =>
             {
                 Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
                 {
-                    HitObjects =
-                    {
-                        new Slider
-                        {
-                            StartTime = time_slider_start,
-                            Position = new Vector2(0, 0),
-                            SliderVelocityMultiplier = 0.1f,
-                            Path = new SliderPath(PathType.PerfectCurve, new[]
-                            {
-                                Vector2.Zero,
-                                new Vector2(slider_path_length, 0),
-                            }, slider_path_length),
-                        }
-                    },
+                    HitObjects = { slider },
                     BeatmapInfo =
                     {
                         Difficulty = new BeatmapDifficulty { SliderTickRate = 3 },

From e3695d2be017d7acb88b6e1d57e5aaffe3f672ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 16:08:28 +0900
Subject: [PATCH 1596/2100] Adjust slider judgement logic to allow tracking
 anywhere after last tick

---
 .../Objects/Drawables/DrawableSlider.cs                |  2 +-
 .../Objects/Drawables/DrawableSliderTail.cs            | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 77e60a1690..f4138bdf91 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (userTriggered || Time.Current < HitObject.EndTime)
+            if (userTriggered || !TailCircle.Judged)
                 return;
 
             // If only the nested hitobjects are judged, then the slider's own judgement is ignored for scoring purposes.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 9fbc97c484..6344a6d30f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -8,6 +8,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
@@ -125,8 +126,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (!userTriggered && timeOffset >= 0)
-                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            if (userTriggered)
+                return;
+
+            if (timeOffset >= 0 && Tracking)
+                ApplyResult(r => r.Type = r.Judgement.MaxResult);
+            else if (timeOffset >= -SliderEventGenerator.LAST_TICK_OFFSET)
+                ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
 
         protected override void OnApply()

From dd6d09189e21d7a58df891823ba1daf9e8625c83 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 16:20:21 +0900
Subject: [PATCH 1597/2100] Remove usage of `LastTick` in osu! ruleset

---
 osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs          | 2 +-
 .../Objects/Drawables/DrawableSliderTail.cs                 | 6 ++++--
 osu.Game.Rulesets.Osu/Objects/Slider.cs                     | 6 +-----
 osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs           | 5 -----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
index 78062a0632..c465ab8732 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                             });
                             break;
 
-                        case SliderEventType.LastTick:
+                        case SliderEventType.Tail:
                             AddNested(TailCircle = new StrictTrackingSliderTailCircle(this)
                             {
                                 RepeatIndex = e.SpanIndex,
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 6344a6d30f..7daab820dd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -129,9 +129,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered)
                 return;
 
-            if (timeOffset >= 0 && Tracking)
+            // The player needs to have engaged in tracking at any point after the tail leniency cutoff.
+            // An actual tick miss should only occur if reaching the tick itself.
+            if (timeOffset >= SliderEventGenerator.TAIL_LENIENCY && Tracking)
                 ApplyResult(r => r.Type = r.Judgement.MaxResult);
-            else if (timeOffset >= -SliderEventGenerator.LAST_TICK_OFFSET)
+            else if (timeOffset >= 0)
                 ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 443e4229d2..c62659d67a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -204,11 +204,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                         });
                         break;
 
-                    case SliderEventType.LastTick:
-                        // Of note, we are directly mapping LastTick (instead of `SliderEventType.Tail`)  to SliderTailCircle.
-                        // It is required as difficulty calculation and gameplay relies on reading this value.
-                        // (although it is displayed in classic skins, which may be a concern).
-                        // If this is to change, we should revisit this.
+                    case SliderEventType.Tail:
                         AddNested(TailCircle = new SliderTailCircle(this)
                         {
                             RepeatIndex = e.SpanIndex,
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index fb81936837..54d2afb444 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -2,16 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    /// <summary>
-    /// Note that this should not be used for timing correctness.
-    /// See <see cref="SliderEventType.LastTick"/> usage in <see cref="Slider"/> for more information.
-    /// </summary>
     public class SliderTailCircle : SliderEndCircle
     {
         public SliderTailCircle(Slider slider)

From 62bcb6284232833fbec4f30a8f79bfa635771ddf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 16:44:04 +0900
Subject: [PATCH 1598/2100] Document remaining pieces of `LastTick` and add
 back legacy prefix for generation flow

---
 .../Beatmaps/SliderEventGenerationTest.cs         |  4 ++--
 osu.Game/Rulesets/Objects/SliderEventGenerator.cs | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
index 37a91c8611..c7cf3fe956 100644
--- a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
+++ b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
@@ -87,8 +87,8 @@ namespace osu.Game.Tests.Beatmaps
         {
             var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1).ToArray();
 
-            Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LastTick));
-            Assert.That(events[2].Time, Is.EqualTo(span_duration + SliderEventGenerator.LAST_TICK_OFFSET));
+            Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LegacyLastTick));
+            Assert.That(events[2].Time, Is.EqualTo(span_duration + SliderEventGenerator.TAIL_LENIENCY));
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index b3477a5fde..42c422a637 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -16,8 +16,12 @@ namespace osu.Game.Rulesets.Objects
         /// until the true end of the slider. This very small amount of leniency makes it easier to jump away from fast sliders to the next hit object.
         ///
         /// After discussion on how this should be handled going forward, players have unanimously stated that this lenience should remain in some way.
+        /// These days, this is implemented in the drawable implementation of Slider in the osu! ruleset.
+        ///
+        /// We need to keep the <see cref="SliderEventType.LegacyLastTick"/> *only* for osu!catch conversion, which relies on it to generate tiny ticks
+        /// correctly.
         /// </summary>
-        public const double LAST_TICK_OFFSET = -36;
+        public const double TAIL_LENIENCY = -36;
 
         public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
                                                                   CancellationToken cancellationToken = default)
@@ -84,14 +88,14 @@ namespace osu.Game.Rulesets.Objects
 
             int finalSpanIndex = spanCount - 1;
             double finalSpanStartTime = startTime + finalSpanIndex * spanDuration;
-            double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + LAST_TICK_OFFSET);
+            double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + TAIL_LENIENCY);
             double finalProgress = (finalSpanEndTime - finalSpanStartTime) / spanDuration;
 
             if (spanCount % 2 == 0) finalProgress = 1 - finalProgress;
 
             yield return new SliderEventDescriptor
             {
-                Type = SliderEventType.LastTick,
+                Type = SliderEventType.LegacyLastTick,
                 SpanIndex = finalSpanIndex,
                 SpanStartTime = finalSpanStartTime,
                 Time = finalSpanEndTime,
@@ -183,9 +187,10 @@ namespace osu.Game.Rulesets.Objects
         Tick,
 
         /// <summary>
-        /// Occurs just before the tail. See <see cref="SliderEventGenerator.LAST_TICK_OFFSET"/>.
+        /// Occurs just before the tail. See <see cref="SliderEventGenerator.TAIL_LENIENCY"/>.
+        /// Should generally be ignored.
         /// </summary>
-        LastTick,
+        LegacyLastTick,
         Head,
         Tail,
         Repeat

From 22cb168c0ffef3e1cef825e15f2e030135ac5039 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 17:17:04 +0900
Subject: [PATCH 1599/2100] Add test coverage of tracking inside lenience
 period but not at tick or end

---
 .../TestSceneSliderInput.cs                   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index a9d8860369..cf02e0eb32 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -37,6 +37,33 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
+        [Test]
+        public void TestTrackingBetweenLastTickAndTail()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 480 },
+                new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 500 },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 520 },
+            }, new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 10f,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(slider_path_length * 10, 0),
+                    new Vector2(slider_path_length * 10, slider_path_length),
+                    new Vector2(0, slider_path_length),
+                }),
+            });
+
+            AddAssert("Full judgement awarded", assertMaxJudge);
+        }
+
         [Test]
         public void TestTrackingAtTailButNotLastTick()
         {

From 94f4268ae5de46ab33849e6ba6583f616f1a55b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 18:23:22 +0900
Subject: [PATCH 1600/2100] Fix object dim being applied to approach circles

Fixes half of https://github.com/ppy/osu/issues/24956.

The other half is high effort. The number portion is nested deeply and
with reason - depending on skin setting it changes the visual order.

I'm not sure how to fix that one, but I also think it's weird behaviour
and if people don't complain, it's probably fine to just dim the number
for consistency.

That said, the approach circle is an important one to ensure it matches
1:1, so I've fixed that here.
---
 .../Objects/Drawables/DrawableHitCircle.cs      |  6 ++++++
 .../Objects/Drawables/DrawableOsuHitObject.cs   | 17 ++++++++---------
 .../Objects/Drawables/DrawableSlider.cs         |  8 ++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 4de9a57acb..e87a075a11 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -34,6 +35,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public HitReceptor HitArea { get; private set; }
         public SkinnableDrawable CirclePiece { get; private set; }
 
+        protected override IEnumerable<Drawable> DimmablePieces => new[]
+        {
+            CirclePiece,
+        };
+
         Drawable IHasApproachCircle.ApproachCircle => ApproachCircle;
 
         private Container scaleContainer;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 920dfcab03..ed981d2d5d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -4,6 +4,8 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -71,20 +73,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
         }
 
+        protected virtual IEnumerable<Drawable> DimmablePieces => Enumerable.Empty<Drawable>();
+
         protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();
 
-            // Dim should only be applied at a top level, as it will be implicitly applied to nested objects.
-            if (ParentHitObject == null)
+            foreach (var piece in DimmablePieces)
             {
-                // Of note, no one noticed this was missing for years, but it definitely feels like it should still exist.
-                // For now this is applied across all skins, and matches stable.
-                // For simplicity, dim colour is applied to the DrawableHitObject itself.
-                // We may need to make a nested container setup if this even causes a usage conflict (ie. with a mod).
-                this.FadeColour(new Color4(195, 195, 195, 255));
-                using (BeginDelayedSequence(InitialLifetimeOffset - OsuHitWindows.MISS_WINDOW))
-                    this.FadeColour(Color4.White, 100);
+                piece.FadeColour(new Color4(195, 195, 195, 255));
+                using (piece.BeginDelayedSequence(InitialLifetimeOffset - OsuHitWindows.MISS_WINDOW))
+                    piece.FadeColour(Color4.White, 100);
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 1a6a0a9ecc..07e448937f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -35,6 +36,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private ShakeContainer shakeContainer;
 
+        protected override IEnumerable<Drawable> DimmablePieces => new Drawable[]
+        {
+            HeadCircle,
+            TailCircle,
+            Body,
+        };
+
         /// <summary>
         /// A target container which can be used to add top level elements to the slider's display.
         /// Intended to be used for proxy purposes only.

From 23c20ca5f44c6eb1a56ce5f6c932dd951e5945b5 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Fri, 29 Sep 2023 13:44:11 +0200
Subject: [PATCH 1601/2100] Add xmldocs

---
 osu.Game/Screens/Select/FilterCriteria.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index aa3909fa0e..1bcff601e5 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -46,6 +46,10 @@ namespace osu.Game.Screens.Select
         };
 
         public OptionalTextFilter[] SearchTerms = Array.Empty<OptionalTextFilter>();
+
+        /// <summary>
+        /// Search terms that are used for searching difficulty names.
+        /// </summary>
         public OptionalTextFilter[] DifficultySearchTerms = Array.Empty<OptionalTextFilter>();
 
         public RulesetInfo? Ruleset;
@@ -74,6 +78,10 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        /// <summary>
+        /// Extracts the search terms from the provided <see cref="string"/>
+        /// and stores them in <see cref="DifficultySearchTerms"/>.
+        /// </summary>
         public string DifficultySearchText
         {
             set => DifficultySearchTerms = getTermsFromSearchText(value);

From c927f90a4834ccf2d5f7c8108feeebfb6ebbfd66 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Fri, 29 Sep 2023 13:44:42 +0200
Subject: [PATCH 1602/2100] Replace regex with a custom algorithm and update
 test scene.

---
 .../SongSelect/TestSceneDifficultySearch.cs   |  5 +-
 osu.Game/Screens/Select/FilterQueryParser.cs  | 90 ++++++++++++++-----
 2 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs b/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
index 63963d1101..f013d5c19a 100644
--- a/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
+++ b/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.SongSelect
             ("Title1", "Diff2"),
             ("My[Favourite]Song", "Expert"),
             ("Title", "My Favourite Diff"),
-            ("Another One", "diff ]with [[] brackets]]]"),
+            ("Another One", "diff ]with [[ brackets]]]"),
         };
 
         [TestCase("[1]", new[] { 0 })]
@@ -34,7 +34,8 @@ namespace osu.Game.Tests.SongSelect
         [TestCase("Title1 [Diff]", new[] { 0, 1 })]
         [TestCase("Title1[Diff]", new int[] { })]
         [TestCase("[diff ]with]", new[] { 4 })]
-        [TestCase("[diff ]with [[] brackets]]]]", new[] { 4 })]
+        [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
+        [TestCase("[diff] another [brackets]", new[] { 4 })]
         public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
         {
             var carouselBeatmaps = createCarouselBeatmaps().ToList();
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 58e25adb5b..08fe86713a 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -19,30 +19,9 @@ namespace osu.Game.Screens.Select
             @"\b(?<key>\w+)(?<op>(:|=|(>|<)(:|=)?))(?<value>("".*""[!]?)|(\S*))",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        private static readonly Regex difficulty_query_syntax_regex = new Regex(
-            @"(\s|^)((\[(?>\[(?<level>)|[^[\]]+|\](?<-level>))*(?(level)(?!))\](\s|$))|(\[.*))",
-            RegexOptions.Compiled);
-
         internal static void ApplyQueries(FilterCriteria criteria, string query)
         {
-            while (true)
-            {
-                var match = difficulty_query_syntax_regex.Matches(query).FirstOrDefault();
-
-                if (match is null) break;
-
-                // Trim the first character because it's always '[' (ignoring spaces)
-                string cleanDifficultyQuery = match.Value.Trim(' ')[1..];
-
-                if (cleanDifficultyQuery.EndsWith(']'))
-                    cleanDifficultyQuery = cleanDifficultyQuery[..^1];
-
-                criteria.DifficultySearchText = cleanDifficultyQuery;
-
-                // Insert whitespace if necessary so that the words before and after the difficulty query aren't joined together.
-                bool insertWhitespace = match.Value.StartsWith(' ') && match.Value.EndsWith(' ');
-                query = query.Replace(match.Value, insertWhitespace ? " " : "");
-            }
+            criteria.DifficultySearchText = extractDifficultySearchText(ref query);
 
             foreach (Match match in query_syntax_regex.Matches(query))
             {
@@ -57,6 +36,73 @@ namespace osu.Game.Screens.Select
             criteria.SearchText = query;
         }
 
+        /// <summary>
+        /// Extracts and returns the difficulty search text between square brackets.
+        /// </summary>
+        /// <param name="query">The search query. The difficulty search text will be removed from the query.</param>
+        /// <returns>The difficulty search text (without the square brackets).</returns>
+        private static string extractDifficultySearchText(ref string query)
+        {
+            var openingBracketIndexes = new List<int>();
+            var closingBracketIndexes = new List<int>();
+
+            populateIndexLists(ref query);
+
+            return performExtraction(ref query);
+
+            void populateIndexLists(ref string query)
+            {
+                bool currentlyBetweenBrackets = false;
+
+                for (int i = 0; i < query.Length; i++)
+                {
+                    switch (query[i])
+                    {
+                        case '[' when !currentlyBetweenBrackets && (i == 0 || query[i - 1] == ' '):
+                            currentlyBetweenBrackets = true;
+                            openingBracketIndexes.Add(i + 1);
+                            break;
+
+                        case ']' when currentlyBetweenBrackets && (i == query.Length - 1 || query[i + 1] == ' '):
+                            currentlyBetweenBrackets = false;
+                            closingBracketIndexes.Add(i);
+                            break;
+                    }
+                }
+
+                if (currentlyBetweenBrackets)
+                {
+                    // If there is no "]" closing the current difficulty search query, append it.
+                    query += ']';
+                    closingBracketIndexes.Add(query.Length - 1);
+                }
+            }
+
+            string performExtraction(ref string query)
+            {
+                var searchTexts = new List<string>();
+                string originalQuery = query;
+
+                for (int i = 0; i < openingBracketIndexes.Count; i++)
+                {
+                    int startIndex = openingBracketIndexes[i];
+                    int endIndex = closingBracketIndexes[i];
+
+                    string searchText = originalQuery[startIndex..endIndex];
+
+                    searchTexts.Add(searchText);
+
+                    query = query
+                            .Replace($" [{searchText}]", "")
+                            .Replace($"[{searchText}] ", "")
+                            .Replace($"[{searchText}]", "")
+                            .Replace($" [{searchText}] ", " ");
+                }
+
+                return string.Join(' ', searchTexts);
+            }
+        }
+
         private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key, string value, Operator op)
         {
             switch (key)

From 0bcb99f2c46cf08e0c05e1cd27a0662a4a1e375b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 30 Sep 2023 01:16:56 +0300
Subject: [PATCH 1603/2100] Crop oversized gameplay textures instead of
 downscaling them

---
 osu.Game/Skinning/LegacySkinExtensions.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index dde6c1fa29..868f36fb34 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osuTK;
@@ -112,9 +113,11 @@ namespace osu.Game.Skinning
             if (texture.DisplayWidth <= maxSize.X && texture.DisplayHeight <= maxSize.Y)
                 return texture;
 
-            // use scale adjust property for downscaling the texture in order to meet the specified maximum dimensions.
-            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.X, texture.DisplayHeight / maxSize.Y);
-            return texture;
+            maxSize *= texture.ScaleAdjust;
+
+            var croppedTexture = texture.Crop(new RectangleF(texture.Width / 2f - maxSize.X / 2f, texture.Height / 2f - maxSize.Y / 2f, maxSize.X, maxSize.Y));
+            croppedTexture.ScaleAdjust = texture.ScaleAdjust;
+            return croppedTexture;
         }
 
         public static bool HasFont(this ISkin source, LegacyFont font)

From 314ecec65b34c73a293e7f8fbf14183c5dcfa6b4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 30 Sep 2023 01:17:59 +0300
Subject: [PATCH 1604/2100] Refactor player max dimensions test scene to
 actually upscale textures

---
 .../Gameplay/TestScenePlayerMaxDimensions.cs  | 77 ++++++++++++++++---
 osu.Game/Skinning/Skin.cs                     |  5 +-
 2 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index a8ed44c7f8..68443b234b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -3,14 +3,20 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Processing;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -23,6 +29,9 @@ namespace osu.Game.Tests.Visual.Gameplay
     /// </remarks>
     public partial class TestScenePlayerMaxDimensions : TestSceneAllRulesetPlayers
     {
+        // scale textures to 4 times their size.
+        private const int scale_factor = 4;
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
@@ -63,18 +72,66 @@ namespace osu.Game.Tests.Visual.Gameplay
                 remove { }
             }
 
-            public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
-            {
-                var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
-
-                if (texture != null)
-                    texture.ScaleAdjust /= 8f;
-
-                return texture;
-            }
-
             public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => this;
             public IEnumerable<ISkin> AllSources => new[] { this };
+
+            protected override IResourceStore<TextureUpload> CreateTextureLoaderStore(IStorageResourceProvider resources, IResourceStore<byte[]> storage)
+                => new UpscaledTextureLoaderStore(base.CreateTextureLoaderStore(resources, storage));
+
+            private class UpscaledTextureLoaderStore : IResourceStore<TextureUpload>
+            {
+                private readonly IResourceStore<TextureUpload>? textureStore;
+
+                public UpscaledTextureLoaderStore(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 upscale(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(() => upscale(textureUpload), cancellationToken).ConfigureAwait(false);
+                }
+
+                private TextureUpload upscale(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();
+
+                    image.Mutate(i => i.Resize(new Size(textureUpload.Width, textureUpload.Height) * scale_factor));
+                    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/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index ccf49d722f..1e312142d7 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Skinning
                 }
 
                 Samples = samples;
-                Textures = new TextureStore(resources.Renderer, new MaxDimensionLimitedTextureLoaderStore(resources.CreateTextureLoaderStore(storage)));
+                Textures = new TextureStore(resources.Renderer, CreateTextureLoaderStore(resources, storage));
             }
             else
             {
@@ -171,6 +171,9 @@ namespace osu.Game.Skinning
             }
         }
 
+        protected virtual IResourceStore<TextureUpload> CreateTextureLoaderStore(IStorageResourceProvider resources, IResourceStore<byte[]> storage)
+            => new MaxDimensionLimitedTextureLoaderStore(resources.CreateTextureLoaderStore(storage));
+
         protected virtual void ParseConfigurationStream(Stream stream)
         {
             using (LineBufferedReader reader = new LineBufferedReader(stream, true))

From 869f8e5e1b21dfe53bb56a54a8479797956358f8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 00:20:53 +0300
Subject: [PATCH 1605/2100] Adjust test scene to apply miss judgements as well

---
 .../Gameplay/TestSceneSkinnableHealthDisplay.cs       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index b4ebb7c410..e3700a2a8b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -28,15 +29,21 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep(@"Reset all", delegate
             {
                 healthProcessor.Health.Value = 1;
+                healthProcessor.Failed += () => false; // health won't be updated if the processor gets into a "fail" state.
             });
         }
 
         [Test]
         public void TestHealthDisplayIncrementing()
         {
-            AddRepeatStep(@"decrease hp", delegate
+            AddRepeatStep("apply miss judgement", delegate
             {
-                healthProcessor.Health.Value -= 0.08f;
+                healthProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Miss });
+            }, 5);
+
+            AddRepeatStep(@"decrease hp slightly", delegate
+            {
+                healthProcessor.Health.Value -= 0.01f;
             }, 10);
 
             AddRepeatStep(@"increase hp without flash", delegate

From 33b0cb15a88ece545779bad5ac754f1a79275398 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 00:21:12 +0300
Subject: [PATCH 1606/2100] Add handling for miss judgements in `HealthDisplay`

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 9fdd735804..5131f93ca2 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -29,10 +29,22 @@ namespace osu.Game.Screens.Play.HUD
             MaxValue = 1
         };
 
+        /// <summary>
+        /// Triggered when a <see cref="Judgement"/> is a successful hit, signaling the health display to perform a flash animation (if designed to do so).
+        /// </summary>
+        /// <param name="result">The judgement result.</param>
         protected virtual void Flash(JudgementResult result)
         {
         }
 
+        /// <summary>
+        /// Triggered when a <see cref="Judgement"/> resulted in the player losing health.
+        /// </summary>
+        /// <param name="result">The judgement result.</param>
+        protected virtual void Miss(JudgementResult result)
+        {
+        }
+
         [Resolved]
         private HUDOverlay? hudOverlay { get; set; }
 
@@ -54,6 +66,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
                 Flash(judgement);
+            else if (judgement.Judgement.HealthIncreaseFor(judgement) < 0)
+                Miss(judgement);
         }
 
         protected override void Dispose(bool isDisposing)

From 776536e816075e179a595e42c56c275f989e039b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 26 Sep 2023 02:23:29 +0300
Subject: [PATCH 1607/2100] Add "Argon" health display implementation

---
 .../TestSceneSkinnableHealthDisplay.cs        |   3 +-
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 284 ++++++++++++++++++
 2 files changed, 286 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index e3700a2a8b..4d8ddcd581 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
+        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay();
         protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay();
         protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay();
 
@@ -61,4 +62,4 @@ namespace osu.Game.Tests.Visual.Gameplay
             }, 3);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
new file mode 100644
index 0000000000..ca7a4a6cf7
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -0,0 +1,284 @@
+// Copyright (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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Lines;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Threading;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonHealthDisplay : HealthDisplay, ISerialisableDrawable
+    {
+        private const float curve_start = 280;
+        private const float curve_end = 310;
+        private const float curve_smoothness = 10;
+
+        private const float bar_length = 350;
+        private const float bar_height = 32.5f;
+
+        private BarPath healthBar = null!;
+        private BarPath missBar = null!;
+
+        private SliderPath barPath = null!;
+
+        private static readonly Colour4 health_bar_colour = Colour4.White;
+
+        // the opacity isn't part of the design, it's only here to control glow intensity.
+        private static readonly Colour4 health_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.3f);
+        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.4f);
+
+        private static readonly Colour4 miss_bar_colour = Color4Extensions.FromHex("#FF9393");
+        private static readonly Colour4 miss_bar_glow_colour = Color4Extensions.FromHex("#FD0000");
+
+        // the "flashed" glow colour is just a lightened version of the original one, not part of the design.
+        private static readonly Colour4 miss_bar_flash_colour = Color4Extensions.FromHex("#FF5D5D");
+
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Anchor = Anchor.TopLeft;
+            Origin = Anchor.TopLeft;
+            AutoSizeAxes = Axes.Both;
+
+            Vector2 diagonalDir = (new Vector2(curve_end, bar_height) - new Vector2(curve_start, 0)).Normalized();
+
+            // todo: SliderPath or parts of it should be moved away to a utility class as they're useful for making curved paths in general, as done here.
+            barPath = new SliderPath(new[]
+            {
+                new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                new PathControlPoint(new Vector2(curve_start - curve_smoothness, 0), PathType.Bezier),
+                new PathControlPoint(new Vector2(curve_start, 0)),
+                new PathControlPoint(new Vector2(curve_start, 0) + diagonalDir * curve_smoothness, PathType.Linear),
+                new PathControlPoint(new Vector2(curve_end, bar_height) - diagonalDir * curve_smoothness, PathType.Bezier),
+                new PathControlPoint(new Vector2(curve_end, bar_height)),
+                new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_height), PathType.Linear),
+                new PathControlPoint(new Vector2(bar_length, bar_height)),
+            });
+
+            var vertices = new List<Vector2>();
+            barPath.GetPathToProgress(vertices, 0.0, 1.0);
+
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(4f, 0f),
+                Children = new Drawable[]
+                {
+                    new Circle
+                    {
+                        Margin = new MarginPadding { Top = 10f - 3f / 2f, Left = -2f },
+                        Size = new Vector2(50f, 3f),
+                    },
+                    new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            new BackgroundPath
+                            {
+                                PathRadius = 10f,
+                                Vertices = vertices,
+                            },
+                            missBar = new BarPath
+                            {
+                                AutoSizeAxes = Axes.None,
+                                RelativeSizeAxes = Axes.Both,
+                                BarColour = miss_bar_colour,
+                                GlowColour = miss_bar_glow_colour,
+                                Alpha = 0f,
+                                PathRadius = 10f,
+                                Vertices = vertices
+                            },
+                            healthBar = new BarPath
+                            {
+                                AutoSizeAxes = Axes.None,
+                                RelativeSizeAxes = Axes.Both,
+                                BarColour = health_bar_colour,
+                                GlowColour = health_bar_glow_colour,
+                                PathRadius = 10f,
+                                Vertices = vertices
+                            },
+                        }
+                    }
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(v =>
+            {
+                if (v.NewValue > MissBarValue)
+                {
+                    missBar.FadeOut(300, Easing.OutQuint);
+                    resetMissBarDelegate?.Cancel();
+                    resetMissBarDelegate = null;
+                }
+
+                if (v.NewValue == 0)
+                    healthBar.FadeOut(300, Easing.OutQuint);
+                else if (healthBar.Alpha < 1)
+                    healthBar.FadeIn(300, Easing.OutQuint);
+
+                this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
+            }, true);
+        }
+
+        private ScheduledDelegate? resetMissBarDelegate;
+
+        protected override void Miss(JudgementResult result)
+        {
+            base.Miss(result);
+
+            if (resetMissBarDelegate != null)
+                resetMissBarDelegate.Cancel();
+            else
+                this.TransformTo(nameof(MissBarValue), HealthBarValue);
+
+            this.Delay(500).Schedule(() =>
+            {
+                this.TransformTo(nameof(MissBarValue), Current.Value, 300, Easing.OutQuint);
+                resetMissBarDelegate = null;
+            }, out resetMissBarDelegate);
+
+            missBar.FadeIn(120, Easing.OutQuint);
+            missBar.Delay(500).FadeOut(300, Easing.InQuint);
+
+            missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour.Lighten(0.1f))
+                   .TransformTo(nameof(BarPath.BarColour), miss_bar_colour, 300, Easing.OutQuint);
+
+            missBar.TransformTo(nameof(BarPath.GlowColour), miss_bar_flash_colour)
+                   .TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour, 300, Easing.OutQuint);
+        }
+
+        protected override void Flash(JudgementResult result)
+        {
+            base.Flash(result);
+
+            healthBar.TransformTo(nameof(BarPath.GlowColour), health_bar_flash_colour)
+                     .TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.OutQuint);
+        }
+
+        private double missBarValue = 1.0;
+        private readonly List<Vector2> missBarVertices = new List<Vector2>();
+
+        public double MissBarValue
+        {
+            get => missBarValue;
+            set
+            {
+                if (missBarValue == value)
+                    return;
+
+                missBarValue = value;
+                updatePathVertices();
+            }
+        }
+
+        private double healthBarValue = 1.0;
+        private readonly List<Vector2> healthBarVertices = new List<Vector2>();
+
+        public double HealthBarValue
+        {
+            get => healthBarValue;
+            set
+            {
+                if (healthBarValue == value)
+                    return;
+
+                healthBarValue = value;
+                updatePathVertices();
+            }
+        }
+
+        private void updatePathVertices()
+        {
+            barPath.GetPathToProgress(healthBarVertices, 0.0, healthBarValue);
+            barPath.GetPathToProgress(missBarVertices, healthBarValue, Math.Max(missBarValue, healthBarValue));
+
+            if (healthBarVertices.Count == 0)
+                healthBarVertices.Add(Vector2.Zero);
+
+            if (missBarVertices.Count == 0)
+                missBarVertices.Add(Vector2.Zero);
+
+            missBar.Vertices = missBarVertices.Select(v => v - missBarVertices[0]).ToList();
+            missBar.Position = missBarVertices[0];
+
+            healthBar.Vertices = healthBarVertices.Select(v => v - healthBarVertices[0]).ToList();
+            healthBar.Position = healthBarVertices[0];
+        }
+
+        private partial class BackgroundPath : SmoothPath
+        {
+            protected override Color4 ColourAt(float position)
+            {
+                if (position <= 0.128f)
+                    return Color4.White.Opacity(0.3f);
+
+                position -= 0.128f;
+                return Interpolation.ValueAt(Math.Clamp(position, 0f, 1f), Color4.White.Opacity(0.5f), Color4.Black.Opacity(0.5f), -0.75f, 1f, Easing.OutQuart);
+            }
+        }
+
+        private partial class BarPath : SmoothPath
+        {
+            private Colour4 barColour;
+
+            public Colour4 BarColour
+            {
+                get => barColour;
+                set
+                {
+                    if (barColour == value)
+                        return;
+
+                    barColour = value;
+                    InvalidateTexture();
+                }
+            }
+
+            private Colour4 glowColour;
+
+            public Colour4 GlowColour
+            {
+                get => glowColour;
+                set
+                {
+                    if (glowColour == value)
+                        return;
+
+                    glowColour = value;
+                    InvalidateTexture();
+                }
+            }
+
+            protected override Color4 ColourAt(float position)
+            {
+                if (position >= 0.6f)
+                    return BarColour;
+
+                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, 0.6);
+            }
+        }
+    }
+}

From 319208ca3d985b1e733adc39c0be321e09f26f67 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 01:18:05 +0300
Subject: [PATCH 1608/2100] Adjust health bar glow intensity

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index ca7a4a6cf7..5035571820 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -38,8 +38,8 @@ namespace osu.Game.Screens.Play.HUD
         private static readonly Colour4 health_bar_colour = Colour4.White;
 
         // the opacity isn't part of the design, it's only here to control glow intensity.
-        private static readonly Colour4 health_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.3f);
-        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.4f);
+        private static readonly Colour4 health_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.5f);
+        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.6f);
 
         private static readonly Colour4 miss_bar_colour = Color4Extensions.FromHex("#FF9393");
         private static readonly Colour4 miss_bar_glow_colour = Color4Extensions.FromHex("#FD0000");

From a331fb993ae5dbc94b50283ffb7577d7efb08332 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 01:21:37 +0300
Subject: [PATCH 1609/2100] Adjust health bar outer stroke colour

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 5035571820..ed141a9a26 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -233,7 +233,7 @@ namespace osu.Game.Screens.Play.HUD
             protected override Color4 ColourAt(float position)
             {
                 if (position <= 0.128f)
-                    return Color4.White.Opacity(0.3f);
+                    return Color4.White.Opacity(0.5f);
 
                 position -= 0.128f;
                 return Interpolation.ValueAt(Math.Clamp(position, 0f, 1f), Color4.White.Opacity(0.5f), Color4.Black.Opacity(0.5f), -0.75f, 1f, Easing.OutQuart);

From 9e2b8254d9fc95986c1c3a7eebffe91d8b4f4b0b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 13:26:43 +0300
Subject: [PATCH 1610/2100] Add argon-specific health display test scene

---
 .../Gameplay/TestSceneArgonHealthDisplay.cs   | 78 +++++++++++++++++++
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    |  2 -
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
new file mode 100644
index 0000000000..12a2611a76
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -0,0 +1,78 @@
+// Copyright (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.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public partial class TestSceneArgonHealthDisplay : OsuTestScene
+    {
+        [Cached(typeof(HealthProcessor))]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep(@"Reset all", delegate
+            {
+                healthProcessor.Health.Value = 1;
+                healthProcessor.Failed += () => false; // health won't be updated if the processor gets into a "fail" state.
+
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                    },
+                    new ArgonHealthDisplay
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(2f),
+                    },
+                };
+            });
+        }
+
+        [Test]
+        public void TestHealthDisplayIncrementing()
+        {
+            AddRepeatStep("apply miss judgement", delegate
+            {
+                healthProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Miss });
+            }, 5);
+
+            AddRepeatStep(@"decrease hp slightly", delegate
+            {
+                healthProcessor.Health.Value -= 0.01f;
+            }, 10);
+
+            AddRepeatStep(@"increase hp without flash", delegate
+            {
+                healthProcessor.Health.Value += 0.1f;
+            }, 3);
+
+            AddRepeatStep(@"increase hp with flash", delegate
+            {
+                healthProcessor.Health.Value += 0.1f;
+                healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement())
+                {
+                    Type = HitResult.Perfect
+                });
+            }, 3);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index ed141a9a26..2db8e9d641 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -52,8 +52,6 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load()
         {
-            Anchor = Anchor.TopLeft;
-            Origin = Anchor.TopLeft;
             AutoSizeAxes = Axes.Both;
 
             Vector2 diagonalDir = (new Vector2(curve_end, bar_height) - new Vector2(curve_start, 0)).Normalized();

From 446c9c2efefa819fc835cc8a2bb266311f40babf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 13:39:36 +0300
Subject: [PATCH 1611/2100] Apply adjustments on the "miss" bar display

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 2db8e9d641..aeaaa19f33 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -96,21 +96,20 @@ namespace osu.Game.Screens.Play.HUD
                             },
                             missBar = new BarPath
                             {
-                                AutoSizeAxes = Axes.None,
-                                RelativeSizeAxes = Axes.Both,
                                 BarColour = miss_bar_colour,
                                 GlowColour = miss_bar_glow_colour,
                                 Alpha = 0f,
-                                PathRadius = 10f,
+                                PathRadius = 20f,
+                                GlowPortion = 0.75f,
+                                Margin = new MarginPadding(-10f),
                                 Vertices = vertices
                             },
                             healthBar = new BarPath
                             {
-                                AutoSizeAxes = Axes.None,
-                                RelativeSizeAxes = Axes.Both,
                                 BarColour = health_bar_colour,
                                 GlowColour = health_bar_glow_colour,
                                 PathRadius = 10f,
+                                GlowPortion = 0.6f,
                                 Vertices = vertices
                             },
                         }
@@ -270,9 +269,11 @@ namespace osu.Game.Screens.Play.HUD
                 }
             }
 
+            public float GlowPortion { get; init; }
+
             protected override Color4 ColourAt(float position)
             {
-                if (position >= 0.6f)
+                if (position >= GlowPortion)
                     return BarColour;
 
                 return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, 0.6);

From 30d9004ef9bc089f543bdbb68f3ac6ea7dbb99f8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 13:41:11 +0300
Subject: [PATCH 1612/2100] Fix small mistake

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index aeaaa19f33..434736d42a 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -276,7 +276,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (position >= GlowPortion)
                     return BarColour;
 
-                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, 0.6);
+                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion);
             }
         }
     }

From 8d389accf81ceb8b77eb6a9287419d1ffd689ab0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 15:12:24 +0300
Subject: [PATCH 1613/2100] Cover "Argon" helath display in skin
 deserialisation tests

---
 .../Archives/modified-argon-pro-20231001.osk     | Bin 0 -> 1834 bytes
 osu.Game.Tests/Skins/SkinDeserialisationTest.cs  |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Resources/Archives/modified-argon-pro-20231001.osk

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231001.osk b/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231001.osk
new file mode 100644
index 0000000000000000000000000000000000000000..081bb73b9ef7bd85d763007117d4f18fe4046fa4
GIT binary patch
literal 1834
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index 82d204f134..98008a003d 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -52,7 +52,9 @@ namespace osu.Game.Tests.Skins
             // Covers player avatar and flag.
             "Archives/modified-argon-20230305.osk",
             // Covers key counters
-            "Archives/modified-argon-pro-20230618.osk"
+            "Archives/modified-argon-pro-20230618.osk",
+            // Covers "Argon" health display
+            "Archives/modified-argon-pro-20231001.osk"
         };
 
         /// <summary>

From 7825bea959f41e6e1df8f14ed32eacd124ba0a20 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 15:25:23 +0300
Subject: [PATCH 1614/2100] Use interpolation for health bar opacity instead of
 transforms

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 434736d42a..c6c64ebcad 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -131,15 +131,18 @@ namespace osu.Game.Screens.Play.HUD
                     resetMissBarDelegate = null;
                 }
 
-                if (v.NewValue == 0)
-                    healthBar.FadeOut(300, Easing.OutQuint);
-                else if (healthBar.Alpha < 1)
-                    healthBar.FadeIn(300, Easing.OutQuint);
-
                 this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            float targetAlpha = Current.Value > 0 ? 1 : 0;
+            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, targetAlpha, 50.0, Time.Elapsed);
+        }
+
         private ScheduledDelegate? resetMissBarDelegate;
 
         protected override void Miss(JudgementResult result)

From eef099e69d347e9502d63142d8920f3edf74e332 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 15:25:34 +0300
Subject: [PATCH 1615/2100] Do not display "miss" bar if health is already zero

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index c6c64ebcad..50ac100ed2 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -149,6 +149,10 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Miss(result);
 
+            if (result.HealthAtJudgement == 0.0)
+                // health is already empty, nothing should be displayed here.
+                return;
+
             if (resetMissBarDelegate != null)
                 resetMissBarDelegate.Cancel();
             else

From 22aa7ffd06af80f021023d5a97162d6f06adc7a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 1 Oct 2023 13:45:16 +0900
Subject: [PATCH 1616/2100] Use additive colour

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 50ac100ed2..023c5e47da 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -98,6 +98,7 @@ namespace osu.Game.Screens.Play.HUD
                             {
                                 BarColour = miss_bar_colour,
                                 GlowColour = miss_bar_glow_colour,
+                                Blending = BlendingParameters.Additive,
                                 Alpha = 0f,
                                 PathRadius = 20f,
                                 GlowPortion = 0.75f,
@@ -106,6 +107,9 @@ namespace osu.Game.Screens.Play.HUD
                             },
                             healthBar = new BarPath
                             {
+                                AutoSizeAxes = Axes.None,
+                                RelativeSizeAxes = Axes.Both,
+                                Blending = BlendingParameters.Additive,
                                 BarColour = health_bar_colour,
                                 GlowColour = health_bar_glow_colour,
                                 PathRadius = 10f,

From df51e612342a0aadecc86267df90c9e641a694de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 1 Oct 2023 21:20:03 +0900
Subject: [PATCH 1617/2100] Improve animation

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 023c5e47da..1419ab1b43 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -7,11 +7,13 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -96,13 +98,13 @@ namespace osu.Game.Screens.Play.HUD
                             },
                             missBar = new BarPath
                             {
-                                BarColour = miss_bar_colour,
-                                GlowColour = miss_bar_glow_colour,
+                                BarColour = Color4.White,
+                                GlowColour = OsuColour.Gray(0.5f),
                                 Blending = BlendingParameters.Additive,
-                                Alpha = 0f,
-                                PathRadius = 20f,
-                                GlowPortion = 0.75f,
-                                Margin = new MarginPadding(-10f),
+                                Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
+                                PathRadius = 40f,
+                                GlowPortion = 0.9f,
+                                Margin = new MarginPadding(-30f),
                                 Vertices = vertices
                             },
                             healthBar = new BarPath
@@ -130,7 +132,8 @@ namespace osu.Game.Screens.Play.HUD
             {
                 if (v.NewValue > MissBarValue)
                 {
-                    missBar.FadeOut(300, Easing.OutQuint);
+                    missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 300, Easing.OutQuint);
+                    missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 300, Easing.OutQuint);
                     resetMissBarDelegate?.Cancel();
                     resetMissBarDelegate = null;
                 }
@@ -158,19 +161,23 @@ namespace osu.Game.Screens.Play.HUD
                 return;
 
             if (resetMissBarDelegate != null)
+            {
                 resetMissBarDelegate.Cancel();
+                resetMissBarDelegate = null;
+            }
             else
                 this.TransformTo(nameof(MissBarValue), HealthBarValue);
 
             this.Delay(500).Schedule(() =>
             {
                 this.TransformTo(nameof(MissBarValue), Current.Value, 300, Easing.OutQuint);
+
+                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 300, Easing.OutQuint);
+                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 300, Easing.OutQuint);
+
                 resetMissBarDelegate = null;
             }, out resetMissBarDelegate);
 
-            missBar.FadeIn(120, Easing.OutQuint);
-            missBar.Delay(500).FadeOut(300, Easing.InQuint);
-
             missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour.Lighten(0.1f))
                    .TransformTo(nameof(BarPath.BarColour), miss_bar_colour, 300, Easing.OutQuint);
 
@@ -287,7 +294,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (position >= GlowPortion)
                     return BarColour;
 
-                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion);
+                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion, Easing.InQuart);
             }
         }
     }

From 88d608e1fab112e12cb31660191df51c93f69fd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 00:42:47 +0900
Subject: [PATCH 1618/2100] Tidy up common animation code

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 1419ab1b43..c64d065e50 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -131,14 +131,11 @@ namespace osu.Game.Screens.Play.HUD
             Current.BindValueChanged(v =>
             {
                 if (v.NewValue > MissBarValue)
-                {
-                    missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 300, Easing.OutQuint);
-                    missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 300, Easing.OutQuint);
-                    resetMissBarDelegate?.Cancel();
-                    resetMissBarDelegate = null;
-                }
+                    finishMissBarUsage();
 
                 this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
+                if (resetMissBarDelegate == null)
+                    this.TransformTo(nameof(MissBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
         }
 
@@ -146,8 +143,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Update();
 
-            float targetAlpha = Current.Value > 0 ? 1 : 0;
-            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, targetAlpha, 50.0, Time.Elapsed);
+            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, (float)(Current.Value > 0 ? 1 : 0), 40, Time.Elapsed);
+            missBar.Alpha = (float)Interpolation.DampContinuously(missBar.Alpha, (float)(MissBarValue > 0 ? 1 : 0), 40, Time.Elapsed);
         }
 
         private ScheduledDelegate? resetMissBarDelegate;
@@ -172,10 +169,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 this.TransformTo(nameof(MissBarValue), Current.Value, 300, Easing.OutQuint);
 
-                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 300, Easing.OutQuint);
-                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 300, Easing.OutQuint);
-
-                resetMissBarDelegate = null;
+                finishMissBarUsage();
             }, out resetMissBarDelegate);
 
             missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour.Lighten(0.1f))
@@ -185,6 +179,18 @@ namespace osu.Game.Screens.Play.HUD
                    .TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour, 300, Easing.OutQuint);
         }
 
+        private void finishMissBarUsage()
+        {
+            if (Current.Value > 0)
+            {
+                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.Gray, 300, Easing.OutQuint);
+                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.Gray, 300, Easing.OutQuint);
+            }
+
+            resetMissBarDelegate?.Cancel();
+            resetMissBarDelegate = null;
+        }
+
         protected override void Flash(JudgementResult result)
         {
             base.Flash(result);

From c4f47974bc044a63ec393375b4de5c2cea4a4eb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 00:56:29 +0900
Subject: [PATCH 1619/2100] Improve glow further

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index c64d065e50..97ae2cc7ec 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Play.HUD
             if (Current.Value > 0)
             {
                 missBar.TransformTo(nameof(BarPath.BarColour), Colour4.Gray, 300, Easing.OutQuint);
-                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.Gray, 300, Easing.OutQuint);
+                missBar.TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.OutQuint);
             }
 
             resetMissBarDelegate?.Cancel();
@@ -300,7 +300,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (position >= GlowPortion)
                     return BarColour;
 
-                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion, Easing.InQuart);
+                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion, Easing.InQuint);
             }
         }
     }

From 3a45bcad15857029647b56a462b7de21522e25fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 02:03:45 +0900
Subject: [PATCH 1620/2100] Improve flash and glow further

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 97ae2cc7ec..6cf1daa102 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play.HUD
 
         // the opacity isn't part of the design, it's only here to control glow intensity.
         private static readonly Colour4 health_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.5f);
-        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.6f);
+        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.8f);
 
         private static readonly Colour4 miss_bar_colour = Color4Extensions.FromHex("#FF9393");
         private static readonly Colour4 miss_bar_glow_colour = Color4Extensions.FromHex("#FD0000");
@@ -130,13 +130,15 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(v =>
             {
-                if (v.NewValue > MissBarValue)
+                if (v.NewValue >= MissBarValue)
                     finishMissBarUsage();
 
                 this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
                 if (resetMissBarDelegate == null)
                     this.TransformTo(nameof(MissBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
+
+            updatePathVertices();
         }
 
         protected override void Update()
@@ -172,19 +174,20 @@ namespace osu.Game.Screens.Play.HUD
                 finishMissBarUsage();
             }, out resetMissBarDelegate);
 
-            missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour.Lighten(0.1f))
-                   .TransformTo(nameof(BarPath.BarColour), miss_bar_colour, 300, Easing.OutQuint);
+            missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour, 100, Easing.OutQuint)
+                   .Then()
+                   .TransformTo(nameof(BarPath.BarColour), miss_bar_flash_colour, 800, Easing.OutQuint);
 
-            missBar.TransformTo(nameof(BarPath.GlowColour), miss_bar_flash_colour)
-                   .TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour, 300, Easing.OutQuint);
+            missBar.TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour.Lighten(0.2f))
+                   .TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour, 800, Easing.OutQuint);
         }
 
         private void finishMissBarUsage()
         {
             if (Current.Value > 0)
             {
-                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.Gray, 300, Easing.OutQuint);
-                missBar.TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.OutQuint);
+                missBar.TransformTo(nameof(BarPath.BarColour), health_bar_colour, 300, Easing.In);
+                missBar.TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.In);
             }
 
             resetMissBarDelegate?.Cancel();
@@ -197,6 +200,16 @@ namespace osu.Game.Screens.Play.HUD
 
             healthBar.TransformTo(nameof(BarPath.GlowColour), health_bar_flash_colour)
                      .TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.OutQuint);
+
+            if (resetMissBarDelegate == null)
+            {
+                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
+                       .Then()
+                       .TransformTo(nameof(BarPath.BarColour), health_bar_colour, 800, Easing.OutQuint);
+
+                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
+                       .TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 800, Easing.OutQuint);
+            }
         }
 
         private double missBarValue = 1.0;

From 2410036003e75c4af046f5b15ea00f469328e679 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 17:31:02 +0900
Subject: [PATCH 1621/2100] Refactor tests to be easier to visually understand

---
 .../TestSceneSliderInput.cs                   | 91 ++++++-------------
 1 file changed, 27 insertions(+), 64 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index cf02e0eb32..bacc4fb218 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -6,6 +6,7 @@ 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;
@@ -37,16 +38,18 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
-        [Test]
-        public void TestTrackingBetweenLastTickAndTail()
+        [TestCase(300, false)]
+        [TestCase(200, true)]
+        [TestCase(150, true)]
+        [TestCase(120, true)]
+        [TestCase(60, true)]
+        [TestCase(10, true)]
+        public void TestTailLeniency(float finalPosition, bool hit)
         {
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 480 },
-                new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 500 },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 520 },
+                new OsuReplayFrame { Position = new Vector2(finalPosition, slider_path_length * 3), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 20 },
             }, new Slider
             {
                 StartTime = time_slider_start,
@@ -56,64 +59,18 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     Vector2.Zero,
                     new Vector2(slider_path_length * 10, 0),
-                    new Vector2(slider_path_length * 10, slider_path_length),
-                    new Vector2(0, slider_path_length),
+                    new Vector2(slider_path_length * 10, slider_path_length * 3),
+                    new Vector2(0, slider_path_length * 3),
                 }),
-            });
+            }, 240, 1);
 
-            AddAssert("Full judgement awarded", assertMaxJudge);
-        }
-
-        [Test]
-        public void TestTrackingAtTailButNotLastTick()
-        {
-            performTest(new List<ReplayFrame>
+            if (hit)
             {
-                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 350 },
-                new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 380 },
-            }, new Slider
-            {
-                StartTime = time_slider_start,
-                Position = new Vector2(0, 0),
-                SliderVelocityMultiplier = 10f,
-                Path = new SliderPath(PathType.Linear, new[]
-                {
-                    Vector2.Zero,
-                    new Vector2(slider_path_length * 10, 0),
-                    new Vector2(slider_path_length * 10, slider_path_length),
-                    new Vector2(0, slider_path_length),
-                }),
-            });
-
-            AddAssert("Full judgement awarded", assertMaxJudge);
-        }
-
-        [Test]
-        public void TestTrackingAtLastTickButNotTail()
-        {
-            performTest(new List<ReplayFrame>
-            {
-                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 350 },
-                new OsuReplayFrame { Position = new Vector2(100, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 380 },
-            }, new Slider
-            {
-                StartTime = time_slider_start,
-                Position = new Vector2(0, 0),
-                SliderVelocityMultiplier = 10f,
-                Path = new SliderPath(PathType.Linear, new[]
-                {
-                    Vector2.Zero,
-                    new Vector2(slider_path_length * 10, 0),
-                    new Vector2(slider_path_length * 10, slider_path_length),
-                    new Vector2(0, slider_path_length),
-                }),
-            });
-
-            AddAssert("Full judgement awarded", assertMaxJudge);
+                AddAssert("Tracking retained", assertMaxJudge);
+                AddAssert("Full judgement awarded", assertMaxJudge);
+            }
+            else
+                AddAssert("Tracking dropped", assertMidSliderJudgementFail);
         }
 
         [Test]
@@ -414,7 +371,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.SmallTickMiss;
 
-        private void performTest(List<ReplayFrame> frames, Slider? slider = null)
+        private void performTest(List<ReplayFrame> frames, Slider? slider = null, double? bpm = null, int? tickRate = null)
         {
             slider ??= new Slider
             {
@@ -430,14 +387,20 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddStep("load player", () =>
             {
+                var cpi = new ControlPointInfo();
+
+                if (bpm != null)
+                    cpi.Add(0, new TimingControlPoint { BeatLength = 60000 / bpm.Value });
+
                 Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
                 {
                     HitObjects = { slider },
                     BeatmapInfo =
                     {
-                        Difficulty = new BeatmapDifficulty { SliderTickRate = 3 },
-                        Ruleset = new OsuRuleset().RulesetInfo
+                        Difficulty = new BeatmapDifficulty { SliderTickRate = tickRate ?? 3 },
+                        Ruleset = new OsuRuleset().RulesetInfo,
                     },
+                    ControlPointInfo = cpi,
                 });
 
                 var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });

From 07207ffc322108beb76a6ca9bee9566581eec150 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 13:31:42 +0900
Subject: [PATCH 1622/2100] Fix hitsounds playing too early on fast sliders

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs      | 9 ++++++++-
 .../Objects/Drawables/DrawableSlider.cs                  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index bacc4fb218..d920dfa859 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -46,11 +46,13 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(10, true)]
         public void TestTailLeniency(float finalPosition, bool hit)
         {
+            Slider slider;
+
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
                 new OsuReplayFrame { Position = new Vector2(finalPosition, slider_path_length * 3), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 20 },
-            }, new Slider
+            }, slider = new Slider
             {
                 StartTime = time_slider_start,
                 Position = new Vector2(0, 0),
@@ -71,6 +73,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             }
             else
                 AddAssert("Tracking dropped", assertMidSliderJudgementFail);
+
+            // Even if the last tick is hit early, the slider should always execute its final judgement at its endtime.
+            // If not, hitsounds will not play on time.
+            AddAssert("Judgement offset is zero", () => judgementResults.Last().TimeOffset == 0);
+            AddAssert("Slider judged at end time", () => judgementResults.Last().TimeAbsolute, () => Is.EqualTo(slider.EndTime));
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index f4138bdf91..5571332076 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (userTriggered || !TailCircle.Judged)
+            if (userTriggered || !TailCircle.Judged || Time.Current < HitObject.EndTime)
                 return;
 
             // If only the nested hitobjects are judged, then the slider's own judgement is ignored for scoring purposes.

From b683d55023c639f908f94a9d083563647756f379 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 13:41:49 +0900
Subject: [PATCH 1623/2100] Add a couple of extra tests

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index d920dfa859..ff6b68e1d2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(120, true)]
         [TestCase(60, true)]
         [TestCase(10, true)]
+        [TestCase(0, true)]
+        [TestCase(-30, false)]
         public void TestTailLeniency(float finalPosition, bool hit)
         {
             Slider slider;

From 589abe2c52c221ad07a4f4869672f8e4ae579711 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 15:28:29 +0900
Subject: [PATCH 1624/2100] Add note about broken test

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index ff6b68e1d2..68f635baa1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(120, true)]
         [TestCase(60, true)]
         [TestCase(10, true)]
-        [TestCase(0, true)]
+        // [TestCase(0, true)] headless test doesn't run at high enough precision for this to always enter a tracking state in time.
         [TestCase(-30, false)]
         public void TestTailLeniency(float finalPosition, bool hit)
         {

From 393ec119dd3b6db47421f7fc2ca1e373bf9d3cf8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 13:42:30 +0900
Subject: [PATCH 1625/2100] Add test coverage of very short sliders

---
 .../TestSceneSliderInput.cs                   | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 68f635baa1..a3b9d40601 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.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;
@@ -38,6 +39,44 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
+        // Making these too short causes breakage from frames not being processed fast enough.
+        // To keep things simple, these tests are crafted to always be >16ms length.
+        // If sliders shorter than this are ever used in gameplay it will probably break things and we can revisit.
+        [TestCase(80, 0)]
+        [TestCase(80, 1)]
+        [TestCase(80, 10)]
+        public void TestVeryShortSlider(float sliderLength, int repeatCount)
+        {
+            Slider slider;
+
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = new Vector2(10, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start - 10 },
+                new OsuReplayFrame { Position = new Vector2(10, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 2000 },
+            }, slider = new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 10f,
+                RepeatCount = repeatCount,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(sliderLength, 0),
+                }),
+            }, 240, 1);
+
+            AddAssert("Slider is longer than one frame", () => slider.Duration / (slider.RepeatCount + 1), () => Is.GreaterThan(1000 / 60f));
+            AddAssert("Slider is shorter than lenience", () => slider.Duration / (slider.RepeatCount + 1), () => Is.LessThan(Math.Abs(SliderEventGenerator.TAIL_LENIENCY)));
+
+            assertAllMaxJudgements();
+
+            // Even if the last tick is hit early, the slider should always execute its final judgement at its endtime.
+            // If not, hitsounds will not play on time.
+            AddAssert("Judgement offset is zero", () => judgementResults.Last().TimeOffset == 0);
+            AddAssert("Slider judged at end time", () => judgementResults.Last().TimeAbsolute, () => Is.EqualTo(slider.EndTime));
+        }
+
         [TestCase(300, false)]
         [TestCase(200, true)]
         [TestCase(150, true)]
@@ -70,7 +109,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             if (hit)
             {
-                AddAssert("Tracking retained", assertMaxJudge);
                 AddAssert("Full judgement awarded", assertMaxJudge);
             }
             else

From 3a124a99ce49a39448725122c08eb80012819b8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 14:34:26 +0900
Subject: [PATCH 1626/2100] Improve test output for judgement checking

---
 .../TestSceneSliderInput.cs                   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index a3b9d40601..e98e7f45f6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -108,9 +108,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             }, 240, 1);
 
             if (hit)
-            {
-                AddAssert("Full judgement awarded", assertMaxJudge);
-            }
+                assertAllMaxJudgements();
             else
                 AddAssert("Tracking dropped", assertMidSliderJudgementFail);
 
@@ -129,7 +127,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.RightButton }, Time = time_during_slide_1 },
             });
 
-            AddAssert("Tracking retained", assertMaxJudge);
+            assertAllMaxJudgements();
         }
 
         /// <summary>
@@ -171,7 +169,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_2 },
             });
 
-            AddAssert("Tracking retained", assertMaxJudge);
+            assertAllMaxJudgements();
         }
 
         /// <summary>
@@ -192,7 +190,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_1 },
             });
 
-            AddAssert("Tracking retained", assertMaxJudge);
+            assertAllMaxJudgements();
         }
 
         /// <summary>
@@ -213,7 +211,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_1 },
             });
 
-            AddAssert("Tracking retained", assertMaxJudge);
+            assertAllMaxJudgements();
         }
 
         /// <summary>
@@ -386,7 +384,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.199f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
-            AddAssert("Tracking kept", assertMaxJudge);
+            assertAllMaxJudgements();
         }
 
         /// <summary>
@@ -410,7 +408,13 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Tracking dropped", assertMidSliderJudgementFail);
         }
 
-        private bool assertMaxJudge() => judgementResults.Any() && judgementResults.All(t => t.Type == t.Judgement.MaxResult);
+        private void assertAllMaxJudgements()
+        {
+            AddAssert("All judgements max", () =>
+            {
+                return judgementResults.Select(j => (j.HitObject, j.Type));
+            }, () => Is.EqualTo(judgementResults.Select(j => (j.HitObject, j.Judgement.MaxResult))));
+        }
 
         private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.SmallTickHit && !judgementResults.First().IsHit;
 

From 622cbc3af7e787257f8d5f31f0c98bfef8a97cf0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 16:07:45 +0900
Subject: [PATCH 1627/2100] Adjust test scene to actually make HP bars fit

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 4d8ddcd581..8d3eee2445 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -20,9 +21,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
-        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay();
-        protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay();
-        protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay();
+        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay { Scale = new Vector2(0.6f) };
+        protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay { Scale = new Vector2(0.6f) };
+        protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay { Scale = new Vector2(0.6f) };
 
         [SetUpSteps]
         public void SetUpSteps()
@@ -62,4 +63,4 @@ namespace osu.Game.Tests.Visual.Gameplay
             }, 3);
         }
     }
-}
\ No newline at end of file
+}

From b4b7a7ea5ed60e6da504b7d9df4ec9b054f020dc Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 2 Oct 2023 15:53:05 +0900
Subject: [PATCH 1628/2100] Add LegacyBeatmapConversionDifficultyInfo
 abstraction

---
 .../Beatmaps/ManiaBeatmapConverter.cs         | 53 ++++++++-------
 .../ManiaFilterCriteria.cs                    |  2 +-
 .../LegacyBeatmapConversionDifficultyInfo.cs  | 67 +++++++++++++++++++
 3 files changed, 96 insertions(+), 26 deletions(-)
 create mode 100644 osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index bdc5a00583..aaef69f119 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Utils;
 using osuTK;
 
@@ -43,39 +44,41 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             : base(beatmap, ruleset)
         {
             IsForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.Equals(ruleset.RulesetInfo);
+            TargetColumns = GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmap(beatmap));
 
-            double roundedCircleSize = Math.Round(beatmap.Difficulty.CircleSize);
-            double roundedOverallDifficulty = Math.Round(beatmap.Difficulty.OverallDifficulty);
-
-            if (IsForCurrentRuleset)
+            if (IsForCurrentRuleset && TargetColumns > ManiaRuleset.MAX_STAGE_KEYS)
             {
-                TargetColumns = GetColumnCountForNonConvert(beatmap.BeatmapInfo);
-
-                if (TargetColumns > ManiaRuleset.MAX_STAGE_KEYS)
-                {
-                    TargetColumns /= 2;
-                    Dual = true;
-                }
-            }
-            else
-            {
-                float percentSliderOrSpinner = (float)beatmap.HitObjects.Count(h => h is IHasDuration) / beatmap.HitObjects.Count;
-                if (percentSliderOrSpinner < 0.2)
-                    TargetColumns = 7;
-                else if (percentSliderOrSpinner < 0.3 || roundedCircleSize >= 5)
-                    TargetColumns = roundedOverallDifficulty > 5 ? 7 : 6;
-                else if (percentSliderOrSpinner > 0.6)
-                    TargetColumns = roundedOverallDifficulty > 4 ? 5 : 4;
-                else
-                    TargetColumns = Math.Max(4, Math.Min((int)roundedOverallDifficulty + 1, 7));
+                TargetColumns /= 2;
+                Dual = true;
             }
 
             originalTargetColumns = TargetColumns;
         }
 
-        public static int GetColumnCountForNonConvert(BeatmapInfo beatmapInfo)
+        public static int GetColumnCount(LegacyBeatmapConversionDifficultyInfo difficulty)
         {
-            double roundedCircleSize = Math.Round(beatmapInfo.Difficulty.CircleSize);
+            if (new ManiaRuleset().RulesetInfo.Equals(difficulty.SourceRuleset))
+                return GetColumnCountForNonConvert(difficulty);
+
+            double roundedCircleSize = Math.Round(difficulty.CircleSize);
+            double roundedOverallDifficulty = Math.Round(difficulty.OverallDifficulty);
+
+            int countSliderOrSpinner = difficulty.TotalObjectCount - difficulty.CircleCount;
+            float percentSpecialObjects = (float)countSliderOrSpinner / difficulty.TotalObjectCount;
+
+            if (percentSpecialObjects < 0.2)
+                return 7;
+            if (percentSpecialObjects < 0.3 || roundedCircleSize >= 5)
+                return roundedOverallDifficulty > 5 ? 7 : 6;
+            if (percentSpecialObjects > 0.6)
+                return roundedOverallDifficulty > 4 ? 5 : 4;
+
+            return Math.Max(4, Math.Min((int)roundedOverallDifficulty + 1, 7));
+        }
+
+        public static int GetColumnCountForNonConvert(IBeatmapDifficultyInfo difficulty)
+        {
+            double roundedCircleSize = Math.Round(difficulty.CircleSize);
             return (int)Math.Max(1, roundedCircleSize);
         }
 
diff --git a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
index c8832dfdfb..7f8a00bf88 100644
--- a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
+++ b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania
 
         public bool Matches(BeatmapInfo beatmapInfo)
         {
-            return !keys.HasFilter || (beatmapInfo.Ruleset.OnlineID == new ManiaRuleset().LegacyID && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmapInfo)));
+            return !keys.HasFilter || (beatmapInfo.Ruleset.OnlineID == new ManiaRuleset().LegacyID && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmapInfo.Difficulty)));
         }
 
         public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
new file mode 100644
index 0000000000..97ccf787af
--- /dev/null
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Rulesets.Scoring.Legacy
+{
+    /// <summary>
+    /// A set of properties that are required to facilitate beatmap conversion between legacy rulesets.
+    /// </summary>
+    public class LegacyBeatmapConversionDifficultyInfo : IBeatmapDifficultyInfo
+    {
+        /// <summary>
+        /// The beatmap's ruleset.
+        /// </summary>
+        public IRulesetInfo SourceRuleset { get; set; } = new RulesetInfo();
+
+        /// <summary>
+        /// The beatmap circle size.
+        /// </summary>
+        public float CircleSize { get; set; }
+
+        /// <summary>
+        /// The beatmap overall difficulty.
+        /// </summary>
+        public float OverallDifficulty { get; set; }
+
+        /// <summary>
+        /// The count of hitcircles in the beatmap.
+        /// </summary>
+        /// <remarks>
+        /// When converting from osu! ruleset beatmaps, this is equivalent to the sum of sliders and spinners in the beatmap.
+        /// </remarks>
+        public int CircleCount { get; set; }
+
+        /// <summary>
+        /// The total count of hitobjects in the beatmap.
+        /// </summary>
+        public int TotalObjectCount { get; set; }
+
+        float IBeatmapDifficultyInfo.DrainRate => 0;
+        float IBeatmapDifficultyInfo.ApproachRate => 0;
+        double IBeatmapDifficultyInfo.SliderMultiplier => 0;
+        double IBeatmapDifficultyInfo.SliderTickRate => 0;
+
+        public static LegacyBeatmapConversionDifficultyInfo FromAPIBeatmap(APIBeatmap apiBeatmap) => new LegacyBeatmapConversionDifficultyInfo
+        {
+            SourceRuleset = apiBeatmap.Ruleset,
+            CircleSize = apiBeatmap.CircleSize,
+            OverallDifficulty = apiBeatmap.OverallDifficulty,
+            CircleCount = apiBeatmap.CircleCount,
+            TotalObjectCount = apiBeatmap.SliderCount + apiBeatmap.SpinnerCount + apiBeatmap.CircleCount
+        };
+
+        public static LegacyBeatmapConversionDifficultyInfo FromBeatmap(IBeatmap beatmap) => new LegacyBeatmapConversionDifficultyInfo
+        {
+            SourceRuleset = beatmap.BeatmapInfo.Ruleset,
+            CircleSize = beatmap.Difficulty.CircleSize,
+            OverallDifficulty = beatmap.Difficulty.OverallDifficulty,
+            CircleCount = beatmap.HitObjects.Count(h => h is not IHasDuration),
+            TotalObjectCount = beatmap.HitObjects.Count
+        };
+    }
+}

From da2a4681d9201eadb3ad0e6cd1de486042437d3d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 2 Oct 2023 15:58:31 +0900
Subject: [PATCH 1629/2100] Add method to retrieve legacy score multiplier

---
 .../Difficulty/CatchLegacyScoreSimulator.cs   | 51 +++++++++++++++++
 .../Difficulty/ManiaLegacyScoreSimulator.cs   | 50 +++++++++++++++++
 .../Difficulty/OsuLegacyScoreSimulator.cs     | 56 +++++++++++++++++++
 .../Difficulty/TaikoLegacyScoreSimulator.cs   | 45 +++++++++++++++
 .../Scoring/Legacy/ILegacyScoreSimulator.cs   | 10 ++++
 5 files changed, 212 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index 0183d723b2..746f5713e4 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -2,10 +2,13 @@
 // 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.Mods;
 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;
@@ -137,5 +140,53 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             if (increaseCombo)
                 combo++;
         }
+
+        public double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty)
+        {
+            bool scoreV2 = mods.Any(m => m is ModScoreV2);
+
+            double multiplier = 1.0;
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case CatchModNoFail:
+                        multiplier *= scoreV2 ? 1.0 : 0.5;
+                        break;
+
+                    case CatchModEasy:
+                        multiplier *= 0.5;
+                        break;
+
+                    case CatchModHalfTime:
+                    case CatchModDaycore:
+                        multiplier *= 0.3;
+                        break;
+
+                    case CatchModHidden:
+                        multiplier *= scoreV2 ? 1.0 : 1.06;
+                        break;
+
+                    case CatchModHardRock:
+                        multiplier *= 1.12;
+                        break;
+
+                    case CatchModDoubleTime:
+                    case CatchModNightcore:
+                        multiplier *= 1.06;
+                        break;
+
+                    case CatchModFlashlight:
+                        multiplier *= 1.12;
+                        break;
+
+                    case CatchModRelax:
+                        return 0;
+                }
+            }
+
+            return multiplier;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
index 098ccdf21d..ddb4b868a3 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
@@ -1,7 +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 System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets.Mania.Difficulty
@@ -12,5 +17,50 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         {
             return new LegacyScoreAttributes { ComboScore = 1000000 };
         }
+
+        public double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty)
+        {
+            bool scoreV2 = mods.Any(m => m is ModScoreV2);
+
+            double multiplier = 1.0;
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case ManiaModNoFail:
+                        multiplier *= scoreV2 ? 1.0 : 0.5;
+                        break;
+
+                    case ManiaModEasy:
+                        multiplier *= 0.5;
+                        break;
+
+                    case ManiaModHalfTime:
+                    case ManiaModDaycore:
+                        multiplier *= 0.5;
+                        break;
+                }
+            }
+
+            if (new ManiaRuleset().RulesetInfo.Equals(difficulty.SourceRuleset))
+                return multiplier;
+
+            // Apply key mod multipliers.
+
+            int originalColumns = ManiaBeatmapConverter.GetColumnCount(difficulty);
+            int actualColumns = originalColumns;
+
+            actualColumns = mods.OfType<ManiaKeyMod>().SingleOrDefault()?.KeyCount ?? actualColumns;
+            if (mods.Any(m => m is ManiaModDualStages))
+                actualColumns *= 2;
+
+            if (actualColumns > originalColumns)
+                multiplier *= 0.9;
+            else if (actualColumns < originalColumns)
+                multiplier *= 0.9 - 0.04 * (originalColumns - actualColumns);
+
+            return multiplier;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 952ffa5e7a..3a905d77b1 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -2,11 +2,14 @@
 // 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.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Scoring.Legacy;
@@ -174,5 +177,58 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (increaseCombo)
                 combo++;
         }
+
+        public double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty)
+        {
+            bool scoreV2 = mods.Any(m => m is ModScoreV2);
+
+            double multiplier = 1.0;
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case OsuModNoFail:
+                        multiplier *= scoreV2 ? 1.0 : 0.5;
+                        break;
+
+                    case OsuModEasy:
+                        multiplier *= 0.5;
+                        break;
+
+                    case OsuModHalfTime:
+                    case OsuModDaycore:
+                        multiplier *= 0.3;
+                        break;
+
+                    case OsuModHidden:
+                        multiplier *= 1.06;
+                        break;
+
+                    case OsuModHardRock:
+                        multiplier *= scoreV2 ? 1.10 : 1.06;
+                        break;
+
+                    case OsuModDoubleTime:
+                    case OsuModNightcore:
+                        multiplier *= scoreV2 ? 1.20 : 1.12;
+                        break;
+
+                    case OsuModFlashlight:
+                        multiplier *= 1.12;
+                        break;
+
+                    case OsuModSpunOut:
+                        multiplier *= 0.9;
+                        break;
+
+                    case OsuModRelax:
+                    case OsuModAutopilot:
+                        return 0;
+                }
+            }
+
+            return multiplier;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index d4538d3c00..6a3eb68a22 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -2,13 +2,16 @@
 // 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.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Scoring.Legacy;
+using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
@@ -194,5 +197,47 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             if (increaseCombo)
                 combo++;
         }
+
+        public double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty)
+        {
+            bool scoreV2 = mods.Any(m => m is ModScoreV2);
+
+            double multiplier = 1.0;
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case TaikoModNoFail:
+                        multiplier *= scoreV2 ? 1.0 : 0.5;
+                        break;
+
+                    case TaikoModEasy:
+                        multiplier *= 0.5;
+                        break;
+
+                    case TaikoModHalfTime:
+                    case TaikoModDaycore:
+                        multiplier *= 0.3;
+                        break;
+
+                    case TaikoModHidden:
+                    case TaikoModHardRock:
+                        multiplier *= 1.06;
+                        break;
+
+                    case TaikoModDoubleTime:
+                    case TaikoModNightcore:
+                    case TaikoModFlashlight:
+                        multiplier *= 1.12;
+                        break;
+
+                    case TaikoModRelax:
+                        return 0;
+                }
+            }
+
+            return multiplier;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
index fe7843a682..824f38fe2c 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.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 osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Scoring.Legacy
 {
@@ -16,5 +18,13 @@ namespace osu.Game.Rulesets.Scoring.Legacy
         /// <param name="workingBeatmap">The working beatmap.</param>
         /// <param name="playableBeatmap">A playable version of the beatmap for the ruleset.</param>
         LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap);
+
+        /// <summary>
+        /// Returns the legacy score multiplier for the mods. This is only used during legacy score conversion.
+        /// </summary>
+        /// <param name="mods">The mods.</param>
+        /// <param name="difficulty">Extra difficulty parameters.</param>
+        /// <returns>The legacy multiplier.</returns>
+        double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty);
     }
 }

From b9ab4a2b7cf1306f761bc19b1636581211dae9ad Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 2 Oct 2023 16:54:46 +0900
Subject: [PATCH 1630/2100] Update score conversion to consider legacy
 multiplier

---
 .../BackgroundDataStoreProcessorTests.cs      |  7 ++++---
 osu.Game/BackgroundDataStoreProcessor.cs      |  4 +++-
 .../StandardisedScoreMigrationTools.cs        | 19 +++++++++++--------
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs |  3 ++-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index da46392e4b..e65088ca2e 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -127,8 +127,9 @@ namespace osu.Game.Tests.Database
             });
         }
 
-        [Test]
-        public void TestScoreUpgradeSuccess()
+        [TestCase(30000002)]
+        [TestCase(30000003)]
+        public void TestScoreUpgradeSuccess(int scoreVersion)
         {
             ScoreInfo scoreInfo = null!;
 
@@ -138,7 +139,7 @@ namespace osu.Game.Tests.Database
                 {
                     r.Add(scoreInfo = new ScoreInfo(ruleset: r.All<RulesetInfo>().First(), beatmap: r.All<BeatmapInfo>().First())
                     {
-                        TotalScoreVersion = 30000002,
+                        TotalScoreVersion = scoreVersion,
                         LegacyTotalScore = 123456,
                         IsLegacyScore = true,
                     });
diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index f29b100ee8..90e55dea6d 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -235,7 +235,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.BackgroundReprocessingFailed && s.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
+                                                                             .Where(s => !s.BackgroundReprocessingFailed && s.BeatmapInfo != null
+                                                                                                                         && (s.TotalScoreVersion == 30000002
+                                                                                                                             || s.TotalScoreVersion == 30000003))
                                                                              .AsEnumerable().Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index dd7d7c7b1b..3d48a5d233 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -10,7 +10,6 @@ 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;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -225,28 +224,30 @@ namespace osu.Game.Database
             ILegacyScoreSimulator sv1Simulator = legacyRuleset.CreateLegacyScoreSimulator();
             LegacyScoreAttributes attributes = sv1Simulator.Simulate(beatmap, playableBeatmap);
 
-            return ConvertFromLegacyTotalScore(score, attributes);
+            return ConvertFromLegacyTotalScore(score, LegacyBeatmapConversionDifficultyInfo.FromBeatmap(beatmap.Beatmap), attributes);
         }
 
         /// <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>
+        /// <param name="difficulty">The beatmap difficulty.</param>
+        /// <param name="attributes">The legacy scoring attributes for the beatmap which the score was set on.</param>
         /// <returns>The standardised total score.</returns>
-        public static long ConvertFromLegacyTotalScore(ScoreInfo score, LegacyScoreAttributes attributes)
+        public static long ConvertFromLegacyTotalScore(ScoreInfo score, LegacyBeatmapConversionDifficultyInfo difficulty, LegacyScoreAttributes attributes)
         {
             if (!score.IsLegacyScore)
                 return score.TotalScore;
 
             Debug.Assert(score.LegacyTotalScore != null);
 
-            double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
+            Ruleset ruleset = score.Ruleset.CreateInstance();
+            if (ruleset is not ILegacyRuleset legacyRuleset)
+                return score.TotalScore;
 
+            double legacyModMultiplier = legacyRuleset.CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(score.Mods, difficulty);
             int maximumLegacyAccuracyScore = attributes.AccuracyScore;
-            long maximumLegacyComboScore = (long)Math.Round(attributes.ComboScore * modMultiplier);
+            long maximumLegacyComboScore = (long)Math.Round(attributes.ComboScore * legacyModMultiplier);
             double maximumLegacyBonusRatio = attributes.BonusScoreRatio;
 
             // The part of total score that doesn't include bonus.
@@ -258,6 +259,8 @@ namespace osu.Game.Database
             // The bonus proportion makes up the rest of the score that exceeds maximumLegacyBaseScore.
             double bonusProportion = Math.Max(0, ((long)score.LegacyTotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
 
+            double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
+
             switch (score.Ruleset.OnlineID)
             {
                 case 0:
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 6868c89d26..a95964ac52 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -30,9 +30,10 @@ namespace osu.Game.Scoring.Legacy
         /// <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. 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>
+        /// <item><description>30000004: Fixed mod multipliers during legacy score conversion. Reconvert all scores.</description></item>
         /// </list>
         /// </remarks>
-        public const int LATEST_VERSION = 30000003;
+        public const int LATEST_VERSION = 30000004;
 
         /// <summary>
         /// The first stable-compatible YYYYMMDD format version given to lazer usage of replays.

From 82ba545358723a8560de4444568b107f029a6bfa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 17:01:56 +0900
Subject: [PATCH 1631/2100] Add initial animation for health bars

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    |  4 +-
 osu.Game/Screens/Play/HUD/HealthDisplay.cs    | 42 ++++++++++++++++++-
 osu.Game/Skinning/LegacyHealthDisplay.cs      |  1 +
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 6cf1daa102..68685d7eb5 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private double missBarValue = 1.0;
+        private double missBarValue;
         private readonly List<Vector2> missBarVertices = new List<Vector2>();
 
         public double MissBarValue
@@ -228,7 +228,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private double healthBarValue = 1.0;
+        private double healthBarValue;
         private readonly List<Vector2> healthBarVertices = new List<Vector2>();
 
         public double HealthBarValue
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 5131f93ca2..e4bb91e7ca 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -6,7 +6,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Threading;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
@@ -23,12 +25,16 @@ namespace osu.Game.Screens.Play.HUD
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; } = null!;
 
-        public Bindable<double> Current { get; } = new BindableDouble(1)
+        public Bindable<double> Current { get; } = new BindableDouble
         {
             MinValue = 0,
             MaxValue = 1
         };
 
+        private BindableNumber<double> health = null!;
+
+        private ScheduledDelegate? initialIncrease;
+
         /// <summary>
         /// Triggered when a <see cref="Judgement"/> is a successful hit, signaling the health display to perform a flash animation (if designed to do so).
         /// </summary>
@@ -52,14 +58,46 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            Current.BindTo(HealthProcessor.Health);
             HealthProcessor.NewJudgement += onNewJudgement;
 
+            // Don't bind directly so we can animate the startup procedure.
+            health = HealthProcessor.Health.GetBoundCopy();
+            health.BindValueChanged(h =>
+            {
+                Current.Value = h.NewValue;
+                finishInitialAnimation();
+            });
+
             if (hudOverlay != null)
                 showHealthBar.BindTo(hudOverlay.ShowHealthBar);
 
             // this probably shouldn't be operating on `this.`
             showHealthBar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
+
+            startInitialAnimation();
+        }
+
+        private void startInitialAnimation()
+        {
+            // TODO: this should run in gameplay time, including showing a larger increase when skipping.
+            // TODO: it should also start increasing relative to the first hitobject.
+            const double increase_delay = 150;
+
+            initialIncrease = Scheduler.AddDelayed(() =>
+            {
+                double newValue = Current.Value + 0.05f;
+                this.TransformBindableTo(Current, newValue, increase_delay);
+                Flash(new JudgementResult(new HitObject(), new Judgement()));
+
+                if (newValue >= 1)
+                    finishInitialAnimation();
+            }, increase_delay, true);
+        }
+
+        private void finishInitialAnimation()
+        {
+            initialIncrease?.Cancel();
+            initialIncrease = null;
         }
 
         private void onNewJudgement(JudgementResult judgement)
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index f785022f84..08add79fc1 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -66,6 +66,7 @@ namespace osu.Game.Skinning
             marker.Current.BindTo(Current);
 
             maxFillWidth = fill.Width;
+            fill.Width = 0;
         }
 
         protected override void Update()

From 7dd9951c448515bb438992ca4aa127a3f770e604 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 17:41:08 +0900
Subject: [PATCH 1632/2100] Split out reverse arrow implementations to allow
 better animation

---
 .../Objects/Drawables/DrawableSliderRepeat.cs |  8 +++-
 .../Skinning/Argon/ArgonReverseArrow.cs       | 48 ++++++++++++++-----
 ...seArrowPiece.cs => DefaultReverseArrow.cs} | 13 ++---
 .../Skinning/Legacy/LegacyReverseArrow.cs     | 18 ++++++-
 4 files changed, 63 insertions(+), 24 deletions(-)
 rename osu.Game.Rulesets.Osu/Skinning/Default/{ReverseArrowPiece.cs => DefaultReverseArrow.cs} (78%)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 5721328057..ac4d733672 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public SkinnableDrawable CirclePiece { get; private set; }
 
-        public ReverseArrowPiece Arrow { get; private set; }
+        public SkinnableDrawable Arrow { get; private set; }
 
         private Drawable scaleContainer;
 
@@ -65,7 +65,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                     },
-                    Arrow = new ReverseArrowPiece(),
+                    Arrow = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow), _ => new DefaultReverseArrow())
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
                 }
             });
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index 67fc1b2304..61077e08a4 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -2,12 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 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.Textures;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
@@ -15,14 +19,19 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
-    public partial class ArgonReverseArrow : CompositeDrawable
+    public partial class ArgonReverseArrow : BeatSyncedContainer
     {
+        [Resolved]
+        private DrawableHitObject drawableRepeat { get; set; } = null!;
+
         private Bindable<Color4> accentColour = null!;
 
         private SpriteIcon icon = null!;
 
+        private Container main = null!;
+
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject hitObject)
+        private void load(TextureStore textures, DrawableHitObject hitObject)
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -31,24 +40,39 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             InternalChildren = new Drawable[]
             {
-                new Circle
+                main = new Container
                 {
-                    Size = new Vector2(40, 20),
-                    Colour = Color4.White,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-                icon = new SpriteIcon
-                {
-                    Icon = FontAwesome.Solid.AngleDoubleRight,
-                    Size = new Vector2(16),
+                    RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        new Circle
+                        {
+                            Size = new Vector2(40, 20),
+                            Colour = Color4.White,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                        icon = new SpriteIcon
+                        {
+                            Icon = FontAwesome.Solid.AngleDoubleRight,
+                            Size = new Vector2(16),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                    }
                 },
             };
 
             accentColour = hitObject.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4), true);
         }
+
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        {
+            if (!drawableRepeat.Judged)
+                main.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
similarity index 78%
rename from osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
index 27868db2f6..251f048fb6 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
@@ -9,17 +9,16 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public partial class ReverseArrowPiece : BeatSyncedContainer
+    public partial class DefaultReverseArrow : BeatSyncedContainer
     {
         [Resolved]
         private DrawableHitObject drawableRepeat { get; set; } = null!;
 
-        public ReverseArrowPiece()
+        public DefaultReverseArrow()
         {
             Divisor = 2;
             MinimumBeatLength = 200;
@@ -29,14 +28,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
             Size = OsuHitObject.OBJECT_DIMENSIONS;
 
-            Child = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow), _ => new SpriteIcon
+            Child = new SpriteIcon
             {
                 RelativeSizeAxes = Axes.Both,
                 Blending = BlendingParameters.Additive,
                 Icon = FontAwesome.Solid.ChevronRight,
-                Size = new Vector2(0.35f)
-            })
-            {
+                Size = new Vector2(0.35f),
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
@@ -44,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
-            if (!drawableRepeat.IsHit)
+            if (!drawableRepeat.Judged)
                 Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 3a80607522..c63ae35a3f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -3,9 +3,11 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -14,8 +16,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
-    public partial class LegacyReverseArrow : CompositeDrawable
+    public partial class LegacyReverseArrow : BeatSyncedContainer
     {
+        [Resolved]
+        private DrawableHitObject drawableRepeat { get; set; } = null!;
+
         [Resolved(canBeNull: true)]
         private DrawableHitObject? drawableHitObject { get; set; }
 
@@ -30,6 +35,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skinSource)
         {
+            Divisor = 2;
+            MinimumBeatLength = 200;
+
             AutoSizeAxes = Axes.Both;
 
             string lookupName = new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow).LookupName;
@@ -59,6 +67,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             }
         }
 
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        {
+            if (!drawableRepeat.Judged)
+                Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+        }
+
         private void onHitObjectApplied(DrawableHitObject drawableObject)
         {
             Debug.Assert(proxy.Parent == null);

From 455fc228ad5c572a772648a7da53084ea034dd5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 18:26:35 +0900
Subject: [PATCH 1633/2100] Add edge piece to argon reverse arrow

---
 .../Skinning/Argon/ArgonReverseArrow.cs       | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index 61077e08a4..aed7d1a55f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -29,10 +29,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         private SpriteIcon icon = null!;
 
         private Container main = null!;
+        private Sprite side = null!;
 
         [BackgroundDependencyLoader]
         private void load(TextureStore textures, DrawableHitObject hitObject)
         {
+            Divisor = 2;
+            MinimumBeatLength = 120;
+            EarlyActivationMilliseconds = 30;
+
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
@@ -63,6 +68,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                         },
                     }
                 },
+                side = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = textures.Get("Gameplay/osu/repeat-edge-piece"),
+                    Size = new Vector2(ArgonMainCirclePiece.OUTER_GRADIENT_SIZE),
+                }
             };
 
             accentColour = hitObject.AccentColour.GetBoundCopy();
@@ -72,7 +84,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             if (!drawableRepeat.Judged)
-                main.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+            {
+                main.ScaleTo(1.3f, 30, Easing.Out)
+                    .Then()
+                    .ScaleTo(1f, timingPoint.BeatLength / 2, Easing.Out);
+                side
+                    .MoveToX(-12, 30, Easing.Out)
+                    .Then()
+                    .MoveToX(0, timingPoint.BeatLength / 2, Easing.Out);
+            }
         }
     }
 }

From ad4e988520def03498327625be3c9369be0d0a7d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 18:34:21 +0900
Subject: [PATCH 1634/2100] Adjust reverse arrows to bounce more

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs  | 7 +++----
 .../Skinning/Default/DefaultReverseArrow.cs                | 2 +-
 .../Skinning/Legacy/LegacyReverseArrow.cs                  | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index aed7d1a55f..1ce3a32900 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -35,8 +35,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         private void load(TextureStore textures, DrawableHitObject hitObject)
         {
             Divisor = 2;
-            MinimumBeatLength = 120;
-            EarlyActivationMilliseconds = 30;
+            MinimumBeatLength = 150;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -85,11 +84,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         {
             if (!drawableRepeat.Judged)
             {
-                main.ScaleTo(1.3f, 30, Easing.Out)
+                main.ScaleTo(1.3f, timingPoint.BeatLength / 8, Easing.Out)
                     .Then()
                     .ScaleTo(1f, timingPoint.BeatLength / 2, Easing.Out);
                 side
-                    .MoveToX(-12, 30, Easing.Out)
+                    .MoveToX(-12, timingPoint.BeatLength / 8, Easing.Out)
                     .Then()
                     .MoveToX(0, timingPoint.BeatLength / 2, Easing.Out);
             }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
index 251f048fb6..f1deba7782 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         public DefaultReverseArrow()
         {
             Divisor = 2;
-            MinimumBeatLength = 200;
+            MinimumBeatLength = 150;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index c63ae35a3f..e1d1b088a2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private void load(ISkinSource skinSource)
         {
             Divisor = 2;
-            MinimumBeatLength = 200;
+            MinimumBeatLength = 150;
 
             AutoSizeAxes = Axes.Both;
 

From 8010410487c9e43434e4785af10f64156f4d81d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 19:09:57 +0900
Subject: [PATCH 1635/2100] Stop beat syncing (and close match stable's
 implementation of arrow animation)

---
 .../Skinning/Argon/ArgonReverseArrow.cs       | 50 +++++++++++--------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index 1ce3a32900..d4084a76f1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -10,8 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
@@ -19,24 +16,20 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
-    public partial class ArgonReverseArrow : BeatSyncedContainer
+    public partial class ArgonReverseArrow : CompositeDrawable
     {
         [Resolved]
-        private DrawableHitObject drawableRepeat { get; set; } = null!;
+        private DrawableHitObject drawableObject { get; set; } = null!;
 
         private Bindable<Color4> accentColour = null!;
 
         private SpriteIcon icon = null!;
-
         private Container main = null!;
         private Sprite side = null!;
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures, DrawableHitObject hitObject)
+        private void load(TextureStore textures)
         {
-            Divisor = 2;
-            MinimumBeatLength = 150;
-
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
@@ -76,22 +69,39 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 }
             };
 
-            accentColour = hitObject.AccentColour.GetBoundCopy();
+            accentColour = drawableObject.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4), true);
+
+            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
         {
-            if (!drawableRepeat.Judged)
+            const float move_distance = -12;
+            const double move_out_duration = 35;
+            const double move_in_duration = 250;
+            const double total = 300;
+
+            switch (state)
             {
-                main.ScaleTo(1.3f, timingPoint.BeatLength / 8, Easing.Out)
-                    .Then()
-                    .ScaleTo(1f, timingPoint.BeatLength / 2, Easing.Out);
-                side
-                    .MoveToX(-12, timingPoint.BeatLength / 8, Easing.Out)
-                    .Then()
-                    .MoveToX(0, timingPoint.BeatLength / 2, Easing.Out);
+                case ArmedState.Idle:
+                    main.ScaleTo(1.3f, move_out_duration, Easing.Out)
+                        .Then()
+                        .ScaleTo(1f, move_in_duration, Easing.Out)
+                        .Loop(total - (move_in_duration + move_out_duration));
+                    side
+                        .MoveToX(move_distance, move_out_duration, Easing.Out)
+                        .Then()
+                        .MoveToX(0, move_in_duration, Easing.Out)
+                        .Loop(total - (move_in_duration + move_out_duration));
+                    break;
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+        }
     }
 }

From e4ac8362ecd5329458356013e0c66eff310cf40d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 19:17:45 +0900
Subject: [PATCH 1636/2100] Update other implementations to use non-beat-sync
 logic

---
 .../Skinning/Default/DefaultReverseArrow.cs   | 42 +++++++++----
 .../Skinning/Legacy/LegacyReverseArrow.cs     | 61 ++++++++++---------
 2 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
index f1deba7782..a019a4767b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
@@ -2,33 +2,28 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public partial class DefaultReverseArrow : BeatSyncedContainer
+    public partial class DefaultReverseArrow : CompositeDrawable
     {
         [Resolved]
-        private DrawableHitObject drawableRepeat { get; set; } = null!;
+        private DrawableHitObject drawableObject { get; set; } = null!;
 
         public DefaultReverseArrow()
         {
-            Divisor = 2;
-            MinimumBeatLength = 150;
-
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
             Size = OsuHitObject.OBJECT_DIMENSIONS;
 
-            Child = new SpriteIcon
+            InternalChild = new SpriteIcon
             {
                 RelativeSizeAxes = Axes.Both,
                 Blending = BlendingParameters.Additive,
@@ -39,10 +34,33 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             };
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            if (!drawableRepeat.Judged)
-                Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
+        }
+
+        private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
+        {
+            const double move_out_duration = 35;
+            const double move_in_duration = 250;
+            const double total = 300;
+
+            switch (state)
+            {
+                case ArmedState.Idle:
+                    InternalChild.ScaleTo(1.3f, move_out_duration, Easing.Out)
+                                 .Then()
+                                 .ScaleTo(1f, move_in_duration, Easing.Out)
+                                 .Loop(total - (move_in_duration + move_out_duration));
+                    break;
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index e1d1b088a2..98ac770dd0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -3,11 +3,9 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics.Containers;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -16,13 +14,10 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
-    public partial class LegacyReverseArrow : BeatSyncedContainer
+    public partial class LegacyReverseArrow : CompositeDrawable
     {
         [Resolved]
-        private DrawableHitObject drawableRepeat { get; set; } = null!;
-
-        [Resolved(canBeNull: true)]
-        private DrawableHitObject? drawableHitObject { get; set; }
+        private DrawableHitObject drawableObject { get; set; } = null!;
 
         private Drawable proxy = null!;
 
@@ -35,9 +30,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skinSource)
         {
-            Divisor = 2;
-            MinimumBeatLength = 150;
-
             AutoSizeAxes = Axes.Both;
 
             string lookupName = new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow).LookupName;
@@ -46,6 +38,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty());
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
+
+            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
         }
 
         protected override void LoadComplete()
@@ -54,23 +48,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             proxy = CreateProxy();
 
-            if (drawableHitObject != null)
+            drawableObject.HitObjectApplied += onHitObjectApplied;
+            onHitObjectApplied(drawableObject);
+
+            accentColour = drawableObject.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(c =>
             {
-                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);
-            }
-        }
-
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
-        {
-            if (!drawableRepeat.Judged)
-                Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+                arrow.Colour = textureIsDefaultSkin && c.NewValue.R + c.NewValue.G + c.NewValue.B > (600 / 255f) ? Color4.Black : Color4.White;
+            }, true);
         }
 
         private void onHitObjectApplied(DrawableHitObject drawableObject)
@@ -82,11 +67,29 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                                                     .OverlayElementContainer.Add(proxy);
         }
 
+        private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
+        {
+            const double move_out_duration = 35;
+            const double move_in_duration = 250;
+            const double total = 300;
+
+            switch (state)
+            {
+                case ArmedState.Idle:
+                    InternalChild.ScaleTo(1.3f, move_out_duration, Easing.Out)
+                                 .Then()
+                                 .ScaleTo(1f, move_in_duration, Easing.Out)
+                                 .Loop(total - (move_in_duration + move_out_duration));
+                    break;
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            if (drawableHitObject != null)
-                drawableHitObject.HitObjectApplied -= onHitObjectApplied;
+
+            drawableObject.HitObjectApplied -= onHitObjectApplied;
+            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }

From 1bee7bf353d286978b1b975c1d202c2730ce7b2f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 19:22:24 +0900
Subject: [PATCH 1637/2100] Add note about rotation

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 98ac770dd0..81781bc6b0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -76,6 +76,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             switch (state)
             {
                 case ArmedState.Idle:
+                    // TODO: rotate slightly if Version < 1 (aka UseNewLayout)
                     InternalChild.ScaleTo(1.3f, move_out_duration, Easing.Out)
                                  .Then()
                                  .ScaleTo(1f, move_in_duration, Easing.Out)

From f0070eecf10ce1fe7193e973eee20ae1720e9a12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 20:09:39 +0900
Subject: [PATCH 1638/2100] Add rotation support for very old skins

---
 .../Resources/old-skin/reversearrow.png       | Bin 0 -> 4853 bytes
 .../Skinning/Legacy/LegacyReverseArrow.cs     |  26 ++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/reversearrow.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/reversearrow.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/reversearrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ebdec37d356490d018f711ae525abb3250be3fd
GIT binary patch
literal 4853
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
K&U<aAnEwHrcQ(ZU

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 81781bc6b0..09625c2aed 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private Drawable arrow = null!;
 
+        private bool shouldRotate;
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource skinSource)
         {
@@ -40,6 +42,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
 
             drawableObject.ApplyCustomUpdateState += updateStateTransforms;
+
+            shouldRotate = skinSource.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value <= 1;
         }
 
         protected override void LoadComplete()
@@ -76,11 +80,23 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             switch (state)
             {
                 case ArmedState.Idle:
-                    // TODO: rotate slightly if Version < 1 (aka UseNewLayout)
-                    InternalChild.ScaleTo(1.3f, move_out_duration, Easing.Out)
-                                 .Then()
-                                 .ScaleTo(1f, move_in_duration, Easing.Out)
-                                 .Loop(total - (move_in_duration + move_out_duration));
+                    if (shouldRotate)
+                    {
+                        InternalChild.ScaleTo(1.3f, move_out_duration)
+                                     .RotateTo(5.625f)
+                                     .Then()
+                                     .ScaleTo(1f, move_in_duration)
+                                     .RotateTo(-5.625f, move_in_duration)
+                                     .Loop(total - (move_in_duration + move_out_duration));
+                    }
+                    else
+                    {
+                        InternalChild.ScaleTo(1.3f)
+                                     .Then()
+                                     .ScaleTo(1f, move_in_duration)
+                                     .Loop(total - (move_in_duration + move_out_duration));
+                    }
+
                     break;
             }
         }

From 94e49a34fdd1d827a500d0235800e40fff1cab41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 22:26:57 +0900
Subject: [PATCH 1639/2100] Adjust legacy reverse arrow implementation to match
 stable more closely

---
 .../Skinning/Legacy/LegacyReverseArrow.cs     | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 09625c2aed..7e69c7a25b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -73,28 +73,26 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
         {
-            const double move_out_duration = 35;
-            const double move_in_duration = 250;
-            const double total = 300;
+            const double duration = 300;
+            const float rotation = 5.625f;
 
             switch (state)
             {
                 case ArmedState.Idle:
                     if (shouldRotate)
                     {
-                        InternalChild.ScaleTo(1.3f, move_out_duration)
-                                     .RotateTo(5.625f)
+                        InternalChild.ScaleTo(1.3f)
+                                     .RotateTo(rotation)
                                      .Then()
-                                     .ScaleTo(1f, move_in_duration)
-                                     .RotateTo(-5.625f, move_in_duration)
-                                     .Loop(total - (move_in_duration + move_out_duration));
+                                     .ScaleTo(1f, duration)
+                                     .RotateTo(-rotation, duration)
+                                     .Loop();
                     }
                     else
                     {
-                        InternalChild.ScaleTo(1.3f)
-                                     .Then()
-                                     .ScaleTo(1f, move_in_duration)
-                                     .Loop(total - (move_in_duration + move_out_duration));
+                        InternalChild.ScaleTo(1.3f).Then()
+                                     .ScaleTo(1f, duration, Easing.Out)
+                                     .Loop();
                     }
 
                     break;

From 3aa51301e8b9f94c7088b59af796daf7d011e3fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 22:28:33 +0900
Subject: [PATCH 1640/2100] Add null checks in disposal flow

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs | 5 ++++-
 .../Skinning/Default/DefaultReverseArrow.cs               | 5 ++++-
 .../Skinning/Legacy/LegacyReverseArrow.cs                 | 8 ++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index d4084a76f1..160edb6f67 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -4,6 +4,7 @@
 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.Shapes;
@@ -101,7 +102,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+
+            if (drawableObject.IsNotNull())
+                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
index a019a4767b..b44f6571b9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.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.Framework.Graphics.Sprites;
@@ -60,7 +61,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+
+            if (drawableObject.IsNotNull())
+                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 7e69c7a25b..34bcf95e1d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 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.Objects.Drawables;
@@ -103,8 +104,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.Dispose(isDisposing);
 
-            drawableObject.HitObjectApplied -= onHitObjectApplied;
-            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+            if (drawableObject.IsNotNull())
+            {
+                drawableObject.HitObjectApplied -= onHitObjectApplied;
+                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+            }
         }
     }
 }

From d19cdbdefb731664dda045512f0f7b07486cde75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 22:31:47 +0200
Subject: [PATCH 1641/2100] Add `InvitePlayer` method to multiplayer server

---
 osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs  |  7 +++++++
 osu.Game/Online/Multiplayer/MultiplayerClient.cs       |  2 ++
 osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs | 10 ++++++++++
 3 files changed, 19 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index b7a5faf7c9..64cd6df24d 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -99,5 +99,12 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         /// <param name="playlistItemId">The item to remove.</param>
         Task RemovePlaylistItem(long playlistItemId);
+
+        /// <summary>
+        /// Invites a player to the current room.
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task InvitePlayer(int userId);
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 5716b7ad3b..957f55406a 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -260,6 +260,8 @@ namespace osu.Game.Online.Multiplayer
 
         protected abstract Task LeaveRoomInternal();
 
+        public abstract Task InvitePlayer(int userId);
+
         /// <summary>
         /// Change the current <see cref="MultiplayerRoom"/> settings.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 8ff0ce4065..ebe89cf018 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -106,6 +106,16 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
         }
 
+        public override Task InvitePlayer(int userId)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            Debug.Assert(connection != null);
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.InvitePlayer), userId);
+        }
+
         public override Task TransferHost(int userId)
         {
             if (!IsConnected.Value)

From 574dc67a9ed12762d4a56b2bf20ab5cb128df7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 22:53:28 +0200
Subject: [PATCH 1642/2100] Add `Invited` task to multiplayer client

---
 osu.Game/Online/Multiplayer/IMultiplayerClient.cs |  7 +++++++
 osu.Game/Online/Multiplayer/MultiplayerClient.cs  | 15 +++++++++++++++
 .../Online/Multiplayer/OnlineMultiplayerClient.cs |  1 +
 .../Visual/Multiplayer/TestMultiplayerClient.cs   |  5 +++++
 4 files changed, 28 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 995bac1af5..f59ded93f8 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -42,6 +42,13 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="user">The user.</param>
         Task UserKicked(MultiplayerRoomUser user);
 
+        /// <summary>
+        /// Signals that a user has been invited into a multiplayer room.
+        /// </summary>
+        /// <param name="invitedBy">Id of user that invited the player.</param>
+        /// <param name="room">The room the user got invited to.</param>
+        Task Invited(int invitedBy, MultiplayerRoom room);
+
         /// <summary>
         /// Signal that the host of the room has changed.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 957f55406a..e438f9f96d 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -442,6 +442,21 @@ namespace osu.Game.Online.Multiplayer
             return handleUserLeft(user, UserKicked);
         }
 
+        async Task IMultiplayerClient.Invited(int invitedBy, MultiplayerRoom room)
+        {
+            var user = await userLookupCache.GetUserAsync(invitedBy).ConfigureAwait(false);
+
+            if (user == null) return;
+
+            Scheduler.Add(() =>
+            {
+                PostNotification?.Invoke(new SimpleNotification
+                {
+                    Text = "You got invited into a multiplayer match by " + user.Username + "!",
+                });
+            });
+        }
+
         private void addUserToAPIRoom(MultiplayerRoomUser user)
         {
             Debug.Assert(APIRoom != null);
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index ebe89cf018..0e327bbc83 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Online.Multiplayer
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserKicked), ((IMultiplayerClient)this).UserKicked);
+                    connection.On<int, MultiplayerRoom>(nameof(IMultiplayerClient.Invited), ((IMultiplayerClient)this).Invited);
                     connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
                     connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
                     connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index c27e30d5bb..d44eff47a3 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -263,6 +263,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
+        public override Task InvitePlayer(int userId)
+        {
+            return Task.CompletedTask;
+        }
+
         public override Task TransferHost(int userId)
         {
             userId = clone(userId);

From 7629b725a29834339bc029d1bd754c19e75a5199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 22:55:53 +0200
Subject: [PATCH 1643/2100] Add invite button to UserPanel context menu

---
 osu.Game/Users/UserPanel.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index e2dc511391..29a6c65555 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -18,6 +19,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Localisation;
+using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Users
 {
@@ -61,6 +63,9 @@ namespace osu.Game.Users
         [Resolved]
         protected OsuColour Colours { get; private set; } = null!;
 
+        [Resolved]
+        private MultiplayerClient multiplayerClient { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -117,6 +122,15 @@ namespace osu.Game.Users
                     }));
                 }
 
+                if (
+                    User.IsOnline &&
+                    multiplayerClient.Room != null &&
+                    multiplayerClient.Room.Users.All(u => u.UserID != User.Id)
+                )
+                {
+                    items.Add(new OsuMenuItem(ContextMenuStrings.InvitePlayer, MenuItemType.Standard, () => multiplayerClient.InvitePlayer(User.Id)));
+                }
+
                 return items.ToArray();
             }
         }

From 251e4d4de9d1bb5e44353ffec1f5bdacc546a3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 23:10:29 +0200
Subject: [PATCH 1644/2100] Add localisation for inviting a player

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

diff --git a/osu.Game/Localisation/ContextMenuStrings.cs b/osu.Game/Localisation/ContextMenuStrings.cs
index 8bc213016b..029fba67d8 100644
--- a/osu.Game/Localisation/ContextMenuStrings.cs
+++ b/osu.Game/Localisation/ContextMenuStrings.cs
@@ -19,6 +19,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ViewBeatmap => new TranslatableString(getKey(@"view_beatmap"), @"View beatmap");
 
+        /// <summary>
+        /// "Invite player"
+        /// </summary>
+        public static LocalisableString InvitePlayer => new TranslatableString(getKey(@"invite_player"), @"Invite player");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }

From e81695bcacdde50284133c01db2fd33ecafabac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 23:10:51 +0200
Subject: [PATCH 1645/2100] Display avatar in invitation notification

---
 .../TestSceneNotificationOverlay.cs           | 17 ++++
 .../Online/Multiplayer/MultiplayerClient.cs   |  7 +-
 osu.Game/Overlays/NotificationOverlay.cs      |  2 +-
 .../Notifications/UserAvatarNotification.cs   | 78 +++++++++++++++++++
 4 files changed, 99 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Overlays/Notifications/UserAvatarNotification.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 4d3ae079e3..07bd722322 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -4,13 +4,17 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Database;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
@@ -31,6 +35,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         public double TimeToCompleteProgress { get; set; } = 2000;
 
+        private readonly UserLookupCache userLookupCache = new TestUserLookupCache();
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -60,6 +66,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep(@"simple #2", sendAmazingNotification);
             AddStep(@"progress #1", sendUploadProgress);
             AddStep(@"progress #2", sendDownloadProgress);
+            AddStep(@"User notification", sendUserNotification);
 
             checkProgressingCount(2);
 
@@ -537,6 +544,16 @@ namespace osu.Game.Tests.Visual.UserInterface
             progressingNotifications.Add(n);
         }
 
+        private async void sendUserNotification()
+        {
+            var user = await userLookupCache.GetUserAsync(0).ConfigureAwait(true);
+            if (user == null) return;
+
+            var n = new UserAvatarNotification(user, $"{user.Username} is telling you to NOT download Haitai!");
+
+            notificationOverlay.Post(n);
+        }
+
         private void sendUploadProgress()
         {
             var n = new ProgressNotification
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index e438f9f96d..bb953bae58 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -450,10 +450,9 @@ namespace osu.Game.Online.Multiplayer
 
             Scheduler.Add(() =>
             {
-                PostNotification?.Invoke(new SimpleNotification
-                {
-                    Text = "You got invited into a multiplayer match by " + user.Username + "!",
-                });
+                PostNotification?.Invoke(
+                    new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match!")
+                );
             });
         }
 
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 6e0ea23dd1..67cf868fb0 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.X,
                                     Children = new[]
                                     {
-                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(SimpleNotification) }),
+                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(SimpleNotification), typeof(UserAvatarNotification) }),
                                         new NotificationSection(NotificationsStrings.RunningTasks, new[] { typeof(ProgressNotification) }),
                                     }
                                 }
diff --git a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
new file mode 100644
index 0000000000..191d63a76f
--- /dev/null
+++ b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
@@ -0,0 +1,78 @@
+// Copyright (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;
+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;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users.Drawables;
+
+namespace osu.Game.Overlays.Notifications
+{
+    public partial class UserAvatarNotification : Notification
+    {
+        private LocalisableString text;
+
+        public override LocalisableString Text
+        {
+            get => text;
+            set
+            {
+                text = value;
+                if (textDrawable != null)
+                    textDrawable.Text = text;
+            }
+        }
+
+        private TextFlowContainer? textDrawable;
+
+        private APIUser user;
+
+        public UserAvatarNotification(APIUser user, LocalisableString text)
+        {
+            this.user = user;
+            Text = text;
+        }
+
+        private DrawableAvatar? avatar;
+
+        protected override IconUsage CloseButtonIcon => FontAwesome.Solid.Times;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            IconContent.Masking = true;
+
+            // Workaround for the corner radius on parent's mask breaking if we add masking to IconContent
+            IconContent.CornerRadius = 6;
+
+            IconContent.AddRange(new Drawable[]
+            {
+                new Box()
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background5,
+                },
+            });
+
+            avatar = new DrawableAvatar(user)
+            {
+                FillMode = FillMode.Fill,
+            };
+            LoadComponentAsync(avatar, IconContent.Add);
+
+            Content.Add(textDrawable = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 14, weight: FontWeight.Medium))
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Text = text
+            });
+        }
+    }
+}

From 3879775219991cf44e9f8f44e320dc233637f286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 23:20:24 +0200
Subject: [PATCH 1646/2100] Add room name to invite notification

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index bb953bae58..6e46a5a3b9 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -451,7 +451,7 @@ namespace osu.Game.Online.Multiplayer
             Scheduler.Add(() =>
             {
                 PostNotification?.Invoke(
-                    new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match!")
+                    new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match:\"{room.Settings.Name}\"!")
                 );
             });
         }

From 8e73dbc894d4297b46aaf1a881d40acda797445f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Tue, 3 Oct 2023 01:22:25 +0200
Subject: [PATCH 1647/2100] Load api room before displaying notification

---
 .../Online/Multiplayer/IMultiplayerClient.cs  |  5 ++-
 .../Online/Multiplayer/MultiplayerClient.cs   | 41 +++++++++++++++++--
 .../Multiplayer/OnlineMultiplayerClient.cs    |  2 +-
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index f59ded93f8..ba9e8a237c 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -46,8 +46,9 @@ namespace osu.Game.Online.Multiplayer
         /// Signals that a user has been invited into a multiplayer room.
         /// </summary>
         /// <param name="invitedBy">Id of user that invited the player.</param>
-        /// <param name="room">The room the user got invited to.</param>
-        Task Invited(int invitedBy, MultiplayerRoom room);
+        /// <param name="roomID">Id of the room the user got invited to.</param>
+        /// <param name="password">Password to join the room.</param>
+        Task Invited(int invitedBy, long roomID, string password);
 
         /// <summary>
         /// Signal that the host of the room has changed.
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 6e46a5a3b9..61c2fa495a 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -11,6 +11,7 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Development;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Database;
@@ -30,6 +31,8 @@ namespace osu.Game.Online.Multiplayer
     {
         public Action<Notification>? PostNotification { protected get; set; }
 
+        public Action<Room, string>? InviteAccepted { protected get; set; }
+
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
         /// </summary>
@@ -442,20 +445,50 @@ namespace osu.Game.Online.Multiplayer
             return handleUserLeft(user, UserKicked);
         }
 
-        async Task IMultiplayerClient.Invited(int invitedBy, MultiplayerRoom room)
+        async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password)
         {
-            var user = await userLookupCache.GetUserAsync(invitedBy).ConfigureAwait(false);
+            var loadUserTask = userLookupCache.GetUserAsync(invitedBy);
+            var loadRoomTask = loadRoom(roomID);
 
-            if (user == null) return;
+            await Task.WhenAll(loadUserTask, loadRoomTask).ConfigureAwait(false);
+
+            APIUser? apiUser = loadUserTask.GetResultSafely();
+            Room? apiRoom = loadRoomTask.GetResultSafely();
+
+            if (apiUser == null || apiRoom == null) return;
 
             Scheduler.Add(() =>
             {
                 PostNotification?.Invoke(
-                    new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match:\"{room.Settings.Name}\"!")
+                    new UserAvatarNotification(apiUser, $"{apiUser.Username} invited you to a multiplayer match:\"{apiRoom.Name}\"!")
+                    {
+                        Activated = () =>
+                        {
+                            InviteAccepted?.Invoke(apiRoom, password);
+                            return true;
+                        }
+                    }
                 );
             });
         }
 
+        private Task<Room?> loadRoom(long id)
+        {
+            return Task.Run(() =>
+            {
+                var t = new TaskCompletionSource<Room?>();
+                var request = new GetRoomRequest(id);
+
+                request.Success += room => t.TrySetResult(room);
+
+                request.Failure += e => t.TrySetResult(null);
+
+                API.Queue(request);
+
+                return t.Task;
+            });
+        }
+
         private void addUserToAPIRoom(MultiplayerRoomUser user)
         {
             Debug.Assert(APIRoom != null);
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 0e327bbc83..5b5741ef1c 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Online.Multiplayer
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserKicked), ((IMultiplayerClient)this).UserKicked);
-                    connection.On<int, MultiplayerRoom>(nameof(IMultiplayerClient.Invited), ((IMultiplayerClient)this).Invited);
+                    connection.On<int, long, string>(nameof(IMultiplayerClient.Invited), ((IMultiplayerClient)this).Invited);
                     connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
                     connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
                     connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);

From a171fa7649c7c4e59544a3c7a167694fba51bfe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Tue, 3 Oct 2023 01:31:30 +0200
Subject: [PATCH 1648/2100] Join multiplayer match when clicking the invite
 notification

---
 osu.Game/OsuGame.cs                           | 22 +++++++++++++++++++
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  6 +++++
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    | 13 ++++++-----
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index c60bff9e4c..5372f9227f 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -46,6 +46,7 @@ using osu.Game.IO;
 using osu.Game.Localisation;
 using osu.Game.Online;
 using osu.Game.Online.Chat;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Overlays.Music;
@@ -58,6 +59,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
@@ -643,6 +645,25 @@ namespace osu.Game
             });
         }
 
+        /// <summary>
+        /// Join a multiplayer match immediately.
+        /// </summary>
+        /// <param name="room">The room to join.</param>
+        /// <param name="password">The password to join the room, if any is given.</param>
+        public void PresentMultiplayerMatch(Room room, string password)
+        {
+            PerformFromScreen(screen =>
+            {
+                Multiplayer multiplayer = new Multiplayer();
+                multiplayer.OnLoadComplete += _ =>
+                {
+                    multiplayer.Join(room, password);
+                };
+
+                screen.Push(multiplayer);
+            });
+        }
+
         /// <summary>
         /// Present a score's replay immediately.
         /// The user should have already requested this interactively.
@@ -853,6 +874,7 @@ namespace osu.Game
             ScoreManager.PresentImport = items => PresentScore(items.First().Value);
 
             MultiplayerClient.PostNotification = n => Notifications.Post(n);
+            MultiplayerClient.InviteAccepted = PresentMultiplayerMatch;
 
             // make config aware of how to lookup skins for on-screen display purposes.
             // if this becomes a more common thing, tracked settings should be reconsidered to allow local DI.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 514b80b999..f74b5dd96e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Lounge;
 
@@ -90,6 +91,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override LoungeSubScreen CreateLounge() => new MultiplayerLoungeSubScreen();
 
+        public void Join(Room room, string? password)
+        {
+            LoungeSubScreen.Join(room, password);
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 37b50b4863..85eec7ac07 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -32,8 +32,9 @@ namespace osu.Game.Screens.OnlinePlay
         // while leases may be taken out by a subscreen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        protected LoungeSubScreen LoungeSubScreen;
+
         private MultiplayerWaveContainer waves;
-        private LoungeSubScreen loungeSubScreen;
         private ScreenStack screenStack;
 
         [Cached(Type = typeof(IRoomManager))]
@@ -89,7 +90,7 @@ namespace osu.Game.Screens.OnlinePlay
             screenStack.ScreenPushed += screenPushed;
             screenStack.ScreenExited += screenExited;
 
-            screenStack.Push(loungeSubScreen = CreateLounge());
+            screenStack.Push(LoungeSubScreen = CreateLounge());
 
             apiState.BindTo(API.State);
             apiState.BindValueChanged(onlineStateChanged, true);
@@ -120,10 +121,10 @@ namespace osu.Game.Screens.OnlinePlay
 
             Mods.SetDefault();
 
-            if (loungeSubScreen.IsCurrentScreen())
-                loungeSubScreen.OnEntering(e);
+            if (LoungeSubScreen.IsCurrentScreen())
+                LoungeSubScreen.OnEntering(e);
             else
-                loungeSubScreen.MakeCurrent();
+                LoungeSubScreen.MakeCurrent();
         }
 
         public override void OnResuming(ScreenTransitionEvent e)
@@ -158,7 +159,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         public override bool OnExiting(ScreenExitEvent e)
         {
-            while (screenStack.CurrentScreen != null && screenStack.CurrentScreen is not LoungeSubScreen)
+            while (screenStack.CurrentScreen != null && screenStack.CurrentScreen is not Lounge.LoungeSubScreen)
             {
                 var subScreen = (Screen)screenStack.CurrentScreen;
                 if (subScreen.IsLoaded && subScreen.OnExiting(e))

From 16fcc4eaaa9818989a1ad39cb6921822ab35abc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 12:32:52 +0900
Subject: [PATCH 1649/2100] Fix incorrect anchor/origin causing rotation to
 look wrong on legacy skin arrows

---
 .../Skinning/Legacy/LegacyReverseArrow.cs                  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 34bcf95e1d..25de6d2381 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -39,7 +39,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
 
-            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty());
+            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty()).With(d =>
+            {
+                d.Anchor = Anchor.Centre;
+                d.Origin = Anchor.Centre;
+            });
+
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
 
             drawableObject.ApplyCustomUpdateState += updateStateTransforms;

From b234a453da2319a4fc5101ecc5b5d41865232cce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 16:01:15 +0900
Subject: [PATCH 1650/2100] Fix legacy beatmap importer not always handling
 nested paths correctly

Addresses https://github.com/ppy/osu/discussions/24989.
---
 osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs | 8 +++++++-
 osu.Game/Database/LegacyBeatmapImporter.cs           | 5 ++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
index 0144c0bf97..5f722e381c 100644
--- a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
@@ -44,17 +44,23 @@ namespace osu.Game.Tests.Database
                 createFile(subdirectory2, Path.Combine("beatmap5", "beatmap.osu"));
                 createFile(subdirectory2, Path.Combine("beatmap6", "beatmap.osu"));
 
+                // songs subdirectory with random file
+                var subdirectory3 = songsStorage.GetStorageForDirectory("subdirectory3");
+                createFile(subdirectory3, "silly readme.txt");
+                createFile(subdirectory3, Path.Combine("beatmap7", "beatmap.osu"));
+
                 // empty songs subdirectory
                 songsStorage.GetStorageForDirectory("subdirectory3");
 
                 string[] paths = importer.GetStableImportPaths(songsStorage).ToArray();
-                Assert.That(paths.Length, Is.EqualTo(6));
+                Assert.That(paths.Length, Is.EqualTo(7));
                 Assert.That(paths.Contains(songsStorage.GetFullPath("beatmap1")));
                 Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "beatmap2"))));
                 Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "beatmap3"))));
                 Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "sub-subdirectory", "beatmap4"))));
                 Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory2", "beatmap5"))));
                 Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory2", "beatmap6"))));
+                Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory3", "beatmap7"))));
             }
 
             static void createFile(Storage storage, string path)
diff --git a/osu.Game/Database/LegacyBeatmapImporter.cs b/osu.Game/Database/LegacyBeatmapImporter.cs
index 20add54949..a090698a68 100644
--- a/osu.Game/Database/LegacyBeatmapImporter.cs
+++ b/osu.Game/Database/LegacyBeatmapImporter.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
@@ -34,9 +33,9 @@ namespace osu.Game.Database
 
                     try
                     {
-                        if (!directoryStorage.GetFiles(string.Empty).ExcludeSystemFileNames().Any())
+                        if (!directoryStorage.GetFiles(string.Empty, "*.osu").Any())
                         {
-                            // if a directory doesn't contain files, attempt looking for beatmaps inside of that directory.
+                            // if a directory doesn't contain any beatmap files, look for further nested beatmap directories.
                             // this is a special behaviour in stable for beatmaps only, see https://github.com/ppy/osu/issues/18615.
                             foreach (string subDirectory in GetStableImportPaths(directoryStorage))
                                 paths.Add(subDirectory);

From 2cbec6dbdf115562d64d44f515ee9ad520e20416 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:11:52 +0900
Subject: [PATCH 1651/2100] 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 58e18d3187..0ee922e53a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.928.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 8178cf3a8dce61729699668898bd61b6b80ee5b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:17:11 +0900
Subject: [PATCH 1652/2100] Tidy up background colour gradient logic

This changes things visually a touch, but I think it feels better.
And reads better.
---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 6cf1daa102..f2f71ab64d 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -267,10 +267,12 @@ namespace osu.Game.Screens.Play.HUD
             protected override Color4 ColourAt(float position)
             {
                 if (position <= 0.128f)
-                    return Color4.White.Opacity(0.5f);
+                    return Color4.White.Opacity(0.8f);
 
-                position -= 0.128f;
-                return Interpolation.ValueAt(Math.Clamp(position, 0f, 1f), Color4.White.Opacity(0.5f), Color4.Black.Opacity(0.5f), -0.75f, 1f, Easing.OutQuart);
+                return Interpolation.ValueAt(position,
+                    Color4.White.Opacity(0.8f),
+                    Color4.Black.Opacity(0.2f),
+                    -0.5f, 1f, Easing.OutQuint);
             }
         }
 

From e1445fcc65cf60800fd6f86785db051d821b5f64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:17:42 +0900
Subject: [PATCH 1653/2100] Adjust health display test scene's background
 colour to better visualise background fill

---
 osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index 12a2611a76..06a7763711 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
+                        Colour = Color4.Gray,
                     },
                     new ArgonHealthDisplay
                     {

From 4f9daa1c14eda97baf27a5ab547add008fe46171 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:31:50 +0900
Subject: [PATCH 1654/2100] Tidy up `ArgonHealthDisplay` code quality

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 183 +++++++++---------
 1 file changed, 88 insertions(+), 95 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index f2f71ab64d..6d16915576 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -25,55 +25,64 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonHealthDisplay : HealthDisplay, ISerialisableDrawable
     {
+        public bool UsesFixedAnchor { get; set; }
+
         private const float curve_start = 280;
         private const float curve_end = 310;
         private const float curve_smoothness = 10;
 
         private const float bar_length = 350;
-        private const float bar_height = 32.5f;
+        private const float bar_verticality = 32.5f;
 
         private BarPath healthBar = null!;
         private BarPath missBar = null!;
+        private BackgroundPath background = null!;
 
         private SliderPath barPath = null!;
 
-        private static readonly Colour4 health_bar_colour = Colour4.White;
+        private static readonly Colour4 main_bar_colour = Colour4.White;
+        private static readonly Colour4 main_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.5f);
 
-        // the opacity isn't part of the design, it's only here to control glow intensity.
-        private static readonly Colour4 health_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.5f);
-        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.8f);
+        private ScheduledDelegate? resetMissBarDelegate;
 
-        private static readonly Colour4 miss_bar_colour = Color4Extensions.FromHex("#FF9393");
-        private static readonly Colour4 miss_bar_glow_colour = Color4Extensions.FromHex("#FD0000");
+        private readonly List<Vector2> missBarVertices = new List<Vector2>();
+        private readonly List<Vector2> healthBarVertices = new List<Vector2>();
 
-        // the "flashed" glow colour is just a lightened version of the original one, not part of the design.
-        private static readonly Colour4 miss_bar_flash_colour = Color4Extensions.FromHex("#FF5D5D");
+        private double missBarValue = 1;
 
-        public bool UsesFixedAnchor { get; set; }
+        public double MissBarValue
+        {
+            get => missBarValue;
+            set
+            {
+                if (missBarValue == value)
+                    return;
+
+                missBarValue = value;
+                updatePathVertices();
+            }
+        }
+
+        private double healthBarValue = 1;
+
+        public double HealthBarValue
+        {
+            get => healthBarValue;
+            set
+            {
+                if (healthBarValue == value)
+                    return;
+
+                healthBarValue = value;
+                updatePathVertices();
+            }
+        }
 
         [BackgroundDependencyLoader]
         private void load()
         {
             AutoSizeAxes = Axes.Both;
 
-            Vector2 diagonalDir = (new Vector2(curve_end, bar_height) - new Vector2(curve_start, 0)).Normalized();
-
-            // todo: SliderPath or parts of it should be moved away to a utility class as they're useful for making curved paths in general, as done here.
-            barPath = new SliderPath(new[]
-            {
-                new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                new PathControlPoint(new Vector2(curve_start - curve_smoothness, 0), PathType.Bezier),
-                new PathControlPoint(new Vector2(curve_start, 0)),
-                new PathControlPoint(new Vector2(curve_start, 0) + diagonalDir * curve_smoothness, PathType.Linear),
-                new PathControlPoint(new Vector2(curve_end, bar_height) - diagonalDir * curve_smoothness, PathType.Bezier),
-                new PathControlPoint(new Vector2(curve_end, bar_height)),
-                new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_height), PathType.Linear),
-                new PathControlPoint(new Vector2(bar_length, bar_height)),
-            });
-
-            var vertices = new List<Vector2>();
-            barPath.GetPathToProgress(vertices, 0.0, 1.0);
-
             InternalChild = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
@@ -83,7 +92,7 @@ namespace osu.Game.Screens.Play.HUD
                 {
                     new Circle
                     {
-                        Margin = new MarginPadding { Top = 10f - 3f / 2f, Left = -2f },
+                        Margin = new MarginPadding { Top = 8.5f, Left = -2 },
                         Size = new Vector2(50f, 3f),
                     },
                     new Container
@@ -91,10 +100,9 @@ namespace osu.Game.Screens.Play.HUD
                         AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
-                            new BackgroundPath
+                            background = new BackgroundPath
                             {
                                 PathRadius = 10f,
-                                Vertices = vertices,
                             },
                             missBar = new BarPath
                             {
@@ -103,25 +111,26 @@ namespace osu.Game.Screens.Play.HUD
                                 Blending = BlendingParameters.Additive,
                                 Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
                                 PathRadius = 40f,
-                                GlowPortion = 0.9f,
+                                // Kinda hacky, but results in correct positioning with increased path radius.
                                 Margin = new MarginPadding(-30f),
-                                Vertices = vertices
+                                GlowPortion = 0.9f,
                             },
                             healthBar = new BarPath
                             {
                                 AutoSizeAxes = Axes.None,
                                 RelativeSizeAxes = Axes.Both,
                                 Blending = BlendingParameters.Additive,
-                                BarColour = health_bar_colour,
-                                GlowColour = health_bar_glow_colour,
+                                BarColour = main_bar_colour,
+                                GlowColour = main_bar_glow_colour,
                                 PathRadius = 10f,
                                 GlowPortion = 0.6f,
-                                Vertices = vertices
                             },
                         }
                     }
                 },
             };
+
+            updatePath();
         }
 
         protected override void LoadComplete()
@@ -137,28 +146,38 @@ namespace osu.Game.Screens.Play.HUD
                 if (resetMissBarDelegate == null)
                     this.TransformTo(nameof(MissBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
-
-            updatePathVertices();
         }
 
         protected override void Update()
         {
             base.Update();
 
-            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, (float)(Current.Value > 0 ? 1 : 0), 40, Time.Elapsed);
-            missBar.Alpha = (float)Interpolation.DampContinuously(missBar.Alpha, (float)(MissBarValue > 0 ? 1 : 0), 40, Time.Elapsed);
+            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, Current.Value > 0 ? 1 : 0, 40, Time.Elapsed);
+            missBar.Alpha = (float)Interpolation.DampContinuously(missBar.Alpha, MissBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
         }
 
-        private ScheduledDelegate? resetMissBarDelegate;
+        protected override void Flash(JudgementResult result)
+        {
+            base.Flash(result);
+
+            healthBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour.Opacity(0.8f))
+                     .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
+
+            if (resetMissBarDelegate == null)
+            {
+                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
+                       .Then()
+                       .TransformTo(nameof(BarPath.BarColour), main_bar_colour, 800, Easing.OutQuint);
+
+                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
+                       .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 800, Easing.OutQuint);
+            }
+        }
 
         protected override void Miss(JudgementResult result)
         {
             base.Miss(result);
 
-            if (result.HealthAtJudgement == 0.0)
-                // health is already empty, nothing should be displayed here.
-                return;
-
             if (resetMissBarDelegate != null)
             {
                 resetMissBarDelegate.Cancel();
@@ -170,78 +189,52 @@ namespace osu.Game.Screens.Play.HUD
             this.Delay(500).Schedule(() =>
             {
                 this.TransformTo(nameof(MissBarValue), Current.Value, 300, Easing.OutQuint);
-
                 finishMissBarUsage();
             }, out resetMissBarDelegate);
 
-            missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour, 100, Easing.OutQuint)
-                   .Then()
-                   .TransformTo(nameof(BarPath.BarColour), miss_bar_flash_colour, 800, Easing.OutQuint);
+            missBar.TransformTo(nameof(BarPath.BarColour), new Colour4(255, 147, 147, 255), 100, Easing.OutQuint).Then()
+                   .TransformTo(nameof(BarPath.BarColour), new Colour4(255, 93, 93, 255), 800, Easing.OutQuint);
 
-            missBar.TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour.Lighten(0.2f))
-                   .TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour, 800, Easing.OutQuint);
+            missBar.TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255).Lighten(0.2f))
+                   .TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255), 800, Easing.OutQuint);
         }
 
         private void finishMissBarUsage()
         {
             if (Current.Value > 0)
             {
-                missBar.TransformTo(nameof(BarPath.BarColour), health_bar_colour, 300, Easing.In);
-                missBar.TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.In);
+                missBar.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 300, Easing.In);
+                missBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.In);
             }
 
             resetMissBarDelegate?.Cancel();
             resetMissBarDelegate = null;
         }
 
-        protected override void Flash(JudgementResult result)
+        private void updatePath()
         {
-            base.Flash(result);
+            Vector2 diagonalDir = (new Vector2(curve_end, bar_verticality) - new Vector2(curve_start, 0)).Normalized();
 
-            healthBar.TransformTo(nameof(BarPath.GlowColour), health_bar_flash_colour)
-                     .TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.OutQuint);
-
-            if (resetMissBarDelegate == null)
+            barPath = new SliderPath(new[]
             {
-                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
-                       .Then()
-                       .TransformTo(nameof(BarPath.BarColour), health_bar_colour, 800, Easing.OutQuint);
+                new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                new PathControlPoint(new Vector2(curve_start - curve_smoothness, 0), PathType.Bezier),
+                new PathControlPoint(new Vector2(curve_start, 0)),
+                new PathControlPoint(new Vector2(curve_start, 0) + diagonalDir * curve_smoothness, PathType.Linear),
+                new PathControlPoint(new Vector2(curve_end, bar_verticality) - diagonalDir * curve_smoothness, PathType.Bezier),
+                new PathControlPoint(new Vector2(curve_end, bar_verticality)),
+                new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_verticality), PathType.Linear),
+                new PathControlPoint(new Vector2(bar_length, bar_verticality)),
+            });
 
-                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
-                       .TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 800, Easing.OutQuint);
-            }
-        }
+            List<Vector2> vertices = new List<Vector2>();
+            barPath.GetPathToProgress(vertices, 0.0, 1.0);
 
-        private double missBarValue = 1.0;
-        private readonly List<Vector2> missBarVertices = new List<Vector2>();
+            background.Vertices = vertices;
+            healthBar.Vertices = vertices;
+            missBar.Vertices = vertices;
 
-        public double MissBarValue
-        {
-            get => missBarValue;
-            set
-            {
-                if (missBarValue == value)
-                    return;
-
-                missBarValue = value;
-                updatePathVertices();
-            }
-        }
-
-        private double healthBarValue = 1.0;
-        private readonly List<Vector2> healthBarVertices = new List<Vector2>();
-
-        public double HealthBarValue
-        {
-            get => healthBarValue;
-            set
-            {
-                if (healthBarValue == value)
-                    return;
-
-                healthBarValue = value;
-                updatePathVertices();
-            }
+            updatePathVertices();
         }
 
         private void updatePathVertices()

From 32b2ac4974d13d98f9abf73f47b6c72a12cd65a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:41:10 +0900
Subject: [PATCH 1655/2100] Rename and refactor glow/miss bars to hopefully
 make more sense

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 74 ++++++++++---------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 6d16915576..f7b90fe563 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -34,8 +34,13 @@ namespace osu.Game.Screens.Play.HUD
         private const float bar_length = 350;
         private const float bar_verticality = 32.5f;
 
-        private BarPath healthBar = null!;
-        private BarPath missBar = null!;
+        private BarPath mainBar = null!;
+
+        /// <summary>
+        /// Used to show a glow at the end of the main bar, or red "damage" area when missing.
+        /// </summary>
+        private BarPath glowBar = null!;
+
         private BackgroundPath background = null!;
 
         private SliderPath barPath = null!;
@@ -48,17 +53,17 @@ namespace osu.Game.Screens.Play.HUD
         private readonly List<Vector2> missBarVertices = new List<Vector2>();
         private readonly List<Vector2> healthBarVertices = new List<Vector2>();
 
-        private double missBarValue = 1;
+        private double glowBarValue = 1;
 
-        public double MissBarValue
+        public double GlowBarValue
         {
-            get => missBarValue;
+            get => glowBarValue;
             set
             {
-                if (missBarValue == value)
+                if (glowBarValue == value)
                     return;
 
-                missBarValue = value;
+                glowBarValue = value;
                 updatePathVertices();
             }
         }
@@ -104,7 +109,7 @@ namespace osu.Game.Screens.Play.HUD
                             {
                                 PathRadius = 10f,
                             },
-                            missBar = new BarPath
+                            glowBar = new BarPath
                             {
                                 BarColour = Color4.White,
                                 GlowColour = OsuColour.Gray(0.5f),
@@ -115,7 +120,7 @@ namespace osu.Game.Screens.Play.HUD
                                 Margin = new MarginPadding(-30f),
                                 GlowPortion = 0.9f,
                             },
-                            healthBar = new BarPath
+                            mainBar = new BarPath
                             {
                                 AutoSizeAxes = Axes.None,
                                 RelativeSizeAxes = Axes.Both,
@@ -139,12 +144,12 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(v =>
             {
-                if (v.NewValue >= MissBarValue)
-                    finishMissBarUsage();
+                if (v.NewValue >= GlowBarValue)
+                    finishMissDisplay();
 
                 this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
                 if (resetMissBarDelegate == null)
-                    this.TransformTo(nameof(MissBarValue), v.NewValue, 300, Easing.OutQuint);
+                    this.TransformTo(nameof(GlowBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
         }
 
@@ -152,24 +157,24 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Update();
 
-            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, Current.Value > 0 ? 1 : 0, 40, Time.Elapsed);
-            missBar.Alpha = (float)Interpolation.DampContinuously(missBar.Alpha, MissBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
+            mainBar.Alpha = (float)Interpolation.DampContinuously(mainBar.Alpha, Current.Value > 0 ? 1 : 0, 40, Time.Elapsed);
+            glowBar.Alpha = (float)Interpolation.DampContinuously(glowBar.Alpha, GlowBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
         }
 
         protected override void Flash(JudgementResult result)
         {
             base.Flash(result);
 
-            healthBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour.Opacity(0.8f))
-                     .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
+            mainBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour.Opacity(0.8f))
+                   .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
 
             if (resetMissBarDelegate == null)
             {
-                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
+                glowBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
                        .Then()
                        .TransformTo(nameof(BarPath.BarColour), main_bar_colour, 800, Easing.OutQuint);
 
-                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
+                glowBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
                        .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 800, Easing.OutQuint);
             }
         }
@@ -184,27 +189,30 @@ namespace osu.Game.Screens.Play.HUD
                 resetMissBarDelegate = null;
             }
             else
-                this.TransformTo(nameof(MissBarValue), HealthBarValue);
+            {
+                // Reset any ongoing animation immediately, else things get weird.
+                this.TransformTo(nameof(GlowBarValue), HealthBarValue);
+            }
 
             this.Delay(500).Schedule(() =>
             {
-                this.TransformTo(nameof(MissBarValue), Current.Value, 300, Easing.OutQuint);
-                finishMissBarUsage();
+                this.TransformTo(nameof(GlowBarValue), Current.Value, 300, Easing.OutQuint);
+                finishMissDisplay();
             }, out resetMissBarDelegate);
 
-            missBar.TransformTo(nameof(BarPath.BarColour), new Colour4(255, 147, 147, 255), 100, Easing.OutQuint).Then()
+            glowBar.TransformTo(nameof(BarPath.BarColour), new Colour4(255, 147, 147, 255), 100, Easing.OutQuint).Then()
                    .TransformTo(nameof(BarPath.BarColour), new Colour4(255, 93, 93, 255), 800, Easing.OutQuint);
 
-            missBar.TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255).Lighten(0.2f))
+            glowBar.TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255).Lighten(0.2f))
                    .TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255), 800, Easing.OutQuint);
         }
 
-        private void finishMissBarUsage()
+        private void finishMissDisplay()
         {
             if (Current.Value > 0)
             {
-                missBar.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 300, Easing.In);
-                missBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.In);
+                glowBar.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 300, Easing.In);
+                glowBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.In);
             }
 
             resetMissBarDelegate?.Cancel();
@@ -231,8 +239,8 @@ namespace osu.Game.Screens.Play.HUD
             barPath.GetPathToProgress(vertices, 0.0, 1.0);
 
             background.Vertices = vertices;
-            healthBar.Vertices = vertices;
-            missBar.Vertices = vertices;
+            mainBar.Vertices = vertices;
+            glowBar.Vertices = vertices;
 
             updatePathVertices();
         }
@@ -240,7 +248,7 @@ namespace osu.Game.Screens.Play.HUD
         private void updatePathVertices()
         {
             barPath.GetPathToProgress(healthBarVertices, 0.0, healthBarValue);
-            barPath.GetPathToProgress(missBarVertices, healthBarValue, Math.Max(missBarValue, healthBarValue));
+            barPath.GetPathToProgress(missBarVertices, healthBarValue, Math.Max(glowBarValue, healthBarValue));
 
             if (healthBarVertices.Count == 0)
                 healthBarVertices.Add(Vector2.Zero);
@@ -248,11 +256,11 @@ namespace osu.Game.Screens.Play.HUD
             if (missBarVertices.Count == 0)
                 missBarVertices.Add(Vector2.Zero);
 
-            missBar.Vertices = missBarVertices.Select(v => v - missBarVertices[0]).ToList();
-            missBar.Position = missBarVertices[0];
+            glowBar.Vertices = missBarVertices.Select(v => v - missBarVertices[0]).ToList();
+            glowBar.Position = missBarVertices[0];
 
-            healthBar.Vertices = healthBarVertices.Select(v => v - healthBarVertices[0]).ToList();
-            healthBar.Position = healthBarVertices[0];
+            mainBar.Vertices = healthBarVertices.Select(v => v - healthBarVertices[0]).ToList();
+            mainBar.Position = healthBarVertices[0];
         }
 
         private partial class BackgroundPath : SmoothPath

From 4f3c433946173001e90f6768e9a06bc510c04f1b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:41:52 +0900
Subject: [PATCH 1656/2100] Move vertex related constants local to method

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index f7b90fe563..62a4b958c2 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -27,13 +27,6 @@ namespace osu.Game.Screens.Play.HUD
     {
         public bool UsesFixedAnchor { get; set; }
 
-        private const float curve_start = 280;
-        private const float curve_end = 310;
-        private const float curve_smoothness = 10;
-
-        private const float bar_length = 350;
-        private const float bar_verticality = 32.5f;
-
         private BarPath mainBar = null!;
 
         /// <summary>
@@ -221,6 +214,13 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updatePath()
         {
+            const float curve_start = 280;
+            const float curve_end = 310;
+            const float curve_smoothness = 10;
+
+            const float bar_length = 350;
+            const float bar_verticality = 32.5f;
+
             Vector2 diagonalDir = (new Vector2(curve_end, bar_verticality) - new Vector2(curve_start, 0)).Normalized();
 
             barPath = new SliderPath(new[]

From 00867593950322e5dbf46b1756a29eb5ea7c71bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 15:23:22 +0900
Subject: [PATCH 1657/2100] Fix slider tracking state being set to `false`
 after slider end

---
 .../Objects/Drawables/DrawableSliderBall.cs                | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index 47214f1e53..63e500d687 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -132,6 +132,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
+            if (Time.Current >= drawableSlider.HitObject.EndTime)
+                return;
+
             // from the point at which the head circle is hit, this will be non-null.
             // it may be null if the head circle was missed.
             var headCircleHitAction = GetInitialHitAction();
@@ -153,9 +156,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Tracking =
                 // in valid time range
-                Time.Current >= drawableSlider.HitObject.StartTime && Time.Current < drawableSlider.HitObject.EndTime &&
+                Time.Current >= drawableSlider.HitObject.StartTime
                 // in valid position range
-                lastScreenSpaceMousePosition.HasValue && followCircleReceptor.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
+                && lastScreenSpaceMousePosition.HasValue && followCircleReceptor.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
                 (actions?.Any(isValidTrackingAction) ?? false);
 

From 9a3c21c3206a9853e5379783f83c38e9439f2cb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 15:30:33 +0900
Subject: [PATCH 1658/2100] Change comparison of `timeOffset` to greater-than
 (in line with others)
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/Objects/Drawables/DrawableSliderTail.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 7daab820dd..9edf3808c5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             // An actual tick miss should only occur if reaching the tick itself.
             if (timeOffset >= SliderEventGenerator.TAIL_LENIENCY && Tracking)
                 ApplyResult(r => r.Type = r.Judgement.MaxResult);
-            else if (timeOffset >= 0)
+            else if (timeOffset > 0)
                 ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
 

From 941f26d46233902f88a4088c3bfa354064e13dee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 18:35:01 +0900
Subject: [PATCH 1659/2100] Add extra test coverage to
 `TestSceneOsuModAutoplay` to cover fail case

Basically the slider needs to be slightly longer for this test to
correctly fail in headless tests, in conjunction with the new slider
tail leniency.

This is due to headless tests running at a fixed frame interval, and
these timings being *tight*.
---
 .../Mods/TestSceneOsuModAutoplay.cs             |  7 ++++---
 .../TestSceneSliderInput.cs                     | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index 6980438b59..ace7f23989 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -51,8 +51,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 FinalRate = { Value = 1.3 }
             });
 
-        [Test]
-        public void TestPerfectScoreOnShortSliderWithRepeat()
+        [TestCase(6.25f)]
+        [TestCase(20)]
+        public void TestPerfectScoreOnShortSliderWithRepeat(float pathLength)
         {
             AddStep("set score to standardised", () => LocalConfig.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
 
@@ -70,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                             Path = new SliderPath(new[]
                             {
                                 new PathControlPoint(),
-                                new PathControlPoint(new Vector2(0, 6.25f))
+                                new PathControlPoint(new Vector2(0, pathLength))
                             }),
                             RepeatCount = 1,
                             SliderVelocityMultiplier = 10
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index e98e7f45f6..9e83ca428b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.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 NUnit.Framework;
@@ -42,9 +41,17 @@ namespace osu.Game.Rulesets.Osu.Tests
         // Making these too short causes breakage from frames not being processed fast enough.
         // To keep things simple, these tests are crafted to always be >16ms length.
         // If sliders shorter than this are ever used in gameplay it will probably break things and we can revisit.
-        [TestCase(80, 0)]
+        [TestCase(30, 0)]
+        [TestCase(30, 1)]
+        [TestCase(40, 0)]
+        [TestCase(40, 1)]
+        [TestCase(50, 1)]
+        [TestCase(60, 1)]
+        [TestCase(70, 1)]
         [TestCase(80, 1)]
+        [TestCase(80, 0)]
         [TestCase(80, 10)]
+        [TestCase(90, 1)]
         public void TestVeryShortSlider(float sliderLength, int repeatCount)
         {
             Slider slider;
@@ -66,15 +73,15 @@ namespace osu.Game.Rulesets.Osu.Tests
                 }),
             }, 240, 1);
 
-            AddAssert("Slider is longer than one frame", () => slider.Duration / (slider.RepeatCount + 1), () => Is.GreaterThan(1000 / 60f));
-            AddAssert("Slider is shorter than lenience", () => slider.Duration / (slider.RepeatCount + 1), () => Is.LessThan(Math.Abs(SliderEventGenerator.TAIL_LENIENCY)));
-
             assertAllMaxJudgements();
 
             // Even if the last tick is hit early, the slider should always execute its final judgement at its endtime.
             // If not, hitsounds will not play on time.
             AddAssert("Judgement offset is zero", () => judgementResults.Last().TimeOffset == 0);
             AddAssert("Slider judged at end time", () => judgementResults.Last().TimeAbsolute, () => Is.EqualTo(slider.EndTime));
+
+            AddAssert("Slider is last judgement", () => judgementResults[^1].HitObject, Is.TypeOf<Slider>);
+            AddAssert("Tail is second last judgement", () => judgementResults[^2].HitObject, Is.TypeOf<SliderTailCircle>);
         }
 
         [TestCase(300, false)]

From 9e1fec0213d8541a813300d415d1956417979c6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 18:36:13 +0900
Subject: [PATCH 1660/2100] Fix potential out-of-order tail and ticks

---
 .../Objects/Drawables/DrawableSliderTail.cs                | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 9edf3808c5..df55f3e73f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -129,6 +129,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered)
                 return;
 
+            // Ensure the tail can only activate after all previous ticks already have.
+            //
+            // This covers the edge case where the lenience may allow the tail to activate before
+            // the last tick, changing ordering of score/combo awarding.
+            if (DrawableSlider.NestedHitObjects.Count > 1 && !DrawableSlider.NestedHitObjects[^2].Judged)
+                return;
+
             // The player needs to have engaged in tracking at any point after the tail leniency cutoff.
             // An actual tick miss should only occur if reaching the tick itself.
             if (timeOffset >= SliderEventGenerator.TAIL_LENIENCY && Tracking)

From 70ec4b060af1abd4752e483cacbab07b9c755692 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 19:20:37 +0900
Subject: [PATCH 1661/2100] Rename weird diffcalc parameter name

---
 .../Difficulty/Evaluators/AimEvaluator.cs                 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
index cf35b08822..3d1939acac 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
         /// <item><description>and slider difficulty.</description></item>
         /// </list>
         /// </summary>
-        public static double EvaluateDifficultyOf(DifficultyHitObject current, bool withSliders)
+        public static double EvaluateDifficultyOf(DifficultyHitObject current, bool withSliderTravelDistance)
         {
             if (current.BaseObject is Spinner || current.Index <= 1 || current.Previous(0).BaseObject is Spinner)
                 return 0;
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             double currVelocity = osuCurrObj.LazyJumpDistance / osuCurrObj.StrainTime;
 
             // But if the last object is a slider, then we extend the travel velocity through the slider into the current object.
-            if (osuLastObj.BaseObject is Slider && withSliders)
+            if (osuLastObj.BaseObject is Slider && withSliderTravelDistance)
             {
                 double travelVelocity = osuLastObj.TravelDistance / osuLastObj.TravelTime; // calculate the slider velocity from slider head to slider end.
                 double movementVelocity = osuCurrObj.MinimumJumpDistance / osuCurrObj.MinimumJumpTime; // calculate the movement velocity from slider end to current object
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             // As above, do the same for the previous hitobject.
             double prevVelocity = osuLastObj.LazyJumpDistance / osuLastObj.StrainTime;
 
-            if (osuLastLastObj.BaseObject is Slider && withSliders)
+            if (osuLastLastObj.BaseObject is Slider && withSliderTravelDistance)
             {
                 double travelVelocity = osuLastLastObj.TravelDistance / osuLastLastObj.TravelTime;
                 double movementVelocity = osuLastObj.MinimumJumpDistance / osuLastObj.MinimumJumpTime;
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             aimStrain += Math.Max(acuteAngleBonus * acute_angle_multiplier, wideAngleBonus * wide_angle_multiplier + velocityChangeBonus * velocity_change_multiplier);
 
             // Add in additional slider velocity bonus.
-            if (withSliders)
+            if (withSliderTravelDistance)
                 aimStrain += sliderBonus * slider_multiplier;
 
             return aimStrain;

From c4992d347975459823ee14ef3c07e42010470b98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 19:08:59 +0900
Subject: [PATCH 1662/2100] Fix one case of difficulty calculation no longer
 accounting for leniency

---
 .../Difficulty/Preprocessing/OsuDifficultyHitObject.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index e627c9ad67..00cb4acfb4 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -214,7 +214,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             if (slider.LazyEndPosition != null)
                 return;
 
-            slider.LazyTravelTime = slider.NestedHitObjects[^1].StartTime - slider.StartTime;
+            slider.LazyTravelTime = slider.NestedHitObjects[^1].StartTime + SliderEventGenerator.TAIL_LENIENCY - slider.StartTime;
 
             double endTimeMin = slider.LazyTravelTime / slider.SpanDuration;
             if (endTimeMin % 2 >= 1)

From 267d1ee7d442ef09bbdd5b7eb285c264d424ffb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Tue, 3 Oct 2023 22:08:14 +0200
Subject: [PATCH 1663/2100] Handle cases when player cannot be invited.

---
 .../Multiplayer/IMultiplayerRoomServer.cs     |  3 +-
 .../Multiplayer/OnlineMultiplayerClient.cs    | 29 +++++++++++++++++--
 .../Multiplayer/UserBlockedException.cs       | 26 +++++++++++++++++
 .../Multiplayer/UserBlocksPMsException.cs     | 26 +++++++++++++++++
 4 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/UserBlockedException.cs
 create mode 100644 osu.Game/Online/Multiplayer/UserBlocksPMsException.cs

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 64cd6df24d..e98570dc29 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -104,7 +104,8 @@ namespace osu.Game.Online.Multiplayer
         /// Invites a player to the current room.
         /// </summary>
         /// <param name="userId"></param>
-        /// <returns></returns>
+        /// <exception cref="UserBlockedException">The user has blocked or has been blocked by the invited user.</exception>
+        /// <exception cref="UserBlocksPMsException">The invited user does not accept private messages.</exception>
         Task InvitePlayer(int userId);
     }
 }
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 5b5741ef1c..08e82f2ad3 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -12,6 +12,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Notifications;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -107,14 +108,36 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
         }
 
-        public override Task InvitePlayer(int userId)
+        public override async Task InvitePlayer(int userId)
         {
             if (!IsConnected.Value)
-                return Task.CompletedTask;
+                return;
 
             Debug.Assert(connection != null);
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.InvitePlayer), userId);
+            try
+            {
+                await connection.InvokeAsync(nameof(IMultiplayerServer.InvitePlayer), userId).ConfigureAwait(false);
+            }
+            catch (HubException exception)
+            {
+                switch (exception.GetHubExceptionMessage())
+                {
+                    case UserBlockedException.MESSAGE:
+                        PostNotification?.Invoke(new SimpleErrorNotification
+                        {
+                            Text = "User cannot be invited by someone they have blocked or are blocked by."
+                        });
+                        break;
+
+                    case UserBlocksPMsException.MESSAGE:
+                        PostNotification?.Invoke(new SimpleErrorNotification
+                        {
+                            Text = "User cannot be invited because they cannot receive private messages from people not on their friends list."
+                        });
+                        break;
+                }
+            }
         }
 
         public override Task TransferHost(int userId)
diff --git a/osu.Game/Online/Multiplayer/UserBlockedException.cs b/osu.Game/Online/Multiplayer/UserBlockedException.cs
new file mode 100644
index 0000000000..363f878183
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/UserBlockedException.cs
@@ -0,0 +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.Runtime.Serialization;
+using Microsoft.AspNetCore.SignalR;
+
+namespace osu.Game.Online.Multiplayer
+{
+    [Serializable]
+    public class UserBlockedException : HubException
+    {
+        public const string MESSAGE = "User cannot be invited by someone they have blocked or are blocked by.";
+
+        public UserBlockedException()
+            :
+            base(MESSAGE)
+        {
+        }
+
+        protected UserBlockedException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
new file mode 100644
index 0000000000..220a84cfe8
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
@@ -0,0 +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.Runtime.Serialization;
+using Microsoft.AspNetCore.SignalR;
+
+namespace osu.Game.Online.Multiplayer
+{
+    [Serializable]
+    public class UserBlocksPMsException : HubException
+    {
+        public const string MESSAGE = "User cannot be invited because they have disabled private messages.";
+
+        public UserBlocksPMsException()
+            :
+            base(MESSAGE)
+        {
+        }
+
+        protected UserBlocksPMsException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}

From 32f69cd0ba58e9433214862751e830d33e70e748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 00:20:07 +0200
Subject: [PATCH 1664/2100] Make `UserAvatarNotification.user` readonly

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

diff --git a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
index 191d63a76f..8f32c9d395 100644
--- a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
+++ b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Notifications
 
         private TextFlowContainer? textDrawable;
 
-        private APIUser user;
+        private readonly APIUser user;
 
         public UserAvatarNotification(APIUser user, LocalisableString text)
         {

From 5678d904615f6f300613904363c1ac8d72b26a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 00:20:38 +0200
Subject: [PATCH 1665/2100] Reduce silliness of notification test case

---
 .../Visual/UserInterface/TestSceneNotificationOverlay.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 07bd722322..332053d71e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -549,7 +549,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             var user = await userLookupCache.GetUserAsync(0).ConfigureAwait(true);
             if (user == null) return;
 
-            var n = new UserAvatarNotification(user, $"{user.Username} is telling you to NOT download Haitai!");
+            var n = new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match!");
 
             notificationOverlay.Post(n);
         }

From 5469d134cb0919b70fc6168d24d948d3133b67ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 00:28:01 +0200
Subject: [PATCH 1666/2100] Add missing parameter description to docs.

---
 osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index e98570dc29..b7a608581c 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// Invites a player to the current room.
         /// </summary>
-        /// <param name="userId"></param>
+        /// <param name="userId">The user to invite.</param>
         /// <exception cref="UserBlockedException">The user has blocked or has been blocked by the invited user.</exception>
         /// <exception cref="UserBlocksPMsException">The invited user does not accept private messages.</exception>
         Task InvitePlayer(int userId);

From fe5177fa4fe29ea35b3fac74f50b330899dd7066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 00:50:48 +0200
Subject: [PATCH 1667/2100] Remove unused import

---
 osu.Game/Overlays/Notifications/UserAvatarNotification.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
index 8f32c9d395..af881a5008 100644
--- a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
+++ b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;

From 8d919912149a4853120612b67944492c27baa611 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 20:32:46 +0900
Subject: [PATCH 1668/2100] Fix difficulty calculation not correct handling
 slider leniency anymore

---
 .../Preprocessing/OsuDifficultyHitObject.cs           | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index 00cb4acfb4..5c2c85d69e 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
@@ -214,7 +215,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             if (slider.LazyEndPosition != null)
                 return;
 
-            slider.LazyTravelTime = slider.NestedHitObjects[^1].StartTime + SliderEventGenerator.TAIL_LENIENCY - slider.StartTime;
+            double trackingEndTime = Math.Max(
+                // SliderTailCircle always occurs at the final end time of the slider, but the player only needs to hold until within a lenience before it.
+                slider.NestedHitObjects.OfType<SliderTailCircle>().Single().StartTime + SliderEventGenerator.TAIL_LENIENCY,
+                // There's an edge case where one or more ticks/repeats fall within that leniency range.
+                // In such a case, the player needs to track until the final tick or repeat.
+                slider.NestedHitObjects.LastOrDefault(n => n is not SliderTailCircle)?.StartTime ?? double.MinValue
+            );
+
+            slider.LazyTravelTime = trackingEndTime - slider.StartTime;
 
             double endTimeMin = slider.LazyTravelTime / slider.SpanDuration;
             if (endTimeMin % 2 >= 1)

From 9361b1879c5e15667548b6d3c302c3bb43232d6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 12:54:13 +0900
Subject: [PATCH 1669/2100] Add note about early return in
 `DrawableSliderBall.Update`

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index 63e500d687..2fa2d4c0b5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -132,6 +132,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
+            // even in an edge case where current time has exceeded the slider's time, we may not have finished judging.
+            // we don't want to potentially update from Tracking=true to Tracking=false at this point.
             if (Time.Current >= drawableSlider.HitObject.EndTime)
                 return;
 

From cfb18e18c060f4270925b544fa545518ac48dea6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 13:33:06 +0900
Subject: [PATCH 1670/2100] Add better commenting around legacy last tick edge
 case

---
 .../Rulesets/Objects/SliderEventGenerator.cs  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index 42c422a637..9b8375f208 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -88,18 +88,27 @@ namespace osu.Game.Rulesets.Objects
 
             int finalSpanIndex = spanCount - 1;
             double finalSpanStartTime = startTime + finalSpanIndex * spanDuration;
-            double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + TAIL_LENIENCY);
-            double finalProgress = (finalSpanEndTime - finalSpanStartTime) / spanDuration;
 
-            if (spanCount % 2 == 0) finalProgress = 1 - finalProgress;
+            // Note that `finalSpanStartTime + spanDuration ≈ startTime + totalDuration`, but we write it like this to match floating point precision
+            // of stable.
+            //
+            // So thinking about this in a saner way, the time of the LegacyLastTick is
+            //
+            // `slider.StartTime + max(slider.Duration / 2, slider.Duration - 36)`
+            //
+            // As a slider gets shorter than 72 ms, the leniency offered falls below the 36 ms `TAIL_LENIENCY` constant.
+            double legacyLastTickTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + TAIL_LENIENCY);
+            double legacyLastTickProgress = (legacyLastTickTime - finalSpanStartTime) / spanDuration;
+
+            if (spanCount % 2 == 0) legacyLastTickProgress = 1 - legacyLastTickProgress;
 
             yield return new SliderEventDescriptor
             {
                 Type = SliderEventType.LegacyLastTick,
                 SpanIndex = finalSpanIndex,
                 SpanStartTime = finalSpanStartTime,
-                Time = finalSpanEndTime,
-                PathProgress = finalProgress,
+                Time = legacyLastTickTime,
+                PathProgress = legacyLastTickProgress,
             };
 
             yield return new SliderEventDescriptor

From 48209872bfd73d347a7fa6f35958d77a659a6fbc Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 4 Oct 2023 13:53:33 +0900
Subject: [PATCH 1671/2100] Fix spinner requirements being susceptible to FP
 precision

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index aca55c6bd9..e3dfe8e69a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -70,8 +70,11 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             double secondsDuration = Duration / 1000;
 
-            SpinsRequired = (int)(minRps * secondsDuration);
-            MaximumBonusSpins = Math.Max(0, (int)(maxRps * secondsDuration) - SpinsRequired - bonus_spins_gap);
+            // Allow a 0.1ms floating point precision error in the calculation of the duration.
+            const double duration_error = 0.0001;
+
+            SpinsRequired = (int)(minRps * secondsDuration + duration_error);
+            MaximumBonusSpins = Math.Max(0, (int)(maxRps * secondsDuration + duration_error) - SpinsRequired - bonus_spins_gap);
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)

From d14d885d19a018343f9aa81ca7f67e84da917865 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 14:52:35 +0900
Subject: [PATCH 1672/2100] Add test coverage of very fast slider

---
 .../OsuDifficultyCalculatorTest.cs            |  3 +++
 .../Testing/Beatmaps/very-fast-slider.osu     | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/very-fast-slider.osu

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index 9c6449cfa9..f1c1c4734d 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -17,16 +17,19 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         [TestCase(6.7115569159190587d, 206, "diffcalc-test")]
         [TestCase(1.4391311903612753d, 45, "zero-length-sliders")]
+        [TestCase(0.42506480230838789d, 2, "very-fast-slider")]
         [TestCase(0.14102693012101306d, 1, "nan-slider")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)
             => base.Test(expectedStarRating, expectedMaxCombo, name);
 
         [TestCase(8.9757300665532966d, 206, "diffcalc-test")]
+        [TestCase(0.55071082800473514d, 2, "very-fast-slider")]
         [TestCase(1.7437232654020756d, 45, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModDoubleTime());
 
         [TestCase(6.7115569159190587d, 239, "diffcalc-test")]
+        [TestCase(0.42506480230838789d, 4, "very-fast-slider")]
         [TestCase(1.4391311903612753d, 54, "zero-length-sliders")]
         public void TestClassicMod(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModClassic());
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/very-fast-slider.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/very-fast-slider.osu
new file mode 100644
index 0000000000..58ef36e70c
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/very-fast-slider.osu
@@ -0,0 +1,21 @@
+osu file format v128
+
+[Difficulty]
+HPDrainRate: 3
+CircleSize: 4
+OverallDifficulty: 9
+ApproachRate: 9.3
+SliderMultiplier: 3.59999990463257
+SliderTickRate: 1
+
+[TimingPoints]
+812,342.857142857143,4,1,1,70,1,0
+57383,-28.5714285714286,4,1,1,70,0,0
+
+[HitObjects]
+// Taken from https://osu.ppy.sh/beatmapsets/881996#osu/1844019
+// This slider is 42 ms in length, triggering the LegacyLastTick edge case.
+// The tick will be at 21.5 ms (sliderDuration / 2) instead of 6 ms (sliderDuration - LAST_TICK_LENIENCE).
+416,41,57383,6,0,L|467:217,1,157.499997329712,2|0,3:3|3:0,3:0:0:0:
+// Include the next slider as well to cover the jump back to the start position.
+407,73,57469,2,0,L|470:215,1,129.599999730835,2|0,0:0|0:0,0:0:0:0:

From bfeafd6f70bcd0832c144b3bf8d7cbd75c148285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 08:30:48 +0200
Subject: [PATCH 1673/2100] Fix formatting

---
 osu.Game/Online/Multiplayer/UserBlockedException.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/UserBlockedException.cs b/osu.Game/Online/Multiplayer/UserBlockedException.cs
index 363f878183..f2b69411c7 100644
--- a/osu.Game/Online/Multiplayer/UserBlockedException.cs
+++ b/osu.Game/Online/Multiplayer/UserBlockedException.cs
@@ -13,8 +13,7 @@ namespace osu.Game.Online.Multiplayer
         public const string MESSAGE = "User cannot be invited by someone they have blocked or are blocked by.";
 
         public UserBlockedException()
-            :
-            base(MESSAGE)
+            : base(MESSAGE)
         {
         }
 

From 74ed3bc4ff8f8206188ec115c319222b0b31a99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 08:31:50 +0200
Subject: [PATCH 1674/2100] Rename `loadRoom` to `lookupRoom`

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 61c2fa495a..8b4c38a152 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -448,7 +448,7 @@ namespace osu.Game.Online.Multiplayer
         async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password)
         {
             var loadUserTask = userLookupCache.GetUserAsync(invitedBy);
-            var loadRoomTask = loadRoom(roomID);
+            var loadRoomTask = lookupRoom(roomID);
 
             await Task.WhenAll(loadUserTask, loadRoomTask).ConfigureAwait(false);
 
@@ -472,7 +472,7 @@ namespace osu.Game.Online.Multiplayer
             });
         }
 
-        private Task<Room?> loadRoom(long id)
+        private Task<Room?> lookupRoom(long id)
         {
             return Task.Run(() =>
             {

From 0726ccb9887a9be8c653cf61de6fbf0a4c31bbff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 08:32:18 +0200
Subject: [PATCH 1675/2100] Fix formatting

---
 osu.Game/Online/Multiplayer/UserBlocksPMsException.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
index 220a84cfe8..0fd4e1f0c1 100644
--- a/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
+++ b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
@@ -13,8 +13,7 @@ namespace osu.Game.Online.Multiplayer
         public const string MESSAGE = "User cannot be invited because they have disabled private messages.";
 
         public UserBlocksPMsException()
-            :
-            base(MESSAGE)
+            : base(MESSAGE)
         {
         }
 

From 6bd51b32b47919a69a096c09ff8eac76c8bbe477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 08:35:45 +0200
Subject: [PATCH 1676/2100] Make resolved `multiplayerClient` field nullable

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

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 29a6c65555..98b306e264 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Users
         protected OsuColour Colours { get; private set; } = null!;
 
         [Resolved]
-        private MultiplayerClient multiplayerClient { get; set; } = null!;
+        private MultiplayerClient? multiplayerClient { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -124,7 +124,7 @@ namespace osu.Game.Users
 
                 if (
                     User.IsOnline &&
-                    multiplayerClient.Room != null &&
+                    multiplayerClient?.Room != null &&
                     multiplayerClient.Room.Users.All(u => u.UserID != User.Id)
                 )
                 {

From 6d97f89399ec328b178f8f0561d0479650f2c86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 08:37:22 +0200
Subject: [PATCH 1677/2100] Rename `OnlinePlayScreen.LoungeSubScreen` to
 `Lounge`

---
 .../Screens/OnlinePlay/Multiplayer/Multiplayer.cs    |  2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index f74b5dd96e..f899b24d30 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         public void Join(Room room, string? password)
         {
-            LoungeSubScreen.Join(room, password);
+            Lounge.Join(room, password);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 85eec7ac07..57e388f016 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.OnlinePlay
         // while leases may be taken out by a subscreen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
-        protected LoungeSubScreen LoungeSubScreen;
+        protected LoungeSubScreen Lounge;
 
         private MultiplayerWaveContainer waves;
         private ScreenStack screenStack;
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.OnlinePlay
             screenStack.ScreenPushed += screenPushed;
             screenStack.ScreenExited += screenExited;
 
-            screenStack.Push(LoungeSubScreen = CreateLounge());
+            screenStack.Push(Lounge = CreateLounge());
 
             apiState.BindTo(API.State);
             apiState.BindValueChanged(onlineStateChanged, true);
@@ -121,10 +121,10 @@ namespace osu.Game.Screens.OnlinePlay
 
             Mods.SetDefault();
 
-            if (LoungeSubScreen.IsCurrentScreen())
-                LoungeSubScreen.OnEntering(e);
+            if (Lounge.IsCurrentScreen())
+                Lounge.OnEntering(e);
             else
-                LoungeSubScreen.MakeCurrent();
+                Lounge.MakeCurrent();
         }
 
         public override void OnResuming(ScreenTransitionEvent e)
@@ -159,7 +159,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         public override bool OnExiting(ScreenExitEvent e)
         {
-            while (screenStack.CurrentScreen != null && screenStack.CurrentScreen is not Lounge.LoungeSubScreen)
+            while (screenStack.CurrentScreen != null && screenStack.CurrentScreen is not LoungeSubScreen)
             {
                 var subScreen = (Screen)screenStack.CurrentScreen;
                 if (subScreen.IsLoaded && subScreen.OnExiting(e))

From 658b6a166f711fd719f05b2d3f746cd33ca8e944 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 16:11:39 +0900
Subject: [PATCH 1678/2100] Fix regression in `Tracking` state handling

It turns out multiple components depend on `Tracking` eventually
becoming `false` at the end of a slider. With my previous changes, this
was no longer the case (as could be seen by the legacy cursor particles
test failure, and heard by slider slide taking too long to stop).
---
 .../Objects/Drawables/DrawableSliderBall.cs              | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index 2fa2d4c0b5..292f2ffd7d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Skinning.Default;
@@ -132,11 +133,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
-            // even in an edge case where current time has exceeded the slider's time, we may not have finished judging.
-            // we don't want to potentially update from Tracking=true to Tracking=false at this point.
-            if (Time.Current >= drawableSlider.HitObject.EndTime)
-                return;
-
             // from the point at which the head circle is hit, this will be non-null.
             // it may be null if the head circle was missed.
             var headCircleHitAction = GetInitialHitAction();
@@ -159,6 +155,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Tracking =
                 // in valid time range
                 Time.Current >= drawableSlider.HitObject.StartTime
+                // even in an edge case where current time has exceeded the slider's time, we may not have finished judging.
+                // we don't want to potentially update from Tracking=true to Tracking=false at this point.
+                && (!drawableSlider.AllJudged || Time.Current <= drawableSlider.HitObject.GetEndTime())
                 // in valid position range
                 && lastScreenSpaceMousePosition.HasValue && followCircleReceptor.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action

From a186d97edf53f2152bd52b852421a789c58cfabf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 16:57:54 +0900
Subject: [PATCH 1679/2100] 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 20b0f220a3..85d5e66d44 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.922.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1004.1" />
   </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 0ee922e53a..cf8e6b9b53 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.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1004.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 5508c2ab03..ba4deda4cd 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.922.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1004.1" />
   </ItemGroup>
 </Project>

From 20342d430dbec125927e36284ed84a92da7fc66c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 23:55:38 +0900
Subject: [PATCH 1680/2100] 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 85d5e66d44..bc95e96a7b 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.1004.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1004.2" />
   </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 cf8e6b9b53..622b59a725 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.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1004.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1004.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ba4deda4cd..16bccbbb53 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.1004.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1004.2" />
   </ItemGroup>
 </Project>

From 2ae1a2435504f8c49391f6870286074af1a4781b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 4 Oct 2023 18:55:20 +0200
Subject: [PATCH 1681/2100] Add failing test covering counting multiple swell
 hits per frame

---
 .../Judgements/TestSceneSwellJudgements.cs    | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs
index 4abad98eab..6e42ae7eb5 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs
@@ -115,6 +115,48 @@ 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));
         }
 
+        [Test]
+        public void TestAtMostOneSwellTickJudgedPerFrame()
+        {
+            const double swell_time = 1000;
+
+            Swell swell = new Swell
+            {
+                StartTime = swell_time,
+                Duration = 1000,
+                RequiredHits = 10
+            };
+
+            List<ReplayFrame> frames = new List<ReplayFrame>
+            {
+                new TaikoReplayFrame(1000),
+                new TaikoReplayFrame(1250, TaikoAction.LeftCentre, TaikoAction.LeftRim),
+                new TaikoReplayFrame(1251),
+                new TaikoReplayFrame(1500, TaikoAction.LeftCentre, TaikoAction.LeftRim, TaikoAction.RightCentre, TaikoAction.RightRim),
+                new TaikoReplayFrame(1501),
+                new TaikoReplayFrame(2000),
+            };
+
+            PerformTest(frames, CreateBeatmap(swell));
+
+            AssertJudgementCount(11);
+
+            // this is a charitable interpretation of the inputs.
+            //
+            // for the frame at time 1250, we only count either one of the input actions - simple.
+            //
+            // for the frame at time 1500, we give the user the benefit of the doubt,
+            // and we ignore actions that wouldn't otherwise cause a hit due to not alternating,
+            // but we still count one (just one) of the actions that _would_ normally cause a hit.
+            // this is done as a courtesy to avoid stuff like key chattering after press blocking legitimate inputs.
+            for (int i = 0; i < 2; i++)
+                AssertResult<SwellTick>(i, HitResult.IgnoreHit);
+            for (int i = 2; i < swell.RequiredHits; i++)
+                AssertResult<SwellTick>(i, HitResult.IgnoreMiss);
+
+            AssertResult<Swell>(0, HitResult.IgnoreMiss);
+        }
+
         /// <summary>
         /// Ensure input is correctly sent to subsequent hits if a swell is fully completed.
         /// </summary>

From a1368df62f8bdcc72078c3672fd9c9f7630dfd0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 4 Oct 2023 19:03:12 +0200
Subject: [PATCH 1682/2100] Allow judging at most one swell tick per frame

---
 .../Objects/Drawables/DrawableSwell.cs                 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 3fa6f4b756..297ea93637 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private readonly CircularContainer targetRing;
         private readonly CircularContainer expandingRing;
 
+        private double? lastPressHandleTime;
+
         public override bool DisplayResult => false;
 
         public DrawableSwell()
@@ -140,6 +142,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             UnproxyContent();
 
             lastWasCentre = null;
+            lastPressHandleTime = null;
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
@@ -285,7 +288,14 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             if (lastWasCentre == isCentre)
                 return false;
 
+            // If we've already successfully judged a tick this frame, do not judge more.
+            // Note that the ordering is important here - this is intentionally placed after the alternating check.
+            // That is done to prevent accidental double inputs blocking simultaneous but legitimate hits from registering.
+            if (lastPressHandleTime == Time.Current)
+                return true;
+
             lastWasCentre = isCentre;
+            lastPressHandleTime = Time.Current;
 
             UpdateResult(true);
 

From 9f350ce13c58a16c47a0e5bd770c4495cc892455 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 5 Oct 2023 13:20:07 +0900
Subject: [PATCH 1683/2100] Add new difficulty calculation github action

---
 .github/workflows/diffcalc.yml | 481 +++++++++++++++++++++------------
 1 file changed, 302 insertions(+), 179 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 2c6ec17e18..ef1909dfae 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -1,206 +1,329 @@
-# Listens for new PR comments containing !pp check [id], and runs a diffcalc comparison against master.
-# Usage:
-#   !pp check 0        | Runs only the osu! ruleset.
-#   !pp check 0 2      | Runs only the osu! and catch rulesets.
-#
-
 name: Difficulty Calculation
+
+run-name: "${{ github.event_name == 'workflow_dispatch' && format('Manual run: {0}', inputs.osu-b) || 'Automatic comment trigger' }}"
+
 on:
   issue_comment:
     types: [ created ]
+  workflow_dispatch:
+    inputs:
+      osu-b:
+        description: "The target build of ppy/osu"
+        type: string
+        required: true
+      ruleset:
+        description: "The ruleset to process"
+        type: choice
+        required: true
+        options:
+          - osu
+          - taiko
+          - catch
+          - mania
+      converts:
+        description: "Include converted beatmaps"
+        type: boolean
+        required: false
+        default: true
+      ranked-only:
+        description: "Only ranked beatmaps"
+        type: boolean
+        required: false
+        default: true
+      generators:
+        description: "Comma-separated list of generators (available: [sr, pp, score])"
+        type: string
+        required: false
+        default: 'pp,sr'
+      osu-a:
+        description: "The source build of ppy/osu"
+        type: string
+        required: false
+        default: 'latest'
+      difficulty-calculator-a:
+        description: "The source build of ppy/osu-difficulty-calculator"
+        type: string
+        required: false
+        default: 'latest'
+      difficulty-calculator-b:
+        description: "The target build of ppy/osu-difficulty-calculator"
+        type: string
+        required: false
+        default: 'latest'
+      score-processor-a:
+        description: "The source build of ppy/osu-queue-score-statistics"
+        type: string
+        required: false
+        default: 'latest'
+      score-processor-b:
+        description: "The target build of ppy/osu-queue-score-statistics"
+        type: string
+        required: false
+        default: 'latest'
+
+permissions:
+  pull-requests: write
 
 env:
-  CONCURRENCY: 4
-  ALLOW_DOWNLOAD: 1
-  SAVE_DOWNLOADED: 1
-  SKIP_INSERT_ATTRIBUTES: 1
+  COMMENT_TAG: execution-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
 
 jobs:
-  metadata:
-    name: Check for requests
+  wait-for-queue:
+    name: "Wait for previous workflows"
+    runs-on: ubuntu-latest
+    if: ${{ !cancelled() && (github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER') }}
+    timeout-minutes: 50400 # 35 days, the maximum for jobs.
+    steps:
+      - uses: ahmadnassri/action-workflow-queue@v1
+        with:
+          timeout: 2147483647 # Around 24 days, maximum supported.
+          delay: 120000 # Poll every 2 minutes. API seems fairly low on this one.
+
+  create-comment:
+    name: Create PR comment
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER' }}
+    steps:
+      - name: Create comment
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: ${{ env.COMMENT_TAG }}
+          message: |
+            Difficulty calculation queued -- please wait! (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
+
+            *This comment will update on completion*
+
+  directory:
+    name: Prepare directory
+    needs: wait-for-queue
     runs-on: self-hosted
-    if: github.event.issue.pull_request && contains(github.event.comment.body, '!pp check') && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER')
+    if: ${{ !cancelled() && (github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER') }}
     outputs:
-      matrix: ${{ steps.generate-matrix.outputs.matrix }}
-      continue: ${{ steps.generate-matrix.outputs.continue }}
+      GENERATOR_DIR: ${{ steps.set-outputs.outputs.GENERATOR_DIR }}
+      GENERATOR_ENV: ${{ steps.set-outputs.outputs.GENERATOR_ENV }}
+      GOOGLE_CREDS_FILE: ${{ steps.set-outputs.outputs.GOOGLE_CREDS_FILE }}
     steps:
-      - name: Construct build matrix
-        id: generate-matrix
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Checkout diffcalc-sheet-generator
+        uses: actions/checkout@v3
+        with:
+          path: 'diffcalc-sheet-generator'
+          repository: 'smoogipoo/diffcalc-sheet-generator'
+
+      - name: Set outputs
+        id: set-outputs
         run: |
-          if [[ "${{ github.event.comment.body }}" =~ "osu" ]] ; then
-            MATRIX_PROJECTS_JSON+='{ "name": "osu", "id": 0 },'
-          fi
-          if [[ "${{ github.event.comment.body }}" =~ "taiko" ]] ; then
-            MATRIX_PROJECTS_JSON+='{ "name": "taiko", "id": 1 },'
-          fi
-          if [[ "${{ github.event.comment.body }}" =~ "catch" ]] ; then
-            MATRIX_PROJECTS_JSON+='{ "name": "catch", "id": 2 },'
-          fi
-          if [[ "${{ github.event.comment.body }}" =~ "mania" ]] ; then
-            MATRIX_PROJECTS_JSON+='{ "name": "mania", "id": 3 },'
-          fi
+          echo "GENERATOR_DIR=${{ github.workspace }}/diffcalc-sheet-generator" >> "${GITHUB_OUTPUT}"
+          echo "GENERATOR_ENV=${{ github.workspace }}/diffcalc-sheet-generator/.env" >> "${GITHUB_OUTPUT}"
+          echo "GOOGLE_CREDS_FILE=${{ github.workspace }}/diffcalc-sheet-generator/google-credentials.json" >> "${GITHUB_OUTPUT}"
 
-          if [[ "${MATRIX_PROJECTS_JSON}" != "" ]]; then
-            MATRIX_JSON="{ \"ruleset\": [ ${MATRIX_PROJECTS_JSON} ] }"
-            echo "${MATRIX_JSON}"
-            CONTINUE="yes"
-          else
-            CONTINUE="no"
-          fi
-
-          echo "continue=${CONTINUE}" >> $GITHUB_OUTPUT
-          echo "matrix=${MATRIX_JSON}" >> $GITHUB_OUTPUT
-  diffcalc:
-    name: Run
+  environment:
+    name: Setup environment
+    needs: directory
     runs-on: self-hosted
-    timeout-minutes: 1440
-    if: needs.metadata.outputs.continue == 'yes'
-    needs: metadata
-    strategy:
-      matrix: ${{ fromJson(needs.metadata.outputs.matrix) }}
+    if: ${{ !cancelled() && needs.directory.result == 'success' }}
+    env:
+      VARS_JSON: ${{ toJSON(vars) }}
     steps:
-      - name: Verify MySQL connection from host
+      - name: Add base environment
         run: |
-          mysql -e "SHOW DATABASES"
+          # Required by diffcalc-sheet-generator
+          cp '${{ github.workspace }}/diffcalc-sheet-generator/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
-      - name: Drop previous databases
-        run: |
-          for db in osu_master osu_pr
-          do
-            mysql -e "DROP DATABASE IF EXISTS $db"
+          # Add Google credentials
+          echo '${{ secrets.DIFFCALC_GOOGLE_CREDENTIALS }}' | base64 -d > "${{ needs.directory.outputs.GOOGLE_CREDS_FILE }}"
+
+          # Add repository variables
+          echo "${VARS_JSON}" | jq -c '. | to_entries | .[]' | while read -r line; do
+              opt=$(jq -r '.key' <<< ${line})
+              val=$(jq -r '.value' <<< ${line})
+
+              if [[ "${opt}" =~ ^DIFFCALC_ ]]; then
+                optNoPrefix=$(echo "${opt}" | cut -d '_' -f2-)
+                sed -i "s;^${optNoPrefix}=.*$;${optNoPrefix}=${val};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
+              fi
           done
 
-      - name: Create directory structure
+      - name: Add pull-request environment
+        if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
         run: |
-          mkdir -p $GITHUB_WORKSPACE/master/
-          mkdir -p $GITHUB_WORKSPACE/pr/
+          sed -i "s;^OSU_B=.*$;OSU_B=${{ github.event.issue.pull_request.url }};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
-      - name: Get upstream branch # https://akaimo.hatenablog.jp/entry/2020/05/16/101251
-        id: upstreambranch
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Add comment environment
+        if: ${{ github.event_name == 'issue_comment' }}
         run: |
-          echo "branchname=$(curl -H "Authorization: token ${GITHUB_TOKEN}" ${{ github.event.issue.pull_request.url }} | jq '.head.ref' | sed 's/\"//g')" >> $GITHUB_OUTPUT
-          echo "repo=$(curl -H "Authorization: token ${GITHUB_TOKEN}" ${{ github.event.issue.pull_request.url }} | jq '.head.repo.full_name' | sed 's/\"//g')" >> $GITHUB_OUTPUT
-
-      # Checkout osu
-      - name: Checkout osu (master)
-        uses: actions/checkout@v3
-        with:
-          path: 'master/osu'
-      - name: Checkout osu (pr)
-        uses: actions/checkout@v3
-        with:
-          path: 'pr/osu'
-          repository: ${{ steps.upstreambranch.outputs.repo }}
-          ref: ${{ steps.upstreambranch.outputs.branchname }}
-
-      - name: Checkout osu-difficulty-calculator (master)
-        uses: actions/checkout@v3
-        with:
-          repository: ppy/osu-difficulty-calculator
-          path: 'master/osu-difficulty-calculator'
-      - name: Checkout osu-difficulty-calculator (pr)
-        uses: actions/checkout@v3
-        with:
-          repository: ppy/osu-difficulty-calculator
-          path: 'pr/osu-difficulty-calculator'
-
-      - name: Install .NET 5.0.x
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: "5.0.x"
-
-      # Sanity checks to make sure diffcalc is not run when incompatible.
-      - name: Build diffcalc (master)
-        run: |
-          cd $GITHUB_WORKSPACE/master/osu-difficulty-calculator
-          ./UseLocalOsu.sh
-          dotnet build
-      - name: Build diffcalc (pr)
-        run: |
-          cd $GITHUB_WORKSPACE/pr/osu-difficulty-calculator
-          ./UseLocalOsu.sh
-          dotnet build
-
-      - name: Download + import data
-        run: |
-          PERFORMANCE_DATA_NAME=$(curl https://data.ppy.sh/ | grep performance_${{ matrix.ruleset.name }}_top_1000 | tail -1 | awk -F "\"" '{print $2}' | sed 's/\.tar\.bz2//g')
-          BEATMAPS_DATA_NAME=$(curl https://data.ppy.sh/ | grep osu_files | tail -1 | awk -F "\"" '{print $2}' | sed 's/\.tar\.bz2//g')
-
-          # Set env variable for further steps.
-          echo "BEATMAPS_PATH=$GITHUB_WORKSPACE/$BEATMAPS_DATA_NAME" >> $GITHUB_ENV
-
-          cd $GITHUB_WORKSPACE
-
-          echo "Downloading database dump $PERFORMANCE_DATA_NAME.."
-          wget -q -nc https://data.ppy.sh/$PERFORMANCE_DATA_NAME.tar.bz2
-          echo "Extracting.."
-          tar -xf $PERFORMANCE_DATA_NAME.tar.bz2
-
-          echo "Downloading beatmap dump $BEATMAPS_DATA_NAME.."
-          wget -q -nc https://data.ppy.sh/$BEATMAPS_DATA_NAME.tar.bz2
-          echo "Extracting.."
-          tar -xf $BEATMAPS_DATA_NAME.tar.bz2
-
-          cd $PERFORMANCE_DATA_NAME
-
-          for db in osu_master osu_pr
-          do
-            echo "Setting up database $db.."
-
-            mysql -e "CREATE DATABASE $db"
-
-            echo "Importing beatmaps.."
-            cat osu_beatmaps.sql | mysql $db
-            echo "Importing beatmapsets.."
-            cat osu_beatmapsets.sql | mysql $db
-
-            echo "Creating table structure.."
-            mysql $db -e 'CREATE TABLE `osu_beatmap_difficulty` (
-                `beatmap_id` int unsigned NOT NULL,
-                `mode` tinyint NOT NULL DEFAULT 0,
-                `mods` int unsigned NOT NULL,
-                `diff_unified` float NOT NULL,
-                `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                PRIMARY KEY (`beatmap_id`,`mode`,`mods`),
-                KEY `diff_sort` (`mode`,`mods`,`diff_unified`)
-              ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;'
+          # Add comment environment
+          echo '${{ github.event.comment.body }}' | sed -r 's/\r$//' | grep -E '^\w+=' | while read -r line; do
+              opt=$(echo ${line} | cut -d '=' -f1)
+              sed -i "s;^${opt}=.*$;${line};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
           done
 
-      - name: Run diffcalc (master)
-        env:
-          DB_NAME: osu_master
+      - name: Add dispatch environment
+        if: ${{ github.event_name == 'workflow_dispatch' }}
         run: |
-          cd $GITHUB_WORKSPACE/master/osu-difficulty-calculator/osu.Server.DifficultyCalculator
-          dotnet run -c:Release -- all -m ${{ matrix.ruleset.id }} -ac -c ${{ env.CONCURRENCY }}
-      - name: Run diffcalc (pr)
-        env:
-          DB_NAME: osu_pr
-        run: |
-          cd $GITHUB_WORKSPACE/pr/osu-difficulty-calculator/osu.Server.DifficultyCalculator
-          dotnet run -c:Release -- all -m ${{ matrix.ruleset.id }} -ac -c ${{ env.CONCURRENCY }}
+          sed -i 's;^OSU_B=.*$;OSU_B=${{ inputs.osu-b }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          sed -i 's/^RULESET=.*$/RULESET=${{ inputs.ruleset }}/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          sed -i 's/^GENERATORS=.*$/GENERATORS=${{ inputs.generators }}/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
-      - name: Print diffs
-        run: |
-          mysql -e "
-            SELECT
-              m.beatmap_id,
-              m.mods,
-              b.filename,
-              m.diff_unified as 'sr_master',
-              p.diff_unified as 'sr_pr',
-              (p.diff_unified - m.diff_unified) as 'diff'
-            FROM osu_master.osu_beatmap_difficulty m
-            JOIN osu_pr.osu_beatmap_difficulty p
-              ON m.beatmap_id = p.beatmap_id
-              AND m.mode = p.mode
-              AND m.mods = p.mods
-            JOIN osu_pr.osu_beatmaps b
-              ON b.beatmap_id = p.beatmap_id
-            WHERE abs(m.diff_unified - p.diff_unified) > 0.1
-            ORDER BY abs(m.diff_unified - p.diff_unified)
-              DESC
-            LIMIT 10000;"
+          if [[ '${{ inputs.osu-a }}' != 'latest' ]]; then
+              sed -i 's;^OSU_A=.*$;OSU_A=${{ inputs.osu-a }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
 
-      # Todo: Run ppcalc
+          if [[ '${{ inputs.difficulty-calculator-a }}' != 'latest' ]]; then
+              sed -i 's;^DIFFICULTY_CALCULATOR_A=.*$;DIFFICULTY_CALCULATOR_A=${{ inputs.difficulty-calculator-a }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.difficulty-calculator-b }}' != 'latest' ]]; then
+              sed -i 's;^DIFFICULTY_CALCULATOR_B=.*$;DIFFICULTY_CALCULATOR_B=${{ inputs.difficulty-calculator-b }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.score-processor-a }}' != 'latest' ]]; then
+              sed -i 's;^SCORE_PROCESSOR_A=.*$;SCORE_PROCESSOR_A=${{ inputs.score-processor-a }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.score-processor-b }}' != 'latest' ]]; then
+              sed -i 's;^SCORE_PROCESSOR_B=.*$;SCORE_PROCESSOR_B=${{ inputs.score-processor-b }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.converts }}' == 'true' ]]; then
+              sed -i 's/^NO_CONVERTS=.*$/NO_CONVERTS=0/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          else
+              sed -i 's/^NO_CONVERTS=.*$/NO_CONVERTS=1/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.ranked-only }}' == 'true' ]]; then
+              sed -i 's/^RANKED_ONLY=.*$/RANKED_ONLY=1/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          else
+              sed -i 's/^RANKED_ONLY=.*$/RANKED_ONLY=0/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+  scores:
+    name: Setup scores
+    needs: [ directory, environment ]
+    runs-on: self-hosted
+    if: ${{ !cancelled() && needs.environment.result == 'success' }}
+    steps:
+      - name: Query latest data
+        id: query
+        run: |
+          ruleset=$(cat ${{ needs.directory.outputs.GENERATOR_ENV }} | grep -E '^RULESET=' | cut -d '=' -f2-)
+          performance_data_name=$(curl -s "https://data.ppy.sh/" | grep "performance_${ruleset}_top_1000\b" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g')
+
+          echo "TARGET_DIR=${{ needs.directory.outputs.GENERATOR_DIR }}/sql/${ruleset}" >> "${GITHUB_OUTPUT}"
+          echo "DATA_NAME=${performance_data_name}" >> "${GITHUB_OUTPUT}"
+
+      - name: Restore cache
+        id: restore-cache
+        uses: maxnowack/local-cache@v1
+        with:
+          path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
+          key: ${{ steps.query.outputs.DATA_NAME }}
+
+      - name: Download
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        run: |
+          wget -q -nc "https://data.ppy.sh/${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+
+      - name: Extract
+        run: |
+          tar -I lbzip2 -xf "${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+          rm -r "${{ steps.query.outputs.TARGET_DIR }}"
+          mv "${{ steps.query.outputs.DATA_NAME }}" "${{ steps.query.outputs.TARGET_DIR }}"
+
+  beatmaps:
+    name: Setup beatmaps
+    needs: directory
+    runs-on: self-hosted
+    if: ${{ !cancelled() && needs.directory.result == 'success' }}
+    steps:
+      - name: Query latest data
+        id: query
+        run: |
+          beatmaps_data_name=$(curl -s "https://data.ppy.sh/" | grep "osu_files" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g')
+
+          echo "TARGET_DIR=${{ needs.directory.outputs.GENERATOR_DIR }}/beatmaps" >> "${GITHUB_OUTPUT}"
+          echo "DATA_NAME=${beatmaps_data_name}" >> "${GITHUB_OUTPUT}"
+
+      - name: Restore cache
+        id: restore-cache
+        uses: maxnowack/local-cache@v1
+        with:
+          path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
+          key: ${{ steps.query.outputs.DATA_NAME }}
+
+      - name: Download
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        run: |
+          wget -q -nc "https://data.ppy.sh/${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+
+      - name: Extract
+        run: |
+          tar -I lbzip2 -xf "${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+          rm -r "${{ steps.query.outputs.TARGET_DIR }}"
+          mv "${{ steps.query.outputs.DATA_NAME }}" "${{ steps.query.outputs.TARGET_DIR }}"
+
+  generator:
+    name: Run generator
+    needs: [ directory, environment, scores, beatmaps ]
+    runs-on: self-hosted
+    timeout-minutes: 720
+    if: ${{ !cancelled() && needs.scores.result == 'success' && needs.beatmaps.result == 'success' }}
+    outputs:
+      TARGET: ${{ steps.run.outputs.TARGET }}
+      SPREADSHEET_LINK: ${{ steps.run.outputs.SPREADSHEET_LINK }}
+    steps:
+      - name: Run
+        id: run
+        run: |
+          # Add the GitHub token. This needs to be done here because it's unique per-job.
+          sed -i 's/^GH_TOKEN=.*$/GH_TOKEN=${{ github.token }}/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+
+          cd "${{ needs.directory.outputs.GENERATOR_DIR }}"
+          docker-compose up --build generator
+
+          link=$(docker-compose logs generator -n 10 | grep 'http' | sed -E 's/^.*(http.*)$/\1/')
+          target=$(cat "${{ needs.directory.outputs.GENERATOR_ENV }}" | grep -E '^OSU_B=' | cut -d '=' -f2-)
+
+          echo "TARGET=${target}" >> "${GITHUB_OUTPUT}"
+          echo "SPREADSHEET_LINK=${link}" >> "${GITHUB_OUTPUT}"
+
+      - name: Shutdown
+        if: ${{ always() }}
+        run: |
+          cd "${{ needs.directory.outputs.GENERATOR_DIR }}"
+          docker-compose down
+
+      - name: Output info
+        if: ${{ success() }}
+        run: |
+          echo "Target: ${{ steps.run.outputs.TARGET }}"
+          echo "Spreadsheet: ${{ steps.run.outputs.SPREADSHEET_LINK }}"
+
+  update-comment:
+    name: Update PR comment
+    needs: [ create-comment, generator ]
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER' }}
+    steps:
+      - name: Update comment on success
+        if: ${{ needs.generator.result == 'success' }}
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: ${{ env.COMMENT_TAG }}
+          mode: upsert
+          create_if_not_exists: false
+          message: |
+            Target: ${{ needs.generator.outputs.TARGET }}
+            Spreadsheet: ${{ needs.generator.outputs.SPREADSHEET_LINK }}
+
+      - name: Update comment on failure
+        if: ${{ needs.generator.result == 'failure' }}
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: ${{ env.COMMENT_TAG }}
+          mode: upsert
+          create_if_not_exists: false
+          message: |
+            Difficulty calculation failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
\ No newline at end of file

From f8455af0d09360ace64371d847581d8faf73ad11 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 18:04:07 +0900
Subject: [PATCH 1684/2100] Fix double interpolation being applied when
 `applyOffsets=false`

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

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 316d1f8a34..587e6bbeed 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Beatmaps
             }
             else
             {
-                finalClockSource = new InterpolatingFramedClock(interpolatedTrack);
+                finalClockSource = interpolatedTrack;
             }
         }
 

From bca257eeda9d3aac95011c5d1631a93af547de86 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 5 Oct 2023 13:32:20 +0900
Subject: [PATCH 1685/2100] Add description

---
 .github/workflows/diffcalc.yml | 42 ++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index ef1909dfae..168f411264 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -1,4 +1,42 @@
-name: Difficulty Calculation
+# ## Description
+#
+# Uses [diffcalc-sheet-generator](https://github.com/smoogipoo/diffcalc-sheet-generator) to run two builds of osu and generate an SR/PP/Score comparison spreadsheet.
+#
+# Can be dispatched both via GitHub -> Actions workflow, or via '!diffcalc' in an issue/PR comment.
+#
+# ## Requirements
+#
+# Self-hosted runner with installed:
+# - `docker >= 20.10.16`
+# - `docker-compose >= 2.5.1`
+# - `lbzip2`
+# - `jq`
+#
+# ## Usage
+#
+# The workflow can be run in two ways:
+# 1. Via workflow dispatch.
+# 2. By an owner of the repository posting a pull request or issue comment containing `!diffcalc`.  
+# For pull requests, the workflow will assume the pull request as the target to compare against (i.e. the `OSU_B` variable).  
+# Any lines in the comment of the form `KEY=VALUE` are treated as variables for the generator.
+#
+# ## Google Service Account
+#
+# Spreadsheets are uploaded to a Google Service Account, and exposed with read-only permissions to the wider audience.
+#
+# 1. Create a project at https://console.cloud.google.com
+# 2. Enable the `Google Sheets` and `Google Drive` APIs.
+# 3. Create a Service Account
+# 4. Generate a key in the JSON format.
+# 5. Encode the key as base64 and store as an **actions secret** with name **`DIFFCALC_GOOGLE_CREDENTIALS`**
+#
+# ## Environment variables
+#
+# The default environment may be configured via **actions variables**.
+#
+# Refer to [the sample environment](https://github.com/smoogipoo/diffcalc-sheet-generator/blob/master/.env.sample), and prefix each variable with `DIFFCALC_` (e.g. `DIFFCALC_THREADS`, `DIFFCALC_INNODB_BUFFER_SIZE`, etc...).
+
+name: Run difficulty calculation comparison
 
 run-name: "${{ github.event_name == 'workflow_dispatch' && format('Manual run: {0}', inputs.osu-b) || 'Automatic comment trigger' }}"
 
@@ -326,4 +364,4 @@ jobs:
           mode: upsert
           create_if_not_exists: false
           message: |
-            Difficulty calculation failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
\ No newline at end of file
+            Difficulty calculation failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

From 2e0ca457736cc15939342191ddc3873dda8a2788 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 5 Oct 2023 14:09:58 +0900
Subject: [PATCH 1686/2100] Remove duplicated usage instructions

---
 .github/workflows/diffcalc.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 168f411264..5fde6e2f1a 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -2,8 +2,6 @@
 #
 # Uses [diffcalc-sheet-generator](https://github.com/smoogipoo/diffcalc-sheet-generator) to run two builds of osu and generate an SR/PP/Score comparison spreadsheet.
 #
-# Can be dispatched both via GitHub -> Actions workflow, or via '!diffcalc' in an issue/PR comment.
-#
 # ## Requirements
 #
 # Self-hosted runner with installed:

From 5a0faaa0b118e4935c05a78e00ec4214c69a6b5f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 14:30:04 +0900
Subject: [PATCH 1687/2100] Fix `TestReplayExport` intermittent failure

The previous fix was not working as it was checking the path for the
prefix `_`, not the filename.

See https://github.com/ppy/osu/runs/17415814653#r0s2 which clearly shows
this.
---
 .../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 feda251744..6a7fab86d6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.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 NUnit.Framework;
 using osu.Framework.Allocation;
@@ -173,7 +174,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             string? filePath = 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);
+            AddUntilStep("wait for export file", () => filePath = LocalStorage.GetFiles("exports").SingleOrDefault(f => !Path.GetFileName(f).StartsWith("_", StringComparison.Ordinal)), () => Is.Not.Null);
             AddAssert("filesize is non-zero", () =>
             {
                 using (var stream = LocalStorage.GetStream(filePath))

From 76cc2f9f22380d132500d6b5450ae1a76e868e49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 14:58:50 +0900
Subject: [PATCH 1688/2100] Fix `WaveformComparisonDisplay` potentially
 crashing on invalid track length

As seen at https://github.com/ppy/osu/runs/17415814918#r0s2.
---
 osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
index 3b3acea935..d598b2cfbf 100644
--- a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
+++ b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
@@ -191,6 +191,10 @@ namespace osu.Game.Screens.Edit.Timing
 
         private void regenerateDisplay(bool animated)
         {
+            // Before a track is loaded, it won't have a valid length, which will break things.
+            if (!beatmap.Value.Track.IsLoaded)
+                return;
+
             double index = (displayedTime - selectedGroupStartTime) / timingPoint.BeatLength;
 
             // Chosen as a pretty usable number across all BPMs.

From 61fd4186af8781af2791e6760d925760beba8f21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 22:55:23 +0900
Subject: [PATCH 1689/2100] Ensure `regenerateDisplay` is eventually performed
 if originally called before load

---
 osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
index d598b2cfbf..856bc7c303 100644
--- a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
+++ b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Screens.Edit.Timing
             controlPointGroups.BindTo(editorBeatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((_, _) => updateTimingGroup());
 
-            beatLength.BindValueChanged(_ => regenerateDisplay(true), true);
+            beatLength.BindValueChanged(_ => Scheduler.AddOnce(regenerateDisplay, true), true);
 
             displayLocked.BindValueChanged(locked =>
             {
@@ -186,14 +186,17 @@ namespace osu.Game.Screens.Edit.Timing
                 return;
 
             displayedTime = time;
-            regenerateDisplay(animated);
+            Scheduler.AddOnce(regenerateDisplay, animated);
         }
 
         private void regenerateDisplay(bool animated)
         {
             // Before a track is loaded, it won't have a valid length, which will break things.
             if (!beatmap.Value.Track.IsLoaded)
+            {
+                Scheduler.AddOnce(regenerateDisplay, animated);
                 return;
+            }
 
             double index = (displayedTime - selectedGroupStartTime) / timingPoint.BeatLength;
 

From d660395850c6934fc16bb0080cbc8812090750a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 23:02:45 +0900
Subject: [PATCH 1690/2100] Ensure there's no chance of a press being ignored
 during rewind flow

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 297ea93637..a8b48450e8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -17,6 +17,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Skinning.Default;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -269,6 +270,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 ProxyContent();
             else
                 UnproxyContent();
+
+            if ((Clock as IGameplayClock)?.IsRewinding == true)
+                lastPressHandleTime = null;
         }
 
         private bool? lastWasCentre;

From 0ae4a0f11f4b2d76b22351535ce3695b39c1fbfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 5 Oct 2023 20:37:10 +0200
Subject: [PATCH 1691/2100] Adjust gameplay element maximum size limits for
 backwards compatibility

The new limits were chosen by sampling across over 4000 skins. The
methodology for doing so is described in the following gist:

	https://gist.github.com/bdach/6228ba41d128b23d1f89142f404108a3
---
 .../Skinning/Legacy/LegacyBananaPiece.cs                    | 2 +-
 .../Skinning/Legacy/LegacyDropletPiece.cs                   | 2 +-
 osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs | 2 +-
 .../Skinning/Legacy/LegacyMainCirclePiece.cs                | 4 ++--
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs   | 4 ++--
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs             | 6 +++---
 .../Skinning/Legacy/LegacyCirclePiece.cs                    | 5 +++--
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
index c6f32e2014..ae530e94fc 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public partial class LegacyBananaPiece : LegacyCatchHitObjectPiece
     {
-        private static readonly Vector2 banana_max_size = new Vector2(128);
+        private static readonly Vector2 banana_max_size = new Vector2(160);
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index c6c0839fba..a121d20d3d 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public partial class LegacyDropletPiece : LegacyCatchHitObjectPiece
     {
-        private static readonly Vector2 droplet_max_size = new Vector2(82, 103);
+        private static readonly Vector2 droplet_max_size = new Vector2(160);
 
         public LegacyDropletPiece()
         {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index 62097d79bd..3a8b5b427a 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     internal partial class LegacyFruitPiece : LegacyCatchHitObjectPiece
     {
-        private static readonly Vector2 fruit_max_size = new Vector2(128);
+        private static readonly Vector2 fruit_max_size = new Vector2(160);
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 8990204931..3ec914596a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: OsuHitObject.OBJECT_DIMENSIONS))
+                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2))
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 25de6d2381..9048a92e13 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
 
-            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty()).With(d =>
+            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2) ?? Empty()).With(d =>
             {
                 d.Anchor = Anchor.Centre;
                 d.Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index c3beb5bc35..412fd30931 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS),
+                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2),
                     Colour = new Color4(5, 5, 5, 255),
                 },
                 LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS),
+                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2),
                     Blending = BlendingParameters.Additive,
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index ea6f6fe6ce..13b8fa912e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -42,14 +42,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return this.GetAnimation("sliderscorepoint", false, false);
 
                     case OsuSkinComponents.SliderFollowCircle:
-                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: new Vector2(308f));
+                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 3);
                         if (followCircleContent != null)
                             return new LegacyFollowCircle(followCircleContent);
 
                         return null;
 
                     case OsuSkinComponents.SliderBall:
-                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: OsuHitObject.OBJECT_DIMENSIONS);
+                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2);
 
                         // todo: slider ball has a custom frame delay based on velocity
                         // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         if (!this.HasFont(LegacyFont.HitCircle))
                             return null;
 
-                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS)
+                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS * 2)
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
                             Scale = new Vector2(0.8f),
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index c94016d2b1..4dce3f1d4a 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
     public partial class LegacyCirclePiece : CompositeDrawable, IHasAccentColour
     {
         private static readonly Vector2 circle_piece_size = new Vector2(128);
+        private static readonly Vector2 max_circle_sprite_size = new Vector2(160);
 
         private Drawable backgroundLayer = null!;
         private Drawable? foregroundLayer;
@@ -54,9 +55,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
                 string prefix = ((drawableHitObject.HitObject as TaikoStrongableHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
-                return skin.GetAnimation($"{prefix}{lookup}", true, false, maxSize: circle_piece_size) ??
+                return skin.GetAnimation($"{prefix}{lookup}", true, false, maxSize: max_circle_sprite_size) ??
                        // fallback to regular size if "big" version doesn't exist.
-                       skin.GetAnimation($"{normal_hit}{lookup}", true, false, maxSize: circle_piece_size);
+                       skin.GetAnimation($"{normal_hit}{lookup}", true, false, maxSize: max_circle_sprite_size);
             }
 
             // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer.

From 96bb8ed150e2828c82efcd8a8641019a64dbf857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 5 Oct 2023 22:33:49 +0200
Subject: [PATCH 1692/2100] Apply feedback regarding maximum osu! element
 sizings

- `default-N` number sprites maximum size increased by 1.25x to a total
  of 320x320 to counteract the 0.8x factor applied onto them when
  displayed on a hitcircle.

- `sliderb` and parts' maximum size increased to 384x384, to match
  `sliderfollowcircle`, as the two are apparently sometimes used
  interchangeably by skinners to achieve different visual effects.
---
 .../Skinning/Legacy/LegacySliderBall.cs       |  5 ++---
 .../Legacy/OsuLegacySkinTransformer.cs        | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 412fd30931..5535903c73 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK.Graphics;
@@ -47,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2),
+                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE),
                     Colour = new Color4(5, 5, 5, 255),
                 },
                 LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
@@ -59,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2),
+                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE),
                     Blending = BlendingParameters.Additive,
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 13b8fa912e..88a4e17120 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -23,6 +23,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         /// </summary>
         public const float LEGACY_CIRCLE_RADIUS = OsuHitObject.OBJECT_RADIUS - 5;
 
+        /// <summary>
+        /// The maximum allowed size of sprites that reside in the follow circle area of a slider.
+        /// </summary>
+        /// <remarks>
+        /// The reason this is extracted out to a constant, rather than be inlined in the follow circle sprite retrieval,
+        /// is that some skins will use `sliderb` elements to emulate a slider follow circle with slightly different visual effects applied
+        /// (`sliderb` is always shown and doesn't pulsate; `sliderfollowcircle` isn't always shown and pulsates).
+        /// </remarks>
+        public static readonly Vector2 MAX_FOLLOW_CIRCLE_AREA_SIZE = OsuHitObject.OBJECT_DIMENSIONS * 3;
+
         public OsuLegacySkinTransformer(ISkin skin)
             : base(skin)
         {
@@ -42,14 +52,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return this.GetAnimation("sliderscorepoint", false, false);
 
                     case OsuSkinComponents.SliderFollowCircle:
-                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 3);
+                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: MAX_FOLLOW_CIRCLE_AREA_SIZE);
                         if (followCircleContent != null)
                             return new LegacyFollowCircle(followCircleContent);
 
                         return null;
 
                     case OsuSkinComponents.SliderBall:
-                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2);
+                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: MAX_FOLLOW_CIRCLE_AREA_SIZE);
 
                         // todo: slider ball has a custom frame delay based on velocity
                         // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
@@ -139,10 +149,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         if (!this.HasFont(LegacyFont.HitCircle))
                             return null;
 
-                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS * 2)
+                        const float hitcircle_text_scale = 0.8f;
+                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS * 2 / hitcircle_text_scale)
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
-                            Scale = new Vector2(0.8f),
+                            Scale = new Vector2(hitcircle_text_scale),
                         };
 
                     case OsuSkinComponents.SpinnerBody:

From 1005b7ac858c6d96780b33d199101f8044026e4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 14:32:53 +0900
Subject: [PATCH 1693/2100] Fix incorrect test assumption in
 `TestSceneEditorClock`

I don't know what this test was trying to do, but it was wrong. Any
offset which is applied should be invisible to the clock's final
`CurrentTime` (and to the user).
---
 osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs | 2 +-
 osu.Game/Screens/Edit/EditorClock.cs                  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index 82d2542190..ed58c59ff0 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("seek near end", () => EditorClock.Seek(EditorClock.TrackLength - 250));
             AddUntilStep("clock stops", () => !EditorClock.IsRunning);
 
-            AddUntilStep("clock stopped at end", () => EditorClock.CurrentTime - EditorClock.TotalAppliedOffset, () => Is.EqualTo(EditorClock.TrackLength));
+            AddUntilStep("clock stopped at end", () => EditorClock.CurrentTime, () => Is.EqualTo(EditorClock.TrackLength));
 
             AddStep("start clock again", () => EditorClock.Start());
             AddAssert("clock looped to start", () => EditorClock.IsRunning && EditorClock.CurrentTime < 500);
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index d4de1bae5f..d5ca6fc35e 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -158,8 +158,6 @@ namespace osu.Game.Screens.Edit
 
         public double CurrentTime => underlyingClock.CurrentTime;
 
-        public double TotalAppliedOffset => underlyingClock.TotalAppliedOffset;
-
         public void Reset()
         {
             ClearTransforms();

From f9021bf5512a3ee250ce732ff36d9564938afac9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 17:16:10 +0900
Subject: [PATCH 1694/2100] Remove pointless test class in
 `TestSceneStoryboardSamples`

---
 .../Gameplay/TestSceneStoryboardSamples.cs           | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 2cad7d33c2..4fb9db845b 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestSamplePlaybackWithBeatmapHitsoundsOff()
         {
             GameplayClockContainer gameplayContainer = null;
-            TestDrawableStoryboardSample sample = null;
+            DrawableStoryboardSample sample = null;
 
             AddStep("disable beatmap hitsounds", () => config.SetValue(OsuSetting.BeatmapHitsounds, false));
 
@@ -141,7 +141,7 @@ namespace osu.Game.Tests.Gameplay
                     Child = beatmapSkinSourceContainer
                 });
 
-                beatmapSkinSourceContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
+                beatmapSkinSourceContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
                 {
                     Clock = gameplayContainer
                 });
@@ -199,14 +199,6 @@ namespace osu.Game.Tests.Gameplay
             protected internal override ISkin GetSkin() => new TestSkin("test-sample", resources);
         }
 
-        private partial class TestDrawableStoryboardSample : DrawableStoryboardSample
-        {
-            public TestDrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
-                : base(sampleInfo)
-            {
-            }
-        }
-
         #region IResourceStorageProvider
 
         public IRenderer Renderer => host.Renderer;

From f2e56bbb651ca0b0e3f472fb8d6bbe759002f5e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 16:51:24 +0900
Subject: [PATCH 1695/2100] Fix publicly-settable bindables

---
 .../Edit/DrawableManiaEditorRuleset.cs               |  2 +-
 .../Edit/DrawableTaikoEditorRuleset.cs               |  2 +-
 osu.Game.Tests/Mods/SettingSourceAttributeTest.cs    | 12 ++++++------
 osu.Game.Tournament/Models/TournamentTeam.cs         |  2 +-
 osu.Game/Graphics/Containers/UserDimContainer.cs     |  2 +-
 .../HUD/JudgementCounter/JudgementCounterDisplay.cs  |  8 ++++----
 osu.Game/Screens/Play/HUD/PlayerAvatar.cs            |  2 +-
 osu.Game/Skinning/Components/BeatmapAttributeText.cs |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index 7b019a2bdf..8d34373f82 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 partial class DrawableManiaEditorRuleset : DrawableManiaRuleset, ISupportConstantAlgorithmToggle
     {
-        public BindableBool ShowSpeedChanges { get; set; } = new BindableBool();
+        public BindableBool ShowSpeedChanges { get; } = new BindableBool();
 
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
diff --git a/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs b/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
index 963ddec0b3..3c7a97c864 100644
--- a/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
 {
     public partial class DrawableTaikoEditorRuleset : DrawableTaikoRuleset, ISupportConstantAlgorithmToggle
     {
-        public BindableBool ShowSpeedChanges { get; set; } = new BindableBool();
+        public BindableBool ShowSpeedChanges { get; } = new BindableBool();
 
         public DrawableTaikoEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(ruleset, beatmap, mods)
diff --git a/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
index 5da303d3a7..83d5b66bd7 100644
--- a/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
+++ b/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
@@ -42,22 +42,22 @@ namespace osu.Game.Tests.Mods
         private class ClassWithSettings
         {
             [SettingSource("Unordered setting", "Should be last")]
-            public BindableFloat UnorderedSetting { get; set; } = new BindableFloat();
+            public BindableFloat UnorderedSetting { get; } = new BindableFloat();
 
             [SettingSource("Second setting", "Another description", 2)]
-            public BindableBool SecondSetting { get; set; } = new BindableBool();
+            public BindableBool SecondSetting { get; } = new BindableBool();
 
             [SettingSource("First setting", "A description", 1)]
-            public BindableDouble FirstSetting { get; set; } = new BindableDouble();
+            public BindableDouble FirstSetting { get; } = new BindableDouble();
 
             [SettingSource("Third setting", "Yet another description", 3)]
-            public BindableInt ThirdSetting { get; set; } = new BindableInt();
+            public BindableInt ThirdSetting { get; } = new BindableInt();
         }
 
         private class ClassWithCustomSettingControl
         {
             [SettingSource("Custom setting", "Should be a custom control", SettingControlType = typeof(CustomSettingsControl))]
-            public BindableInt UnorderedSetting { get; set; } = new BindableInt();
+            public BindableInt UnorderedSetting { get; } = new BindableInt();
         }
 
         private partial class CustomSettingsControl : SettingsItem<int>
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Mods
 
             private partial class CustomControl : Drawable, IHasCurrentValue<int>
             {
-                public Bindable<int> Current { get; set; } = new Bindable<int>();
+                public Bindable<int> Current { get; } = new Bindable<int>();
             }
         }
     }
diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index ae0ac77936..95858240a8 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tournament.Models
         };
 
         [JsonProperty]
-        public BindableList<TournamentUser> Players { get; set; } = new BindableList<TournamentUser>();
+        public BindableList<TournamentUser> Players { get; } = new BindableList<TournamentUser>();
 
         public TournamentTeam()
         {
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 625702ef6e..af5e7692b3 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// The amount of dim to be used when <see cref="IgnoreUserSettings"/> is <c>true</c>.
         /// </summary>
-        public Bindable<float> DimWhenUserSettingsIgnored { get; set; } = new Bindable<float>();
+        public Bindable<float> DimWhenUserSettingsIgnored { get; } = new Bindable<float>();
 
         protected Bindable<bool> LightenDuringBreaks { get; private set; } = null!;
 
diff --git a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
index 1dbee19ee3..128897ddde 100644
--- a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
@@ -22,16 +22,16 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
         public bool UsesFixedAnchor { get; set; }
 
         [SettingSource(typeof(JudgementCounterDisplayStrings), nameof(JudgementCounterDisplayStrings.JudgementDisplayMode))]
-        public Bindable<DisplayMode> Mode { get; set; } = new Bindable<DisplayMode>();
+        public Bindable<DisplayMode> Mode { get; } = new Bindable<DisplayMode>();
 
         [SettingSource(typeof(JudgementCounterDisplayStrings), nameof(JudgementCounterDisplayStrings.FlowDirection))]
-        public Bindable<Direction> FlowDirection { get; set; } = new Bindable<Direction>();
+        public Bindable<Direction> FlowDirection { get; } = new Bindable<Direction>();
 
         [SettingSource(typeof(JudgementCounterDisplayStrings), nameof(JudgementCounterDisplayStrings.ShowJudgementNames))]
-        public BindableBool ShowJudgementNames { get; set; } = new BindableBool(true);
+        public BindableBool ShowJudgementNames { get; } = new BindableBool(true);
 
         [SettingSource(typeof(JudgementCounterDisplayStrings), nameof(JudgementCounterDisplayStrings.ShowMaxJudgement))]
-        public BindableBool ShowMaxJudgement { get; set; } = new BindableBool(true);
+        public BindableBool ShowMaxJudgement { get; } = new BindableBool(true);
 
         [Resolved]
         private JudgementCountController judgementCountController { get; set; } = null!;
diff --git a/osu.Game/Screens/Play/HUD/PlayerAvatar.cs b/osu.Game/Screens/Play/HUD/PlayerAvatar.cs
index 1d0331593a..1341a10d60 100644
--- a/osu.Game/Screens/Play/HUD/PlayerAvatar.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerAvatar.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.CornerRadius), nameof(SkinnableComponentStrings.CornerRadiusDescription),
             SettingControlType = typeof(SettingsPercentageSlider<float>))]
-        public new BindableFloat CornerRadius { get; set; } = new BindableFloat(0.25f)
+        public new BindableFloat CornerRadius { get; } = new BindableFloat(0.25f)
         {
             MinValue = 0,
             MaxValue = 0.5f,
diff --git a/osu.Game/Skinning/Components/BeatmapAttributeText.cs b/osu.Game/Skinning/Components/BeatmapAttributeText.cs
index 6523039a3f..52c439a624 100644
--- a/osu.Game/Skinning/Components/BeatmapAttributeText.cs
+++ b/osu.Game/Skinning/Components/BeatmapAttributeText.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Skinning.Components
         public Bindable<BeatmapAttribute> Attribute { get; } = new Bindable<BeatmapAttribute>(BeatmapAttribute.StarRating);
 
         [SettingSource(typeof(BeatmapAttributeTextStrings), nameof(BeatmapAttributeTextStrings.Template), nameof(BeatmapAttributeTextStrings.TemplateDescription))]
-        public Bindable<string> Template { get; set; } = new Bindable<string>("{Label}: {Value}");
+        public Bindable<string> Template { get; } = new Bindable<string>("{Label}: {Value}");
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;

From 1d7b8ea21a88f1eabe104ffd9c8d1c851813c5f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 16:51:40 +0900
Subject: [PATCH 1696/2100] Fix incorrect implementation of `IHasCurrentValue`
 in `FooterButtonFreeMods`

---
 osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
index 3825cf18b9..54cd36d05b 100644
--- a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
@@ -23,7 +23,18 @@ namespace osu.Game.Screens.OnlinePlay
 {
     public partial class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
     {
-        public Bindable<IReadOnlyList<Mod>> Current { get; set; } = new BindableWithCurrent<IReadOnlyList<Mod>>();
+        private readonly BindableWithCurrent<IReadOnlyList<Mod>> current = new BindableWithCurrent<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
+        public Bindable<IReadOnlyList<Mod>> Current
+        {
+            get => current.Current;
+            set
+            {
+                ArgumentNullException.ThrowIfNull(value);
+
+                current.Current = value;
+            }
+        }
 
         private OsuSpriteText count = null!;
 

From 936a21a661e2bd36e8072c26ec0a04507bcd7be5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 16:51:56 +0900
Subject: [PATCH 1697/2100] Fix redundant bindable initialisation in
 `SongSelect`

---
 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 9c2b1cfe37..2e457f827d 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         internal IOverlayManager? OverlayManager { get; private set; }
 
-        private Bindable<bool> configBackgroundBlur { get; set; } = new BindableBool();
+        private Bindable<bool> configBackgroundBlur = null!;
 
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio, OsuColour colours, ManageCollectionsDialog? manageCollectionsDialog, DifficultyRecommender? recommender, OsuConfigManager config)

From 7227f5c881ad6cd4b39085dec0b0f4c2d0a029ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 18:13:02 +0900
Subject: [PATCH 1698/2100] Fix a couple of compilation errors

---
 osu.Game.Tests/Mods/SettingSourceAttributeTest.cs            | 2 +-
 .../Components/TestSceneTournamentMatchChatDisplay.cs        | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
index 83d5b66bd7..b1d8b7e7fa 100644
--- a/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
+++ b/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Mods
 
             private partial class CustomControl : Drawable, IHasCurrentValue<int>
             {
-                public Bindable<int> Current { get; } = new Bindable<int>();
+                public Bindable<int> Current { get; set; } = new Bindable<int>();
             }
         }
     }
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index 044e5ebbbf..de91a66e56 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Online.API.Requests.Responses;
@@ -80,11 +79,11 @@ namespace osu.Game.Tournament.Tests.Components
             {
                 Team1 =
                 {
-                    Value = new TournamentTeam { Players = new BindableList<TournamentUser> { redUser } }
+                    Value = new TournamentTeam { Players = { redUser } }
                 },
                 Team2 =
                 {
-                    Value = new TournamentTeam { Players = new BindableList<TournamentUser> { blueUser, blueUserWithCustomColour } }
+                    Value = new TournamentTeam { Players = { blueUser, blueUserWithCustomColour } }
                 }
             });
 

From c78b5112c6630dc98607166c18e4655e47b32d59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 18:23:28 +0900
Subject: [PATCH 1699/2100] Fix OAuth refresh attempt when no network available
 causing full logout (part 2)

This time for `SocketException`s. I seem to recall looking at this and
deciding there was a reason to not catch socket exceptions, but on
revisiting it seems sane to do so.

This covers a fail case like reported:

```
2023-10-06 03:24:17 [verbose]: Request to https://lazer.ppy.sh/oauth/token failed with System.Net.Http.HttpRequestException: No such host is known. (lazer.ppy.sh:443)
2023-10-06 03:24:17 [verbose]: ---> System.Net.Sockets.SocketException (11001): No such host is known.
2023-10-06 03:24:17 [verbose]: at System.Net.Sockets.Socket.AwaitableSocketAsyncEventArgs.ThrowException(SocketError error, CancellationToken cancellationToken)
```

Closes https://github.com/ppy/osu/issues/24890 (again).
---
 osu.Game/Online/API/OAuth.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs
index 1f26ab5458..485274f349 100644
--- a/osu.Game/Online/API/OAuth.cs
+++ b/osu.Game/Online/API/OAuth.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Diagnostics;
 using System.Net.Http;
+using System.Net.Sockets;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 
@@ -99,6 +100,11 @@ namespace osu.Game.Online.API
                     return true;
                 }
             }
+            catch (SocketException)
+            {
+                // Network failure.
+                return false;
+            }
             catch (HttpRequestException)
             {
                 // Network failure.
@@ -106,7 +112,7 @@ namespace osu.Game.Online.API
             }
             catch
             {
-                // Force a full re-reauthentication.
+                // Force a full re-authentication.
                 Token.Value = null;
                 return false;
             }

From db5178e45306ce9df560b047a563b3e075a75ff6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 16:52:00 +0900
Subject: [PATCH 1700/2100] Change `ArgonHealthDisplay` to be relative sized
 for now

---
 .../Gameplay/TestSceneArgonHealthDisplay.cs   |  2 -
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 68 ++++++++++++++-----
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index 06a7763711..8261a1729e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -12,7 +12,6 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -41,7 +40,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Scale = new Vector2(2f),
                     },
                 };
             });
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 62a4b958c2..ad4b407692 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -5,14 +5,17 @@ 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.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -27,6 +30,23 @@ namespace osu.Game.Screens.Play.HUD
     {
         public bool UsesFixedAnchor { get; set; }
 
+        [SettingSource("Bar height")]
+        public BindableFloat BarHeight { get; } = new BindableFloat
+        {
+            Default = 32,
+            MinValue = 0,
+            MaxValue = 64,
+            Precision = 1
+        };
+
+        [SettingSource("Bar length")]
+        public BindableFloat BarLength { get; } = new BindableFloat(1)
+        {
+            MinValue = 0.2f,
+            MaxValue = 1,
+            Precision = 0.01f,
+        };
+
         private BarPath mainBar = null!;
 
         /// <summary>
@@ -76,10 +96,13 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        private const float left_line_width = 50f;
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            AutoSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
 
             InternalChild = new FillFlowContainer
             {
@@ -91,7 +114,7 @@ namespace osu.Game.Screens.Play.HUD
                     new Circle
                     {
                         Margin = new MarginPadding { Top = 8.5f, Left = -2 },
-                        Size = new Vector2(50f, 3f),
+                        Size = new Vector2(left_line_width, 3f),
                     },
                     new Container
                     {
@@ -127,8 +150,6 @@ namespace osu.Game.Screens.Play.HUD
                     }
                 },
             };
-
-            updatePath();
         }
 
         protected override void LoadComplete()
@@ -144,6 +165,18 @@ namespace osu.Game.Screens.Play.HUD
                 if (resetMissBarDelegate == null)
                     this.TransformTo(nameof(GlowBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
+
+            BarLength.BindValueChanged(l => Width = l.NewValue, true);
+            BarHeight.BindValueChanged(_ => updatePath());
+            updatePath();
+        }
+
+        protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
+        {
+            if ((invalidation & Invalidation.DrawSize) > 0)
+                updatePath();
+
+            return base.OnInvalidate(invalidation, source);
         }
 
         protected override void Update()
@@ -214,25 +247,24 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updatePath()
         {
-            const float curve_start = 280;
-            const float curve_end = 310;
+            float barLength = DrawWidth - left_line_width - 24;
+            float curveStart = barLength - 70;
+            float curveEnd = barLength - 40;
+
             const float curve_smoothness = 10;
 
-            const float bar_length = 350;
-            const float bar_verticality = 32.5f;
-
-            Vector2 diagonalDir = (new Vector2(curve_end, bar_verticality) - new Vector2(curve_start, 0)).Normalized();
+            Vector2 diagonalDir = (new Vector2(curveEnd, BarHeight.Value) - new Vector2(curveStart, 0)).Normalized();
 
             barPath = new SliderPath(new[]
             {
                 new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                new PathControlPoint(new Vector2(curve_start - curve_smoothness, 0), PathType.Bezier),
-                new PathControlPoint(new Vector2(curve_start, 0)),
-                new PathControlPoint(new Vector2(curve_start, 0) + diagonalDir * curve_smoothness, PathType.Linear),
-                new PathControlPoint(new Vector2(curve_end, bar_verticality) - diagonalDir * curve_smoothness, PathType.Bezier),
-                new PathControlPoint(new Vector2(curve_end, bar_verticality)),
-                new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_verticality), PathType.Linear),
-                new PathControlPoint(new Vector2(bar_length, bar_verticality)),
+                new PathControlPoint(new Vector2(curveStart - curve_smoothness, 0), PathType.Bezier),
+                new PathControlPoint(new Vector2(curveStart, 0)),
+                new PathControlPoint(new Vector2(curveStart, 0) + diagonalDir * curve_smoothness, PathType.Linear),
+                new PathControlPoint(new Vector2(curveEnd, BarHeight.Value) - diagonalDir * curve_smoothness, PathType.Bezier),
+                new PathControlPoint(new Vector2(curveEnd, BarHeight.Value)),
+                new PathControlPoint(new Vector2(curveEnd + curve_smoothness, BarHeight.Value), PathType.Linear),
+                new PathControlPoint(new Vector2(barLength, BarHeight.Value)),
             });
 
             List<Vector2> vertices = new List<Vector2>();
@@ -267,7 +299,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             protected override Color4 ColourAt(float position)
             {
-                if (position <= 0.128f)
+                if (position <= 0.16f)
                     return Color4.White.Opacity(0.8f);
 
                 return Interpolation.ValueAt(position,

From f40e910c51da3f4ad5779b854941ffb5b8e53a23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 18:56:31 +0900
Subject: [PATCH 1701/2100] Remove left line from health display

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 67 +++++++------------
 1 file changed, 26 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index ad4b407692..67f21a1c83 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
@@ -96,7 +95,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private const float left_line_width = 50f;
+        private const float main_path_radius = 10f;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -104,51 +103,37 @@ namespace osu.Game.Screens.Play.HUD
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = new FillFlowContainer
+            InternalChild = new Container
             {
                 AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(4f, 0f),
                 Children = new Drawable[]
                 {
-                    new Circle
+                    background = new BackgroundPath
                     {
-                        Margin = new MarginPadding { Top = 8.5f, Left = -2 },
-                        Size = new Vector2(left_line_width, 3f),
+                        PathRadius = main_path_radius,
                     },
-                    new Container
+                    glowBar = new BarPath
                     {
-                        AutoSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            background = new BackgroundPath
-                            {
-                                PathRadius = 10f,
-                            },
-                            glowBar = new BarPath
-                            {
-                                BarColour = Color4.White,
-                                GlowColour = OsuColour.Gray(0.5f),
-                                Blending = BlendingParameters.Additive,
-                                Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
-                                PathRadius = 40f,
-                                // Kinda hacky, but results in correct positioning with increased path radius.
-                                Margin = new MarginPadding(-30f),
-                                GlowPortion = 0.9f,
-                            },
-                            mainBar = new BarPath
-                            {
-                                AutoSizeAxes = Axes.None,
-                                RelativeSizeAxes = Axes.Both,
-                                Blending = BlendingParameters.Additive,
-                                BarColour = main_bar_colour,
-                                GlowColour = main_bar_glow_colour,
-                                PathRadius = 10f,
-                                GlowPortion = 0.6f,
-                            },
-                        }
-                    }
-                },
+                        BarColour = Color4.White,
+                        GlowColour = OsuColour.Gray(0.5f),
+                        Blending = BlendingParameters.Additive,
+                        Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
+                        PathRadius = 40f,
+                        // Kinda hacky, but results in correct positioning with increased path radius.
+                        Margin = new MarginPadding(-30f),
+                        GlowPortion = 0.9f,
+                    },
+                    mainBar = new BarPath
+                    {
+                        AutoSizeAxes = Axes.None,
+                        RelativeSizeAxes = Axes.Both,
+                        Blending = BlendingParameters.Additive,
+                        BarColour = main_bar_colour,
+                        GlowColour = main_bar_glow_colour,
+                        PathRadius = main_path_radius,
+                        GlowPortion = 0.6f,
+                    },
+                }
             };
         }
 
@@ -247,7 +232,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updatePath()
         {
-            float barLength = DrawWidth - left_line_width - 24;
+            float barLength = DrawWidth - main_path_radius * 2;
             float curveStart = barLength - 70;
             float curveEnd = barLength - 40;
 

From 71be3c8f8b783716d4bcb619d36e253b1ad79315 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 18:56:16 +0900
Subject: [PATCH 1702/2100] Add ability to adjust health bar settings in test
 scene

---
 .../Gameplay/TestSceneArgonHealthDisplay.cs     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index 8261a1729e..7bad623d7f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
@@ -21,6 +22,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
+        private ArgonHealthDisplay healthDisplay = null!;
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -36,13 +39,25 @@ namespace osu.Game.Tests.Visual.Gameplay
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4.Gray,
                     },
-                    new ArgonHealthDisplay
+                    healthDisplay = new ArgonHealthDisplay
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                     },
                 };
             });
+
+            AddSliderStep("Width", 0, 1f, 1f, val =>
+            {
+                if (healthDisplay.IsNotNull())
+                    healthDisplay.BarLength.Value = val;
+            });
+
+            AddSliderStep("Height", 0, 64, 0, val =>
+            {
+                if (healthDisplay.IsNotNull())
+                    healthDisplay.BarHeight.Value = val;
+            });
         }
 
         [Test]

From 3f2a00d90d2a967147e33e273dab24779fb03747 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 18:46:50 +0900
Subject: [PATCH 1703/2100] Add argon health display to default skin layout

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs |  5 ++---
 osu.Game/Skinning/ArgonSkin.cs                  | 10 +++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 67f21a1c83..755eaeaf33 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -30,16 +30,15 @@ namespace osu.Game.Screens.Play.HUD
         public bool UsesFixedAnchor { get; set; }
 
         [SettingSource("Bar height")]
-        public BindableFloat BarHeight { get; } = new BindableFloat
+        public BindableFloat BarHeight { get; } = new BindableFloat(20)
         {
-            Default = 32,
             MinValue = 0,
             MaxValue = 64,
             Precision = 1
         };
 
         [SettingSource("Bar length")]
-        public BindableFloat BarLength { get; } = new BindableFloat(1)
+        public BindableFloat BarLength { get; } = new BindableFloat(0.98f)
         {
             MinValue = 0.2f,
             MaxValue = 1,
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 6e17458082..d530efbfdd 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -109,6 +109,7 @@ namespace osu.Game.Skinning
                         case SkinComponentsContainerLookup.TargetArea.MainHUDComponents:
                             var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container =>
                             {
+                                var health = container.OfType<ArgonHealthDisplay>().FirstOrDefault();
                                 var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();
                                 var combo = container.OfType<DefaultComboCounter>().FirstOrDefault();
@@ -128,6 +129,13 @@ namespace osu.Game.Skinning
 
                                     score.Position = new Vector2(0, vertical_offset);
 
+                                    if (health != null)
+                                    {
+                                        health.Origin = Anchor.TopCentre;
+                                        health.Anchor = Anchor.TopCentre;
+                                        health.Y = 5;
+                                    }
+
                                     if (ppCounter != null)
                                     {
                                         ppCounter.Y = score.Position.Y + ppCounter.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).Y - 4;
@@ -191,7 +199,7 @@ namespace osu.Game.Skinning
                                     new DefaultComboCounter(),
                                     new DefaultScoreCounter(),
                                     new DefaultAccuracyCounter(),
-                                    new DefaultHealthDisplay(),
+                                    new ArgonHealthDisplay(),
                                     new ArgonSongProgress(),
                                     new ArgonKeyCounterDisplay(),
                                     new BarHitErrorMeter(),

From d87ab9c82dad1081c6a060ea8b6e401bbd29cdee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 19:34:38 +0900
Subject: [PATCH 1704/2100] Adjust transition time based on miss/hit

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 755eaeaf33..7af7fd9487 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -145,9 +145,11 @@ namespace osu.Game.Screens.Play.HUD
                 if (v.NewValue >= GlowBarValue)
                     finishMissDisplay();
 
-                this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
+                double time = v.NewValue > GlowBarValue ? 500 : 250;
+
+                this.TransformTo(nameof(HealthBarValue), v.NewValue, time, Easing.OutQuint);
                 if (resetMissBarDelegate == null)
-                    this.TransformTo(nameof(GlowBarValue), v.NewValue, 300, Easing.OutQuint);
+                    this.TransformTo(nameof(GlowBarValue), v.NewValue, time, Easing.OutQuint);
             }, true);
 
             BarLength.BindValueChanged(l => Width = l.NewValue, true);

From 8e5b2e78e58842721478fbf5dd7fdd7c7a1f66ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 21:01:23 +0900
Subject: [PATCH 1705/2100] Fix variable clash

---
 osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
index 54cd36d05b..dd6536cf26 100644
--- a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
@@ -117,17 +117,17 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void updateModDisplay()
         {
-            int current = Current.Value.Count;
+            int currentCount = Current.Value.Count;
 
-            if (current == allAvailableAndValidMods.Count())
+            if (currentCount == allAvailableAndValidMods.Count())
             {
                 count.Text = "all";
                 count.FadeColour(colours.Gray2, 200, Easing.OutQuint);
                 circle.FadeColour(colours.Yellow, 200, Easing.OutQuint);
             }
-            else if (current > 0)
+            else if (currentCount > 0)
             {
-                count.Text = $"{current} mods";
+                count.Text = $"{currentCount} mods";
                 count.FadeColour(colours.Gray2, 200, Easing.OutQuint);
                 circle.FadeColour(colours.YellowDark, 200, Easing.OutQuint);
             }

From 10ce5705ce67acb920f2f4f0d6b30e91178df5d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Oct 2023 14:11:41 +0200
Subject: [PATCH 1706/2100] 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 bc95e96a7b..b3feccbbc0 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.1004.2" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1006.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 622b59a725..1aa3a23cdc 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.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1004.2" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1006.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 16bccbbb53..bf772f20f4 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.1004.2" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1006.0" />
   </ItemGroup>
 </Project>

From 58448d3dd95f64e7b1d0c43492516b64f34f6086 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Oct 2023 01:03:41 +0900
Subject: [PATCH 1707/2100] Fix health animation affecting failing tint

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs  | 2 ++
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 67e7ae8f3f..3954e23cbe 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public readonly Bindable<bool> ShowHealth = new Bindable<bool>();
 
+        protected override bool PlayInitialIncreaseAnimation => false;
+
         private const float max_alpha = 0.4f;
         private const int fade_time = 400;
         private const float gradient_size = 0.2f;
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index e4bb91e7ca..24af3051e3 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Play.HUD
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; } = null!;
 
+        protected virtual bool PlayInitialIncreaseAnimation => true;
+
         public Bindable<double> Current { get; } = new BindableDouble
         {
             MinValue = 0,
@@ -74,7 +76,10 @@ namespace osu.Game.Screens.Play.HUD
             // this probably shouldn't be operating on `this.`
             showHealthBar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
 
-            startInitialAnimation();
+            if (PlayInitialIncreaseAnimation)
+                startInitialAnimation();
+            else
+                Current.Value = 1;
         }
 
         private void startInitialAnimation()

From 5ea45e3e96b21996cb594805637f5f751ff3745b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Oct 2023 19:43:00 +0200
Subject: [PATCH 1708/2100] Rename local variable

---
 osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
index 65113add2d..07de4d1a01 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Tests.NonVisual
         [TestCase(1)]
         public void TestTrueGameplayRateWithGameplayAdjustment(double underlyingClockRate)
         {
-            var framedClock = new TrackVirtual(60000) { Frequency = { Value = underlyingClockRate } };
-            var gameplayClock = new TestGameplayClockContainer(framedClock);
+            var trackVirtual = new TrackVirtual(60000) { Frequency = { Value = underlyingClockRate } };
+            var gameplayClock = new TestGameplayClockContainer(trackVirtual);
 
             Assert.That(gameplayClock.GetTrueGameplayRate(), Is.EqualTo(2));
         }

From ce0d4bd0df26839eab2dec51f9312f5a614eb008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Oct 2023 21:30:41 +0200
Subject: [PATCH 1709/2100] Fix health display potentially desyncing from
 actual if health was changed during initial animation

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 24af3051e3..2ec63feeae 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -66,8 +66,8 @@ namespace osu.Game.Screens.Play.HUD
             health = HealthProcessor.Health.GetBoundCopy();
             health.BindValueChanged(h =>
             {
-                Current.Value = h.NewValue;
                 finishInitialAnimation();
+                Current.Value = h.NewValue;
             });
 
             if (hudOverlay != null)
@@ -103,6 +103,11 @@ namespace osu.Game.Screens.Play.HUD
         {
             initialIncrease?.Cancel();
             initialIncrease = null;
+
+            // aside from the repeating `initialIncrease` scheduled task,
+            // there may also be a `Current` transform in progress from that schedule.
+            // ensure it plays out fully, to prevent changes to `Current.Value` being discarded by the ongoing transform.
+            FinishTransforms();
         }
 
         private void onNewJudgement(JudgementResult judgement)

From b7d0bf37567fe198a9e15936f2ca46ccefe1a390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Oct 2023 21:39:29 +0200
Subject: [PATCH 1710/2100] Only flush the `Current` transform specifically

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 2ec63feeae..986efe3036 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -107,7 +107,9 @@ namespace osu.Game.Screens.Play.HUD
             // aside from the repeating `initialIncrease` scheduled task,
             // there may also be a `Current` transform in progress from that schedule.
             // ensure it plays out fully, to prevent changes to `Current.Value` being discarded by the ongoing transform.
-            FinishTransforms();
+            // and yes, this funky `targetMember` spec is seemingly the only way to do this
+            // (see: https://github.com/ppy/osu-framework/blob/fe2769171c6e26d1b6fdd6eb7ea8353162fe9065/osu.Framework/Graphics/Transforms/TransformBindable.cs#L21)
+            FinishTransforms(targetMember: $"{Current.GetHashCode()}.{nameof(Current.Value)}");
         }
 
         private void onNewJudgement(JudgementResult judgement)

From e5207167c810ea924fe27781ec1f31acb96a7a69 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Oct 2023 00:39:30 +0900
Subject: [PATCH 1711/2100] Rename `FailAnimation` to `FailAnimationContainer`

---
 ...{FailAnimation.cs => FailAnimationContainer.cs} |  6 +++---
 osu.Game/Screens/Play/Player.cs                    | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename osu.Game/Screens/Play/{FailAnimation.cs => FailAnimationContainer.cs} (97%)

diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimationContainer.cs
similarity index 97%
rename from osu.Game/Screens/Play/FailAnimation.cs
rename to osu.Game/Screens/Play/FailAnimationContainer.cs
index 57bdad079e..821c67e3cb 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimationContainer.cs
@@ -27,10 +27,10 @@ using osuTK.Graphics;
 namespace osu.Game.Screens.Play
 {
     /// <summary>
-    /// Manage the animation to be applied when a player fails.
+    /// Manage the animation to be applied when a player fails. Applies the animation to children.
     /// Single use and automatically disposed after use.
     /// </summary>
-    public partial class FailAnimation : Container
+    public partial class FailAnimationContainer : Container
     {
         public Action? OnComplete;
 
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public BackgroundScreen? Background { private get; set; }
 
-        public FailAnimation(DrawableRuleset drawableRuleset)
+        public FailAnimationContainer(DrawableRuleset drawableRuleset)
         {
             this.drawableRuleset = drawableRuleset;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 60806a73c5..ac9ce11cb5 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -257,7 +257,7 @@ namespace osu.Game.Screens.Play
 
             rulesetSkinProvider.AddRange(new Drawable[]
             {
-                failAnimationLayer = new FailAnimation(DrawableRuleset)
+                failAnimationContainer = new FailAnimationContainer(DrawableRuleset)
                 {
                     OnComplete = onFailComplete,
                     Children = new[]
@@ -310,7 +310,7 @@ namespace osu.Game.Screens.Play
             // add the overlay components as a separate step as they proxy some elements from the above underlay/gameplay components.
             // also give the overlays the ruleset skin provider to allow rulesets to potentially override HUD elements (used to disable combo counters etc.)
             // we may want to limit this in the future to disallow rulesets from outright replacing elements the user expects to be there.
-            failAnimationLayer.Add(createOverlayComponents(Beatmap.Value));
+            failAnimationContainer.Add(createOverlayComponents(Beatmap.Value));
 
             if (!DrawableRuleset.AllowGameplayOverlays)
             {
@@ -587,7 +587,7 @@ namespace osu.Game.Screens.Play
                 // if the fail animation is currently in progress, accelerate it (it will show the pause dialog on completion).
                 if (ValidForResume && GameplayState.HasFailed)
                 {
-                    failAnimationLayer.FinishTransforms(true);
+                    failAnimationContainer.FinishTransforms(true);
                     return;
                 }
 
@@ -888,7 +888,7 @@ namespace osu.Game.Screens.Play
 
         protected FailOverlay FailOverlay { get; private set; }
 
-        private FailAnimation failAnimationLayer;
+        private FailAnimationContainer failAnimationContainer;
 
         private bool onFail()
         {
@@ -913,7 +913,7 @@ namespace osu.Game.Screens.Play
             if (PauseOverlay.State.Value == Visibility.Visible)
                 PauseOverlay.Hide();
 
-            failAnimationLayer.Start();
+            failAnimationContainer.Start();
 
             if (GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
                 Restart(true);
@@ -1044,7 +1044,7 @@ namespace osu.Game.Screens.Play
 
                 b.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
 
-                failAnimationLayer.Background = b;
+                failAnimationContainer.Background = b;
             });
 
             HUDOverlay.IsPlaying.BindTo(localUserPlaying);
@@ -1099,7 +1099,7 @@ namespace osu.Game.Screens.Play
             screenSuspension?.RemoveAndDisposeImmediately();
 
             // Eagerly clean these up as disposal of child components is asynchronous and may leave sounds playing beyond user expectations.
-            failAnimationLayer?.Stop();
+            failAnimationContainer?.Stop();
             PauseOverlay?.StopAllSamples();
 
             if (LoadedBeatmapSuccessfully)

From b2d9c95441fb6679572d036344559fd8657f1946 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 08:17:27 +0900
Subject: [PATCH 1712/2100] Remove HoldNoteTickJudgement

---
 .../Judgements/HoldNoteTickJudgement.cs              | 12 ------------
 .../Skinning/Legacy/LegacyHitExplosion.cs            |  3 ---
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs    |  3 ---
 3 files changed, 18 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs

diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
deleted file mode 100644
index ae9e8bd287..0000000000
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
+++ /dev/null
@@ -1,12 +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.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Mania.Judgements
-{
-    public class HoldNoteTickJudgement : ManiaJudgement
-    {
-        public override HitResult MaxResult => HitResult.LargeTickHit;
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
index 6c56db613c..43489cf325 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
@@ -69,9 +69,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
         public void Animate(JudgementResult result)
         {
-            if (result.Judgement is HoldNoteTickJudgement)
-                return;
-
             (explosion as IFramedAnimation)?.GotoFrame(0);
 
             explosion?.FadeInFromZero(FADE_IN_DURATION)
diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index e0663e9878..223afafeb6 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -150,9 +150,6 @@ namespace osu.Game.Rulesets.Mania.UI
             // scale roughly in-line with visual appearance of notes
             Vector2 scale = new Vector2(1, 0.6f);
 
-            if (result.Judgement is HoldNoteTickJudgement)
-                scale *= 0.5f;
-
             this.ScaleTo(scale);
 
             largeFaint

From 9415fe4446cd586348534bc8ac7f37dde3d6fda7 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 09:47:00 +0900
Subject: [PATCH 1713/2100] Add mania hold note body + combo break judgement

---
 .../Skinning/TestSceneHitExplosion.cs         |   2 +-
 .../Judgements/HoldNoteHoldJudgement.cs       |  13 +++
 .../Objects/Drawables/DrawableHoldNote.cs     |  29 ++---
 .../Objects/Drawables/DrawableHoldNoteBody.cs |  30 +++++
 .../Objects/Drawables/DrawableHoldNoteTail.cs |   4 +-
 osu.Game.Rulesets.Mania/Objects/HeadNote.cs   |   3 +
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   |  12 ++
 .../Objects/HoldNoteBody.cs                   |  15 +++
 osu.Game.Rulesets.Mania/Objects/TailNote.cs   |   3 +
 .../Skinning/Legacy/LegacyBodyPiece.cs        |   3 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          |   1 +
 osu.Game/Rulesets/Judgements/Judgement.cs     |  39 ++++++-
 osu.Game/Rulesets/Scoring/HitResult.cs        | 109 ++++++++++++++++++
 13 files changed, 246 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs
 create mode 100644 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
 create mode 100644 osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
index 483c468c1e..a0833ff91f 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                 {
                     c.Add(hitExplosionPools[poolIndex].Get(e =>
                     {
-                        e.Apply(new JudgementResult(new HitObject(), runCount % 6 == 0 ? new HoldNoteTickJudgement() : new ManiaJudgement()));
+                        e.Apply(new JudgementResult(new HitObject(), new ManiaJudgement()));
 
                         e.Anchor = Anchor.Centre;
                         e.Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs
new file mode 100644
index 0000000000..0dbdd4afe6
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs
@@ -0,0 +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 osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Judgements
+{
+    public class HoldNoteHoldJudgement : ManiaJudgement
+    {
+        public override HitResult MaxResult => HitResult.IgnoreHit;
+        public override HitResult MinResult => HitResult.ComboBreak;
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 3032a3ee39..499f8c99b0 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -35,9 +35,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public DrawableHoldNoteHead Head => headContainer.Child;
         public DrawableHoldNoteTail Tail => tailContainer.Child;
+        public DrawableHoldNoteBody Body => bodyContainer.Child;
 
         private Container<DrawableHoldNoteHead> headContainer;
         private Container<DrawableHoldNoteTail> tailContainer;
+        private Container<DrawableHoldNoteBody> bodyContainer;
 
         private PausableSkinnableSound slidingSample;
 
@@ -58,11 +60,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// </summary>
         public double? HoldStartTime { get; private set; }
 
-        /// <summary>
-        /// Time at which the hold note has been broken, i.e. released too early, resulting in a reduced score.
-        /// </summary>
-        public double? HoldBrokenTime { get; private set; }
-
         /// <summary>
         /// Whether the hold note has been released potentially without having caused a break.
         /// </summary>
@@ -102,6 +99,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                         headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both }
                     }
                 },
+                bodyContainer = new Container<DrawableHoldNoteBody> { RelativeSizeAxes = Axes.Both },
                 bodyPiece = new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.HoldNoteBody), _ => new DefaultBodyPiece
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -133,7 +131,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             sizingContainer.Size = Vector2.One;
             HoldStartTime = null;
-            HoldBrokenTime = null;
             releaseTime = null;
         }
 
@@ -150,6 +147,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 case DrawableHoldNoteTail tail:
                     tailContainer.Child = tail;
                     break;
+
+                case DrawableHoldNoteBody body:
+                    bodyContainer.Child = body;
+                    break;
             }
         }
 
@@ -158,6 +159,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             base.ClearNestedHitObjects();
             headContainer.Clear(false);
             tailContainer.Clear(false);
+            bodyContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
@@ -169,6 +171,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
                 case HeadNote head:
                     return new DrawableHoldNoteHead(head);
+
+                case HoldNoteBody body:
+                    return new DrawableHoldNoteBody(body);
             }
 
             return base.CreateNestedHitObject(hitObject);
@@ -261,8 +266,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                     MissForcefully();
             }
 
-            if (Tail.Judged && !Tail.IsHit)
-                HoldBrokenTime = Time.Current;
+            // Make sure that the hold note is fully judged by giving the body a judgement.
+            if (Tail.AllJudged && !Body.AllJudged)
+                Body.TriggerResult(Tail.IsHit);
         }
 
         public override void MissForcefully()
@@ -325,12 +331,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 return;
 
             Tail.UpdateResult();
+            Body.TriggerResult(Tail.IsHit);
+
             endHold();
-
-            // If the key has been released too early, the user should not receive full score for the release
-            if (!Tail.IsHit)
-                HoldBrokenTime = Time.Current;
-
             releaseTime = Time.Current;
         }
 
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
new file mode 100644
index 0000000000..ded88af145
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.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.
+
+#nullable disable
+
+namespace osu.Game.Rulesets.Mania.Objects.Drawables
+{
+    public partial class DrawableHoldNoteBody : DrawableManiaHitObject<HoldNoteBody>
+    {
+        public bool HasHoldBreak => AllJudged && !IsHit;
+
+        public override bool DisplayResult => false;
+
+        public DrawableHoldNoteBody()
+            : this(null)
+        {
+        }
+
+        public DrawableHoldNoteBody(HoldNoteBody hitObject)
+            : base(hitObject)
+        {
+        }
+
+        internal void TriggerResult(bool hit)
+        {
+            if (!AllJudged)
+                ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index e7326df07d..a559e91f1b 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -55,7 +55,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             ApplyResult(r =>
             {
                 // If the head wasn't hit or the hold note was broken, cap the max score to Meh.
-                if (result > HitResult.Meh && (!HoldNote.Head.IsHit || HoldNote.HoldBrokenTime != null))
+                bool hasComboBreak = !HoldNote.Head.IsHit || HoldNote.Body.HasHoldBreak;
+
+                if (result > HitResult.Meh && hasComboBreak)
                     result = HitResult.Meh;
 
                 r.Type = result;
diff --git a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
index e69cc62aed..a2e89ea560 100644
--- a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
@@ -3,6 +3,9 @@
 
 namespace osu.Game.Rulesets.Mania.Objects
 {
+    /// <summary>
+    /// The head note of a <see cref="HoldNote"/>.
+    /// </summary>
     public class HeadNote : Note
     {
     }
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 333912dd0c..3f930a310b 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -79,6 +79,12 @@ namespace osu.Game.Rulesets.Mania.Objects
         /// </summary>
         public TailNote Tail { get; private set; }
 
+        /// <summary>
+        /// The body of the hold.
+        /// This is an invisible and silent object that tracks the holding state of the <see cref="HoldNote"/>.
+        /// </summary>
+        public HoldNoteBody Body { get; private set; }
+
         public override double MaximumJudgementOffset => Tail.MaximumJudgementOffset;
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
@@ -98,6 +104,12 @@ namespace osu.Game.Rulesets.Mania.Objects
                 Column = Column,
                 Samples = GetNodeSamples((NodeSamples?.Count - 1) ?? 1),
             });
+
+            AddNested(Body = new HoldNoteBody
+            {
+                StartTime = StartTime,
+                Column = Column
+            });
         }
 
         public override Judgement CreateJudgement() => new IgnoreJudgement();
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
new file mode 100644
index 0000000000..ea0643fbb8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.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.Mania.Objects
+{
+    /// <summary>
+    /// The body of a <see cref="HoldNote"/>.
+    /// Mostly a dummy hitobject that provides the judgement for the "holding" state.<br />
+    /// On hit - the hold note was held correctly for the full duration.<br />
+    /// On miss - the hold note was released at some point during its judgement period.
+    /// </summary>
+    public class HoldNoteBody : ManiaHitObject
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/TailNote.cs b/osu.Game.Rulesets.Mania/Objects/TailNote.cs
index 71a594c6ce..def32880f1 100644
--- a/osu.Game.Rulesets.Mania/Objects/TailNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/TailNote.cs
@@ -6,6 +6,9 @@ using osu.Game.Rulesets.Mania.Judgements;
 
 namespace osu.Game.Rulesets.Mania.Objects
 {
+    /// <summary>
+    /// The tail note of a <see cref="HoldNote"/>.
+    /// </summary>
     public class TailNote : Note
     {
         /// <summary>
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index ef4810c40d..bd177d5c7a 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -209,7 +209,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         protected override void Update()
         {
             base.Update();
-            missFadeTime.Value ??= holdNote.HoldBrokenTime;
+
+            missFadeTime.Value = holdNote.Body.HasHoldBreak ? holdNote.Body.Result.TimeAbsolute : null;
 
             int scaleDirection = (direction.Value == ScrollingDirection.Down ? 1 : -1);
 
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 1c4f0462ec..6cd55bb099 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -112,6 +112,7 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);
+            RegisterPool<HoldNoteBody, DrawableHoldNoteBody>(10, 50);
         }
 
         private void onSourceChanged()
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 99dce82ec2..3de1b03583 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -35,7 +35,40 @@ namespace osu.Game.Rulesets.Judgements
         /// <summary>
         /// The minimum <see cref="HitResult"/> that can be achieved - the inverse of <see cref="MaxResult"/>.
         /// </summary>
-        public HitResult MinResult
+        /// <remarks>
+        /// Defaults to a sane value for the given <see cref="MaxResult"/>. May be overridden to provide a supported custom value:
+        /// <list type="table">
+        ///   <listheader>
+        ///     <term>Valid <see cref="MaxResult"/>s</term>
+        ///     <description>Valid <see cref="MinResult"/>s</description>
+        ///   </listheader>
+        /// <item>
+        ///   <term><see cref="HitResult.Perfect"/>, <see cref="HitResult.Great"/>, <see cref="HitResult.Good"/>, <see cref="HitResult.Ok"/>, <see cref="HitResult.Meh"/></term>
+        ///   <description><see cref="HitResult.Miss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        /// </item>
+        /// <item>
+        ///   <term><see cref="HitResult.LargeBonus"/></term>
+        ///   <description><see cref="HitResult.IgnoreMiss"/></description>
+        /// </item>
+        /// <item>
+        ///   <term><see cref="HitResult.SmallBonus"/></term>
+        ///   <description><see cref="HitResult.IgnoreMiss"/></description>
+        /// </item>
+        /// <item>
+        ///   <term><see cref="HitResult.SmallTickHit"/></term>
+        ///   <description><see cref="HitResult.SmallTickMiss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        /// </item>
+        /// <item>
+        ///   <term><see cref="HitResult.LargeTickHit"/></term>
+        ///   <description><see cref="HitResult.LargeTickMiss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        /// </item>
+        /// <item>
+        ///   <term><see cref="HitResult.IgnoreHit"/></term>
+        ///   <description><see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        public virtual HitResult MinResult
         {
             get
             {
@@ -58,6 +91,10 @@ namespace osu.Game.Rulesets.Judgements
             }
         }
 
+        public Judgement()
+        {
+        }
+
         /// <summary>
         /// The numeric score representation for the maximum achievable result.
         /// </summary>
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 0013a9f20d..6303062f03 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -120,6 +120,16 @@ namespace osu.Game.Rulesets.Scoring
         [Order(12)]
         IgnoreHit,
 
+        /// <summary>
+        /// Indicates that a combo break should occur, but does not otherwise affect score.
+        /// </summary>
+        /// <remarks>
+        /// May be paired with <see cref="IgnoreHit"/>.
+        /// </remarks>
+        [EnumMember(Value = "combo_break")]
+        [Order(15)]
+        ComboBreak,
+
         /// <summary>
         /// A special result used as a padding value for legacy rulesets. It is a hit type and affects combo, but does not affect the base score (does not affect accuracy).
         /// </summary>
@@ -291,6 +301,105 @@ namespace osu.Game.Rulesets.Scoring
         /// <param name="result">The <see cref="HitResult"/> to get the index of.</param>
         /// <returns>The index of <paramref name="result"/>.</returns>
         public static int GetIndexForOrderedDisplay(this HitResult result) => order.IndexOf(result);
+
+        public static void ValidateHitResultPair(HitResult maxResult, HitResult minResult)
+        {
+            // Check valid maximum judgements.
+            switch (maxResult)
+            {
+                case HitResult.Meh:
+                case HitResult.Ok:
+                case HitResult.Good:
+                case HitResult.Great:
+                case HitResult.Perfect:
+                case HitResult.SmallTickHit:
+                case HitResult.LargeTickHit:
+                case HitResult.SmallBonus:
+                case HitResult.LargeBonus:
+                case HitResult.IgnoreHit:
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(maxResult), $"{maxResult} is not a valid maximum judgement result.");
+            }
+
+            // Check valid minimum judgements.
+            switch (minResult)
+            {
+                case HitResult.Miss:
+                case HitResult.SmallTickMiss:
+                case HitResult.LargeTickMiss:
+                case HitResult.IgnoreMiss:
+                case HitResult.ComboBreak:
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum judgement result.");
+            }
+
+            // Check valid category pairings.
+            switch (maxResult)
+            {
+                case HitResult.SmallBonus:
+                case HitResult.LargeBonus:
+                    switch (minResult)
+                    {
+                        case HitResult.IgnoreMiss:
+                            break;
+
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.IgnoreMiss} is the only valid minimum result for a {maxResult} judgement.");
+                    }
+
+                    break;
+
+                case HitResult.SmallTickHit:
+                    switch (minResult)
+                    {
+                        case HitResult.SmallTickMiss:
+                        case HitResult.IgnoreMiss:
+                        case HitResult.ComboBreak:
+                            break;
+
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+                    }
+
+                    break;
+
+                case HitResult.LargeTickHit:
+                    switch (minResult)
+                    {
+                        case HitResult.LargeTickMiss:
+                        case HitResult.IgnoreMiss:
+                        case HitResult.ComboBreak:
+                            break;
+
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+                    }
+
+                    break;
+
+                case HitResult.Meh:
+                case HitResult.Ok:
+                case HitResult.Good:
+                case HitResult.Great:
+                case HitResult.Perfect:
+                    switch (minResult)
+                    {
+                        case HitResult.Miss:
+                        case HitResult.IgnoreMiss:
+                        case HitResult.ComboBreak:
+                            break;
+
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+                    }
+
+                    break;
+            }
+        }
     }
 #pragma warning restore CS0618
 }

From 65ac617be4403ffb7775c8ec08c1e00eec3d9633 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 10:45:29 +0900
Subject: [PATCH 1714/2100] Actually validate judgements

---
 osu.Game/Rulesets/Judgements/Judgement.cs       | 4 ----
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 3de1b03583..b9e88dce7a 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -91,10 +91,6 @@ namespace osu.Game.Rulesets.Judgements
             }
         }
 
-        public Judgement()
-        {
-        }
-
         /// <summary>
         /// The numeric score representation for the maximum achievable result.
         /// </summary>
diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index e9f3bcb949..bf6c2bfe28 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -151,6 +151,8 @@ namespace osu.Game.Rulesets.Scoring
             {
                 var judgement = obj.CreateJudgement();
 
+                HitResultExtensions.ValidateHitResultPair(judgement.MaxResult, judgement.MinResult);
+
                 var result = CreateResult(obj, judgement);
                 if (result == null)
                     throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");

From d988ef9b227184e06f6021cce38ac62a3a72f109 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 10:50:39 +0900
Subject: [PATCH 1715/2100] Revert functional change

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index bd177d5c7a..660f72e565 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -210,7 +210,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         {
             base.Update();
 
-            missFadeTime.Value = holdNote.Body.HasHoldBreak ? holdNote.Body.Result.TimeAbsolute : null;
+            if (holdNote.Body.HasHoldBreak)
+                missFadeTime.Value = holdNote.Body.Result.TimeAbsolute;
 
             int scaleDirection = (direction.Value == ScrollingDirection.Down ? 1 : -1);
 

From f0da7f016d74f7002c76e8d8c1b4b208e133a447 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 11:49:54 +0900
Subject: [PATCH 1716/2100] Actually use the judgement

---
 .../{HoldNoteHoldJudgement.cs => HoldNoteBodyJudgement.cs}    | 2 +-
 osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs               | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 rename osu.Game.Rulesets.Mania/Judgements/{HoldNoteHoldJudgement.cs => HoldNoteBodyJudgement.cs} (87%)

diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteBodyJudgement.cs
similarity index 87%
rename from osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs
rename to osu.Game.Rulesets.Mania/Judgements/HoldNoteBodyJudgement.cs
index 0dbdd4afe6..6719665cbe 100644
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteBodyJudgement.cs
@@ -5,7 +5,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Judgements
 {
-    public class HoldNoteHoldJudgement : ManiaJudgement
+    public class HoldNoteBodyJudgement : ManiaJudgement
     {
         public override HitResult MaxResult => HitResult.IgnoreHit;
         public override HitResult MinResult => HitResult.ComboBreak;
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
index ea0643fbb8..92baa25fa9 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
@@ -1,6 +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 osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Judgements;
+
 namespace osu.Game.Rulesets.Mania.Objects
 {
     /// <summary>
@@ -11,5 +14,6 @@ namespace osu.Game.Rulesets.Mania.Objects
     /// </summary>
     public class HoldNoteBody : ManiaHitObject
     {
+        public override Judgement CreateJudgement() => new HoldNoteBodyJudgement();
     }
 }

From 326702165f75cfea9b9eb9f110fb9cdfb2eeba3a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 11:50:17 +0900
Subject: [PATCH 1717/2100] Update HitResult helpers with new judgement

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 51 ++++++++++++++++++++------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 6303062f03..cc528e406f 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -175,6 +175,7 @@ namespace osu.Game.Rulesets.Scoring
                 case HitResult.LargeTickHit:
                 case HitResult.LargeTickMiss:
                 case HitResult.LegacyComboIncrease:
+                case HitResult.ComboBreak:
                     return true;
 
                 default:
@@ -187,11 +188,19 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public static bool AffectsAccuracy(this HitResult result)
         {
-            // LegacyComboIncrease is a special type which is neither a basic, tick, bonus, or accuracy-affecting result.
-            if (result == HitResult.LegacyComboIncrease)
-                return false;
+            switch (result)
+            {
+                // LegacyComboIncrease is a special non-gameplay type which is neither a basic, tick, bonus, or accuracy-affecting result.
+                case HitResult.LegacyComboIncrease:
+                    return false;
 
-            return IsScorable(result) && !IsBonus(result);
+                // ComboBreak is a special type that only affects combo. It cannot be considered as basic, tick, bonus, or accuracy-affecting.
+                case HitResult.ComboBreak:
+                    return false;
+
+                default:
+                    return IsScorable(result) && !IsBonus(result);
+            }
         }
 
         /// <summary>
@@ -199,11 +208,19 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public static bool IsBasic(this HitResult result)
         {
-            // LegacyComboIncrease is a special type which is neither a basic, tick, bonus, or accuracy-affecting result.
-            if (result == HitResult.LegacyComboIncrease)
-                return false;
+            switch (result)
+            {
+                // LegacyComboIncrease is a special non-gameplay type which is neither a basic, tick, bonus, or accuracy-affecting result.
+                case HitResult.LegacyComboIncrease:
+                    return false;
 
-            return IsScorable(result) && !IsTick(result) && !IsBonus(result);
+                // ComboBreak is a special type that only affects combo. It cannot be considered as basic, tick, bonus, or accuracy-affecting.
+                case HitResult.ComboBreak:
+                    return false;
+
+                default:
+                    return IsScorable(result) && !IsTick(result) && !IsBonus(result);
+            }
         }
 
         /// <summary>
@@ -252,6 +269,7 @@ namespace osu.Game.Rulesets.Scoring
                 case HitResult.Miss:
                 case HitResult.SmallTickMiss:
                 case HitResult.LargeTickMiss:
+                case HitResult.ComboBreak:
                     return false;
 
                 default:
@@ -264,11 +282,20 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public static bool IsScorable(this HitResult result)
         {
-            // LegacyComboIncrease is not actually scorable (in terms of usable by rulesets for that purpose), but needs to be defined as such to be correctly included in statistics output.
-            if (result == HitResult.LegacyComboIncrease)
-                return true;
+            switch (result)
+            {
+                // LegacyComboIncrease is not actually scorable (in terms of usable by rulesets for that purpose), but needs to be defined as such to be correctly included in statistics output.
+                case HitResult.LegacyComboIncrease:
+                    return true;
 
-            return result >= HitResult.Miss && result < HitResult.IgnoreMiss;
+                // ComboBreak is its own type that affects score via combo.
+                case HitResult.ComboBreak:
+                    return true;
+
+                default:
+                    // Note that IgnoreHit and IgnoreMiss are excluded as they do not affect score.
+                    return result >= HitResult.Miss && result < HitResult.IgnoreMiss;
+            }
         }
 
         /// <summary>

From b65c70018f08fefbad1db55eae62cfad413b18d5 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 11:58:24 +0900
Subject: [PATCH 1718/2100] Add test for the result

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 52 +++++++++++++++++--
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 17a4c80f7f..ff87b2a833 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
             for (int i = 0; i < 4; i++)
             {
-                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], new TestJudgement(maxResult))
+                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], beatmap.HitObjects[i].CreateJudgement())
                 {
                     Type = i == 2 ? minResult : hitResult
                 };
@@ -259,6 +259,41 @@ namespace osu.Game.Tests.Rulesets.Scoring
         }
 #pragma warning restore CS0618
 
+        [Test]
+        public void TestComboBreak()
+        {
+            Assert.That(HitResult.ComboBreak.IncreasesCombo(), Is.False);
+            Assert.That(HitResult.ComboBreak.BreaksCombo(), Is.True);
+            Assert.That(HitResult.ComboBreak.AffectsCombo(), Is.True);
+            Assert.That(HitResult.ComboBreak.AffectsAccuracy(), Is.False);
+            Assert.That(HitResult.ComboBreak.IsBasic(), Is.False);
+            Assert.That(HitResult.ComboBreak.IsTick(), Is.False);
+            Assert.That(HitResult.ComboBreak.IsBonus(), Is.False);
+            Assert.That(HitResult.ComboBreak.IsHit(), Is.False);
+            Assert.That(HitResult.ComboBreak.IsScorable(), Is.True);
+            Assert.That(HitResultExtensions.ALL_TYPES, Does.Contain(HitResult.ComboBreak));
+
+            beatmap = new TestBeatmap(new RulesetInfo())
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new TestHitObject(HitResult.Great, HitResult.ComboBreak),
+                    new TestHitObject(HitResult.Great, HitResult.ComboBreak),
+                }
+            };
+
+            scoreProcessor = new TestScoreProcessor();
+            scoreProcessor.ApplyBeatmap(beatmap);
+
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], beatmap.HitObjects[0].CreateJudgement()) { Type = HitResult.Great });
+            Assert.That(scoreProcessor.Combo.Value, Is.EqualTo(1));
+            Assert.That(scoreProcessor.Accuracy.Value, Is.EqualTo(1));
+
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[1], beatmap.HitObjects[1].CreateJudgement()) { Type = HitResult.ComboBreak });
+            Assert.That(scoreProcessor.Combo.Value, Is.EqualTo(0));
+            Assert.That(scoreProcessor.Accuracy.Value, Is.EqualTo(1));
+        }
+
         [Test]
         public void TestAccuracyWhenNearPerfect()
         {
@@ -275,7 +310,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
             for (int i = 0; i < beatmap.HitObjects.Count; i++)
             {
-                scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[i], new TestJudgement(HitResult.Great))
+                scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[i], beatmap.HitObjects[i].CreateJudgement())
                 {
                     Type = i == 0 ? HitResult.Miss : HitResult.Great
                 });
@@ -293,24 +328,31 @@ namespace osu.Game.Tests.Rulesets.Scoring
         {
             public override HitResult MaxResult { get; }
 
-            public TestJudgement(HitResult maxResult)
+            public override HitResult MinResult => minResult ?? base.MinResult;
+
+            private readonly HitResult? minResult;
+
+            public TestJudgement(HitResult maxResult, HitResult? minResult = null)
             {
                 MaxResult = maxResult;
+                this.minResult = minResult;
             }
         }
 
         private class TestHitObject : HitObject
         {
             private readonly HitResult maxResult;
+            private readonly HitResult? minResult;
 
             public override Judgement CreateJudgement()
             {
-                return new TestJudgement(maxResult);
+                return new TestJudgement(maxResult, minResult);
             }
 
-            public TestHitObject(HitResult maxResult)
+            public TestHitObject(HitResult maxResult, HitResult? minResult = null)
             {
                 this.maxResult = maxResult;
+                this.minResult = minResult;
             }
         }
 

From 142c61ab9b3ff76feb81baaa06a12e94635d9621 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Oct 2023 12:21:10 +0900
Subject: [PATCH 1719/2100] Move playlist item download button to left

---
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 3fab0fc180..9e07279be2 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -456,6 +456,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         private IEnumerable<Drawable> createButtons() => new[]
         {
+            beatmap == null ? Empty() : new PlaylistDownloadButton(beatmap),
             showResultsButton = new GrayButton(FontAwesome.Solid.ChartPie)
             {
                 Size = new Vector2(30, 30),
@@ -463,7 +464,6 @@ namespace osu.Game.Screens.OnlinePlay
                 Alpha = AllowShowingResults ? 1 : 0,
                 TooltipText = "View results"
             },
-            beatmap == null ? Empty() : new PlaylistDownloadButton(beatmap),
             editButton = new PlaylistEditButton
             {
                 Size = new Vector2(30, 30),

From e874ec81c938a922135275e159e08ab9769a2631 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 12:22:08 +0900
Subject: [PATCH 1720/2100] Remove unused usings

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs | 1 -
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs             | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
index 43489cf325..1ec218644c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index 223afafeb6..e588951624 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;

From ad6f04cfb0030c32797621c896a3eb4a4e65e62a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Oct 2023 04:02:02 +0900
Subject: [PATCH 1721/2100] Hotfix approach circle cutoff

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
index 403a14214e..eea6606233 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private DrawableHitObject drawableObject { get; set; } = null!;
 
         public LegacyApproachCircle()
-            : base("Gameplay/osu/approachcircle", OsuHitObject.OBJECT_DIMENSIONS)
+            : base("Gameplay/osu/approachcircle", OsuHitObject.OBJECT_DIMENSIONS * 2)
         {
         }
 

From 0fb7895a52c8b3fd9cd374e34c603afa4b7396ec Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Sep 2023 23:39:12 +0300
Subject: [PATCH 1722/2100] Adjust catcher origin position to match 1:1 with
 stable

Change catcher origin position logic to 1:1 match stable on legacy skin
---
 .../Skinning/Argon/ArgonCatcher.cs            |  6 ++++-
 .../Skinning/Default/DefaultCatcher.cs        | 11 ++++++++
 .../Skinning/Legacy/LegacyCatcher.cs          | 27 +++++++++++++++++++
 .../UI/SkinnableCatcher.cs                    |  5 ++--
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/Argon/ArgonCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Argon/ArgonCatcher.cs
index 82374085c8..5a788a26fb 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Argon/ArgonCatcher.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Argon/ArgonCatcher.cs
@@ -15,7 +15,11 @@ namespace osu.Game.Rulesets.Catch.Skinning.Argon
         [BackgroundDependencyLoader]
         private void load()
         {
-            RelativeSizeAxes = Axes.Both;
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.Centre;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
 
             InternalChildren = new Drawable[]
             {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs
index 72208b763b..bcd4c73f04 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Catch.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
@@ -22,6 +23,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 
         public DefaultCatcher()
         {
+            Anchor = Anchor.TopCentre;
             RelativeSizeAxes = Axes.Both;
             InternalChild = sprite = new Sprite
             {
@@ -32,6 +34,15 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
             };
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // matches stable's origin position since we're using the same catcher sprite.
+            // see LegacyCatcher for more information.
+            OriginPosition = new Vector2(DrawWidth / 2, 16f);
+        }
+
         [BackgroundDependencyLoader]
         private void load(TextureStore store, Bindable<CatcherAnimationState> currentState)
         {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
new file mode 100644
index 0000000000..cba2c671b0
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
@@ -0,0 +1,27 @@
+// Copyright (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.Rulesets.Catch.Skinning.Legacy
+{
+    public abstract partial class LegacyCatcher : CompositeDrawable
+    {
+        protected LegacyCatcher()
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // stable sets the Y origin position of the catcher to 16px in order for the catching range and OD scaling to align with the top of the catcher's plate in the default skin.
+            OriginPosition = new Vector2(DrawWidth / 2, 16f);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/UI/SkinnableCatcher.cs b/osu.Game.Rulesets.Catch/UI/SkinnableCatcher.cs
index bcc59a5e4f..107b79c88e 100644
--- a/osu.Game.Rulesets.Catch/UI/SkinnableCatcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/SkinnableCatcher.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Skinning.Default;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -26,8 +25,8 @@ namespace osu.Game.Rulesets.Catch.UI
             : base(new CatchSkinComponentLookup(CatchSkinComponents.Catcher), _ => new DefaultCatcher())
         {
             Anchor = Anchor.TopCentre;
-            // Sets the origin roughly to the centre of the catcher's plate to allow for correct scaling.
-            OriginPosition = new Vector2(0.5f, 0.06f) * Catcher.BASE_SIZE;
+            Origin = Anchor.TopCentre;
+            CentreComponent = false;
         }
     }
 }

From fc63ee43be2a75d39f16606e85f53e1135022027 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Sep 2023 23:42:13 +0300
Subject: [PATCH 1723/2100] Fix legacy catcher sprites getting shrunk

---
 .../Skinning/Legacy/LegacyCatcher.cs          |  8 +++++++-
 .../Skinning/Legacy/LegacyCatcherNew.cs       | 19 ++-----------------
 .../Skinning/Legacy/LegacyCatcherOld.cs       | 15 +++------------
 3 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
index cba2c671b0..6cd8b14191 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
@@ -13,7 +13,13 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             Anchor = Anchor.TopCentre;
             Origin = Anchor.TopCentre;
-            RelativeSizeAxes = Axes.Both;
+
+            // in stable, catcher sprites are displayed in their raw size. stable also has catcher sprites displayed with the following scale factors applied:
+            //  1. 0.5x, affecting all sprites in the playfield, computed here based on lazer's catch playfield dimensions (see WIDTH/HEIGHT constants in CatchPlayfield),
+            //           source: https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/GameplayElements/HitObjectManager.cs#L483-L494
+            //  2. 0.7x, a constant scale applied to all catcher sprites on construction.
+            AutoSizeAxes = Axes.Both;
+            Scale = new Vector2(0.5f * 0.7f);
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherNew.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherNew.cs
index f6b2c52498..54d555b22a 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherNew.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherNew.cs
@@ -7,14 +7,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
-    public partial class LegacyCatcherNew : CompositeDrawable
+    public partial class LegacyCatcherNew : LegacyCatcher
     {
         [Resolved]
         private Bindable<CatcherAnimationState> currentState { get; set; } = null!;
@@ -23,25 +21,12 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
         private Drawable currentDrawable = null!;
 
-        public LegacyCatcherNew()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
             foreach (var state in Enum.GetValues<CatcherAnimationState>())
             {
-                AddInternal(drawables[state] = getDrawableFor(state).With(d =>
-                {
-                    d.Anchor = Anchor.TopCentre;
-                    d.Origin = Anchor.TopCentre;
-                    d.RelativeSizeAxes = Axes.Both;
-                    d.Size = Vector2.One;
-                    d.FillMode = FillMode.Fit;
-                    d.Alpha = 0;
-                }));
+                AddInternal(drawables[state] = getDrawableFor(state).With(d => d.Alpha = 0));
             }
 
             currentDrawable = drawables[CatcherAnimationState.Idle];
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherOld.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherOld.cs
index 1e21d8eab1..012200eedf 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherOld.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherOld.cs
@@ -3,30 +3,21 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
-    public partial class LegacyCatcherOld : CompositeDrawable
+    public partial class LegacyCatcherOld : LegacyCatcher
     {
         public LegacyCatcherOld()
         {
-            RelativeSizeAxes = Axes.Both;
+            AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            InternalChild = (skin.GetAnimation(@"fruit-ryuuta", true, true, true) ?? Empty()).With(d =>
-            {
-                d.Anchor = Anchor.TopCentre;
-                d.Origin = Anchor.TopCentre;
-                d.RelativeSizeAxes = Axes.Both;
-                d.Size = Vector2.One;
-                d.FillMode = FillMode.Fit;
-            });
+            InternalChild = skin.GetAnimation(@"fruit-ryuuta", true, true, true) ?? Empty();
         }
     }
 }

From fed0deac02d8cf132fdfad4b08a546ad173414cc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Sep 2023 23:43:43 +0300
Subject: [PATCH 1724/2100] Add brief explaination of `BASE_SIZE`

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index f77dab56c8..c5c9556ed7 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -29,6 +29,13 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// The size of the catcher at 1x scale.
         /// </summary>
+        /// <remarks>
+        /// This is mainly used to compute catching range, the actual catcher size may differ based on skin implementation and sprite textures.
+        /// This is also equivalent to the "catcherWidth" property in osu-stable when the game field and beatmap difficulty are set to default values.
+        /// </remarks>
+        /// <seealso cref="CatchPlayfield.WIDTH"/>
+        /// <seealso cref="CatchPlayfield.HEIGHT"/>
+        /// <seealso cref="IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY"/>
         public const float BASE_SIZE = 106.75f;
 
         /// <summary>

From 693b8d72db961844e2cde901622919127beceee3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 10 Oct 2023 01:23:00 +0300
Subject: [PATCH 1725/2100] Fix test catcher sprites in "special skin"
 incorrectly suffixed as being @2x

---
 ...t-catcher-fail@2x.png => fruit-catcher-fail.png} | Bin
 ...tcher-idle-0@2x.png => fruit-catcher-idle-0.png} | Bin
 ...tcher-idle-1@2x.png => fruit-catcher-idle-1.png} | Bin
 ...tcher-idle-2@2x.png => fruit-catcher-idle-2.png} | Bin
 ...tcher-idle-3@2x.png => fruit-catcher-idle-3.png} | Bin
 ...tcher-idle-4@2x.png => fruit-catcher-idle-4.png} | Bin
 ...tcher-idle-5@2x.png => fruit-catcher-idle-5.png} | Bin
 ...t-catcher-kiai@2x.png => fruit-catcher-kiai.png} | Bin
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-fail@2x.png => fruit-catcher-fail.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-0@2x.png => fruit-catcher-idle-0.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-1@2x.png => fruit-catcher-idle-1.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-2@2x.png => fruit-catcher-idle-2.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-3@2x.png => fruit-catcher-idle-3.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-4@2x.png => fruit-catcher-idle-4.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-5@2x.png => fruit-catcher-idle-5.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-kiai@2x.png => fruit-catcher-kiai.png} (100%)

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png

From b2987caf7cc56248ba6638fc7d9b34708f96c80a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 10 Oct 2023 02:17:43 +0300
Subject: [PATCH 1726/2100] Adjust the catch playfield's position to match 1:1
 with stable

---
 .../UI/CatchPlayfieldAdjustmentContainer.cs         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
index 74cbc665c0..2ba41a38d5 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
@@ -17,12 +17,13 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatchPlayfieldAdjustmentContainer()
         {
-            // because we are using centre anchor/origin, we will need to limit visibility in the future
-            // to ensure tall windows do not get a readability advantage.
-            // it may be possible to bake the catch-specific offsets (-100..340 mentioned below) into new values
-            // which are compatible with TopCentre alignment.
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+
+            // playfields in stable are positioned vertically at three fourths the difference between the playfield height and the window height in stable.
+            // we can match that in lazer by using relative coordinates for Y and considering window height to be 1, and playfield height to be 0.8.
+            RelativePositionAxes = Axes.Y;
+            Y = (1 - playfield_size_adjust) / 4 * 3;
 
             Size = new Vector2(playfield_size_adjust);
 

From 7211c88e83bc1fa1d24c13041be7ea01357db149 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 08:32:35 +0900
Subject: [PATCH 1727/2100] Make combo assertion actually work as expected

---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 5bc477535d..93128c512f 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -200,9 +200,10 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertCombo(1);
+            assertComboAtJudgement(0, 1);
             assertTailJudgement(HitResult.Meh);
-            assertCombo(1);
+            assertComboAtJudgement(1, 0);
+            assertComboAtJudgement(2, 1);
         }
 
         /// <summary>
@@ -521,8 +522,8 @@ namespace osu.Game.Rulesets.Mania.Tests
         private void assertNoteJudgement(HitResult result)
             => AddAssert($"hold note judged as {result}", () => judgementResults.Single(j => j.HitObject is HoldNote).Type, () => Is.EqualTo(result));
 
-        private void assertCombo(int combo)
-            => AddAssert($"combo is {combo}", () => currentPlayer.ScoreProcessor.Combo.Value, () => Is.EqualTo(combo));
+        private void assertComboAtJudgement(int judgementIndex, int combo)
+            => AddAssert($"combo at judgement {judgementIndex} is {combo}", () => judgementResults.ElementAt(judgementIndex).ComboAfterJudgement, () => Is.EqualTo(combo));
 
         private ScoreAccessibleReplayPlayer currentPlayer = null!;
 

From 6073f3e756536d6765cf18a3cc34196bc15d464a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 10 Oct 2023 02:18:21 +0300
Subject: [PATCH 1728/2100] Refactor catch playfield size adjustment logic
 w.r.t. catcher position

---
 .../UI/CatchPlayfieldAdjustmentContainer.cs   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
index 2ba41a38d5..11531011ee 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
@@ -43,18 +43,28 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         private partial class ScalingContainer : Container
         {
+            public ScalingContainer()
+            {
+                Anchor = Anchor.BottomCentre;
+                Origin = Anchor.BottomCentre;
+            }
+
             protected override void Update()
             {
                 base.Update();
 
-                // in stable, fruit fall vertically from -100 to 340.
-                // to emulate this, we want to make our playfield 440 gameplay pixels high.
-                // we then offset it -100 vertically in the position set below.
-                const float stable_v_offset_ratio = 440 / 384f;
+                // in stable, fruit fall vertically from 100 pixels above the playfield top down to the catcher's Y position (i.e. -100 to 340),
+                // see: https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/GameplayElements/HitObjects/Fruits/HitCircleFruits.cs#L65
+                // we already have the playfield positioned similar to stable (see CatchPlayfieldAdjustmentContainer constructor),
+                // so we only need to increase this container's height 100 pixels above the playfield, and offset it to have the bottom at 340 rather than 384.
+                const float stable_fruit_start_position = -100;
+                const float stable_catcher_y_position = 340;
+                const float playfield_v_size_adjustment = (stable_catcher_y_position - stable_fruit_start_position) / CatchPlayfield.HEIGHT;
+                const float playfield_v_catcher_offset = stable_catcher_y_position - CatchPlayfield.HEIGHT;
 
-                Scale = new Vector2(Parent.ChildSize.X / CatchPlayfield.WIDTH);
-                Position = new Vector2(0, -100 * stable_v_offset_ratio + Scale.X);
-                Size = Vector2.Divide(new Vector2(1, stable_v_offset_ratio), Scale);
+                Scale = new Vector2(Parent!.ChildSize.X / CatchPlayfield.WIDTH);
+                Position = new Vector2(0f, playfield_v_catcher_offset * Scale.Y);
+                Size = Vector2.Divide(new Vector2(1, playfield_v_size_adjustment), Scale);
             }
         }
     }

From 594bcc2ab533c610909f1533eb2082c6822e1aef Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 09:56:26 +0900
Subject: [PATCH 1729/2100] Apply suggestion to condense method

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 102 +++----------------------
 1 file changed, 12 insertions(+), 90 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index cc528e406f..c2788b2dd6 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -331,101 +331,23 @@ namespace osu.Game.Rulesets.Scoring
 
         public static void ValidateHitResultPair(HitResult maxResult, HitResult minResult)
         {
-            // Check valid maximum judgements.
-            switch (maxResult)
-            {
-                case HitResult.Meh:
-                case HitResult.Ok:
-                case HitResult.Good:
-                case HitResult.Great:
-                case HitResult.Perfect:
-                case HitResult.SmallTickHit:
-                case HitResult.LargeTickHit:
-                case HitResult.SmallBonus:
-                case HitResult.LargeBonus:
-                case HitResult.IgnoreHit:
-                    break;
+            if (maxResult == HitResult.None || !IsHit(maxResult))
+                throw new ArgumentOutOfRangeException(nameof(maxResult), $"{maxResult} is not a valid maximum judgement result.");
 
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(maxResult), $"{maxResult} is not a valid maximum judgement result.");
-            }
+            if (minResult == HitResult.None || IsHit(minResult))
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum judgement result.");
 
-            // Check valid minimum judgements.
-            switch (minResult)
-            {
-                case HitResult.Miss:
-                case HitResult.SmallTickMiss:
-                case HitResult.LargeTickMiss:
-                case HitResult.IgnoreMiss:
-                case HitResult.ComboBreak:
-                    break;
+            if (maxResult.IsBonus() && minResult != HitResult.IgnoreMiss)
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.IgnoreMiss} is the only valid minimum result for a {maxResult} judgement.");
 
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum judgement result.");
-            }
+            if (maxResult == HitResult.LargeTickHit && minResult is not (HitResult.LargeTickMiss or HitResult.IgnoreMiss or HitResult.ComboBreak))
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
 
-            // Check valid category pairings.
-            switch (maxResult)
-            {
-                case HitResult.SmallBonus:
-                case HitResult.LargeBonus:
-                    switch (minResult)
-                    {
-                        case HitResult.IgnoreMiss:
-                            break;
+            if (maxResult == HitResult.SmallTickHit && minResult is not (HitResult.SmallTickMiss or HitResult.IgnoreMiss or HitResult.ComboBreak))
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
 
-                        default:
-                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.IgnoreMiss} is the only valid minimum result for a {maxResult} judgement.");
-                    }
-
-                    break;
-
-                case HitResult.SmallTickHit:
-                    switch (minResult)
-                    {
-                        case HitResult.SmallTickMiss:
-                        case HitResult.IgnoreMiss:
-                        case HitResult.ComboBreak:
-                            break;
-
-                        default:
-                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
-                    }
-
-                    break;
-
-                case HitResult.LargeTickHit:
-                    switch (minResult)
-                    {
-                        case HitResult.LargeTickMiss:
-                        case HitResult.IgnoreMiss:
-                        case HitResult.ComboBreak:
-                            break;
-
-                        default:
-                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
-                    }
-
-                    break;
-
-                case HitResult.Meh:
-                case HitResult.Ok:
-                case HitResult.Good:
-                case HitResult.Great:
-                case HitResult.Perfect:
-                    switch (minResult)
-                    {
-                        case HitResult.Miss:
-                        case HitResult.IgnoreMiss:
-                        case HitResult.ComboBreak:
-                            break;
-
-                        default:
-                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
-                    }
-
-                    break;
-            }
+            if (maxResult.IsBasic() && minResult is not (HitResult.Miss or HitResult.IgnoreMiss or HitResult.ComboBreak))
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
         }
     }
 #pragma warning restore CS0618

From 89a3be11cbc7b04ecb95f8ac8a476c335a4f1c0f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 09:56:35 +0900
Subject: [PATCH 1730/2100] Add validation test

---
 .../Rulesets/Scoring/HitResultTest.cs         | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs

diff --git a/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs b/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs
new file mode 100644
index 0000000000..68d7335055
--- /dev/null
+++ b/osu.Game.Tests/Rulesets/Scoring/HitResultTest.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;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Tests.Rulesets.Scoring
+{
+    [TestFixture]
+    public class HitResultTest
+    {
+        [TestCase(new[] { HitResult.Perfect, HitResult.Great, HitResult.Good, HitResult.Ok, HitResult.Meh }, new[] { HitResult.Miss })]
+        [TestCase(new[] { HitResult.LargeTickHit }, new[] { HitResult.LargeTickMiss })]
+        [TestCase(new[] { HitResult.SmallTickHit }, new[] { HitResult.SmallTickMiss })]
+        [TestCase(new[] { HitResult.LargeBonus, HitResult.SmallBonus }, new[] { HitResult.IgnoreMiss })]
+        [TestCase(new[] { HitResult.IgnoreHit }, new[] { HitResult.IgnoreMiss, HitResult.ComboBreak })]
+        public void TestValidResultPairs(HitResult[] maxResults, HitResult[] minResults)
+        {
+            HitResult[] unsupportedResults = HitResultExtensions.ALL_TYPES.Where(t => !minResults.Contains(t)).ToArray();
+
+            Assert.Multiple(() =>
+            {
+                foreach (var max in maxResults)
+                {
+                    foreach (var min in minResults)
+                        Assert.DoesNotThrow(() => HitResultExtensions.ValidateHitResultPair(max, min), $"{max} + {min} should be supported.");
+
+                    foreach (var unsupported in unsupportedResults)
+                        Assert.Throws<ArgumentOutOfRangeException>(() => HitResultExtensions.ValidateHitResultPair(max, unsupported), $"{max} + {unsupported} should not be supported.");
+                }
+            });
+        }
+    }
+}

From 04ce223e66d0d169500e35d636149796461f76e1 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 10:03:37 +0900
Subject: [PATCH 1731/2100] Remove pairings that shouldn't be valid

---
 osu.Game/Rulesets/Judgements/Judgement.cs |  6 +++---
 osu.Game/Rulesets/Scoring/HitResult.cs    | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index b9e88dce7a..d0c4c4395d 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Judgements
         ///   </listheader>
         /// <item>
         ///   <term><see cref="HitResult.Perfect"/>, <see cref="HitResult.Great"/>, <see cref="HitResult.Good"/>, <see cref="HitResult.Ok"/>, <see cref="HitResult.Meh"/></term>
-        ///   <description><see cref="HitResult.Miss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        ///   <description><see cref="HitResult.Miss"/></description>
         /// </item>
         /// <item>
         ///   <term><see cref="HitResult.LargeBonus"/></term>
@@ -56,11 +56,11 @@ namespace osu.Game.Rulesets.Judgements
         /// </item>
         /// <item>
         ///   <term><see cref="HitResult.SmallTickHit"/></term>
-        ///   <description><see cref="HitResult.SmallTickMiss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        ///   <description><see cref="HitResult.SmallTickMiss"/></description>
         /// </item>
         /// <item>
         ///   <term><see cref="HitResult.LargeTickHit"/></term>
-        ///   <description><see cref="HitResult.LargeTickMiss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        ///   <description><see cref="HitResult.LargeTickMiss"/></description>
         /// </item>
         /// <item>
         ///   <term><see cref="HitResult.IgnoreHit"/></term>
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index c2788b2dd6..ccd1f49de4 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -337,17 +337,20 @@ namespace osu.Game.Rulesets.Scoring
             if (minResult == HitResult.None || IsHit(minResult))
                 throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum judgement result.");
 
+            if (maxResult == HitResult.IgnoreHit && minResult is not (HitResult.IgnoreMiss or HitResult.ComboBreak))
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+
             if (maxResult.IsBonus() && minResult != HitResult.IgnoreMiss)
                 throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.IgnoreMiss} is the only valid minimum result for a {maxResult} judgement.");
 
-            if (maxResult == HitResult.LargeTickHit && minResult is not (HitResult.LargeTickMiss or HitResult.IgnoreMiss or HitResult.ComboBreak))
-                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+            if (maxResult == HitResult.LargeTickHit && minResult != HitResult.LargeTickMiss)
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.LargeTickMiss} is the only valid minimum result for a {maxResult} judgement.");
 
-            if (maxResult == HitResult.SmallTickHit && minResult is not (HitResult.SmallTickMiss or HitResult.IgnoreMiss or HitResult.ComboBreak))
-                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+            if (maxResult == HitResult.SmallTickHit && minResult != HitResult.SmallTickMiss)
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.SmallTickMiss} is the only valid minimum result for a {maxResult} judgement.");
 
-            if (maxResult.IsBasic() && minResult is not (HitResult.Miss or HitResult.IgnoreMiss or HitResult.ComboBreak))
-                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+            if (maxResult.IsBasic() && minResult != HitResult.Miss)
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.Miss} is the only valid minimum result for a {maxResult} judgement.");
         }
     }
 #pragma warning restore CS0618

From 1a60d6ade5c2a7258dc56f7005d54dd005f004cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 13:35:06 +0900
Subject: [PATCH 1732/2100] Use a `DrawablePool` for mania's beat snap grid

I'm not sure what the cause of the issue is, but I'm also not sure why
it wasn't using `DrawablePool` (was it not around back then?).

Either way, switching to a proper pool fixes things just fine.

Resolves https://github.com/ppy/osu/issues/25009.
---
 .../Edit/ManiaBeatSnapGrid.cs                 | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 9cc84450cc..4d45e16588 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -8,6 +8,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
@@ -23,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Edit
     /// <summary>
     /// A grid which displays coloured beat divisor lines in proximity to the selection or placement cursor.
     /// </summary>
-    public partial class ManiaBeatSnapGrid : Component
+    public partial class ManiaBeatSnapGrid : CompositeComponent
     {
         private const double visible_range = 750;
 
@@ -53,6 +55,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         private readonly List<ScrollingHitObjectContainer> grids = new List<ScrollingHitObjectContainer>();
 
+        private readonly DrawablePool<DrawableGridLine> linesPool = new DrawablePool<DrawableGridLine>(50);
+
         private readonly Cached lineCache = new Cached();
 
         private (double start, double end)? selectionTimeRange;
@@ -60,6 +64,8 @@ namespace osu.Game.Rulesets.Mania.Edit
         [BackgroundDependencyLoader]
         private void load(HitObjectComposer composer)
         {
+            AddInternal(linesPool);
+
             foreach (var stage in ((ManiaPlayfield)composer.Playfield).Stages)
             {
                 foreach (var column in stage.Columns)
@@ -85,17 +91,10 @@ namespace osu.Game.Rulesets.Mania.Edit
             }
         }
 
-        private readonly Stack<DrawableGridLine> availableLines = new Stack<DrawableGridLine>();
-
         private void createLines()
         {
             foreach (var grid in grids)
-            {
-                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
-                    availableLines.Push(line);
-
                 grid.Clear();
-            }
 
             if (selectionTimeRange == null)
                 return;
@@ -131,10 +130,13 @@ namespace osu.Game.Rulesets.Mania.Edit
 
                 foreach (var grid in grids)
                 {
-                    if (!availableLines.TryPop(out var line))
-                        line = new DrawableGridLine();
+                    var line = linesPool.Get();
+
+                    line.Apply(new HitObject
+                    {
+                        StartTime = time
+                    });
 
-                    line.HitObject.StartTime = time;
                     line.Colour = colour;
 
                     grid.Add(line);

From 8e26b3c4051762e9a4c9f4624b0b5babe14145e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:09:33 +0900
Subject: [PATCH 1733/2100] Fix argon health bar not completing flash animation
 correctly

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index aa3b6c1f41..4c63479d3d 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -221,6 +221,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void finishMissDisplay()
         {
+            if (resetMissBarDelegate == null)
+                return;
+
             if (Current.Value > 0)
             {
                 glowBar.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 300, Easing.In);

From aeb579eb54b0371682b5fd2ec5146ed56c2e5ee2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:10:27 +0900
Subject: [PATCH 1734/2100] Syncrhonise initial colour of `glowBar` for sanity

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 4c63479d3d..2a42023f83 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -15,7 +15,6 @@ using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -114,7 +113,7 @@ namespace osu.Game.Screens.Play.HUD
                     glowBar = new BarPath
                     {
                         BarColour = Color4.White,
-                        GlowColour = OsuColour.Gray(0.5f),
+                        GlowColour = main_bar_glow_colour,
                         Blending = BlendingParameters.Additive,
                         Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
                         PathRadius = 40f,

From 6ee958743e29bf5ad59f355a20f512fe116e6319 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:10:42 +0900
Subject: [PATCH 1735/2100] Adjust glow animation specifics slightly

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 2a42023f83..a3a35999fa 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -181,12 +181,13 @@ namespace osu.Game.Screens.Play.HUD
 
             if (resetMissBarDelegate == null)
             {
-                glowBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
+                glowBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 30, Easing.OutQuint)
                        .Then()
-                       .TransformTo(nameof(BarPath.BarColour), main_bar_colour, 800, Easing.OutQuint);
+                       .TransformTo(nameof(BarPath.BarColour), main_bar_colour, 1000, Easing.OutQuint);
 
-                glowBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
-                       .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 800, Easing.OutQuint);
+                glowBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 30, Easing.OutQuint)
+                       .Then()
+                       .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
             }
         }
 

From 57f588fa8697841524c070567659c8dece6817c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:23:50 +0900
Subject: [PATCH 1736/2100] Ensure health displays don't pile up transforms
 when off-screen

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs  | 15 +++++++++------
 .../Screens/Play/HUD/DefaultHealthDisplay.cs     | 16 +++++++---------
 osu.Game/Screens/Play/HUD/HealthDisplay.cs       |  8 +++++---
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index aa3b6c1f41..b6e2f494d1 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -142,14 +142,17 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(v =>
             {
-                if (v.NewValue >= GlowBarValue)
-                    finishMissDisplay();
+                Scheduler.AddOnce(() =>
+                {
+                    if (v.NewValue >= GlowBarValue)
+                        finishMissDisplay();
 
-                double time = v.NewValue > GlowBarValue ? 500 : 250;
+                    double time = v.NewValue > GlowBarValue ? 500 : 250;
 
-                this.TransformTo(nameof(HealthBarValue), v.NewValue, time, Easing.OutQuint);
-                if (resetMissBarDelegate == null)
-                    this.TransformTo(nameof(GlowBarValue), v.NewValue, time, Easing.OutQuint);
+                    this.TransformTo(nameof(HealthBarValue), v.NewValue, time, Easing.OutQuint);
+                    if (resetMissBarDelegate == null)
+                        this.TransformTo(nameof(GlowBarValue), v.NewValue, time, Easing.OutQuint);
+                });
             }, true);
 
             BarLength.BindValueChanged(l => Width = l.NewValue, true);
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index c4d04c5580..0d3bd8d46f 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -112,6 +112,13 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
+        protected override void Flash(JudgementResult result)
+        {
+            fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, Easing.OutQuint)
+                .Delay(glow_fade_delay)
+                .FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, Easing.OutQuint);
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -119,15 +126,6 @@ namespace osu.Game.Screens.Play.HUD
             GlowColour = colours.BlueDarker;
         }
 
-        protected override void Flash(JudgementResult result) => Scheduler.AddOnce(flash);
-
-        private void flash()
-        {
-            fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, Easing.OutQuint)
-                .Delay(glow_fade_delay)
-                .FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, Easing.OutQuint);
-        }
-
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 986efe3036..e297ffc411 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Screens.Play.HUD
 
         /// <summary>
         /// Triggered when a <see cref="Judgement"/> is a successful hit, signaling the health display to perform a flash animation (if designed to do so).
+        /// Calls to this method are debounced.
         /// </summary>
         /// <param name="result">The judgement result.</param>
         protected virtual void Flash(JudgementResult result)
@@ -47,6 +48,7 @@ namespace osu.Game.Screens.Play.HUD
 
         /// <summary>
         /// Triggered when a <see cref="Judgement"/> resulted in the player losing health.
+        /// Calls to this method are debounced.
         /// </summary>
         /// <param name="result">The judgement result.</param>
         protected virtual void Miss(JudgementResult result)
@@ -92,7 +94,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 double newValue = Current.Value + 0.05f;
                 this.TransformBindableTo(Current, newValue, increase_delay);
-                Flash(new JudgementResult(new HitObject(), new Judgement()));
+                Scheduler.AddOnce(Flash, new JudgementResult(new HitObject(), new Judgement()));
 
                 if (newValue >= 1)
                     finishInitialAnimation();
@@ -115,9 +117,9 @@ namespace osu.Game.Screens.Play.HUD
         private void onNewJudgement(JudgementResult judgement)
         {
             if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
-                Flash(judgement);
+                Scheduler.AddOnce(Flash, judgement);
             else if (judgement.Judgement.HealthIncreaseFor(judgement) < 0)
-                Miss(judgement);
+                Scheduler.AddOnce(Miss, judgement);
         }
 
         protected override void Dispose(bool isDisposing)

From 6c346874d3f191c34651943dd3fda84bc3dd2866 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:24:03 +0900
Subject: [PATCH 1737/2100] Add TODO mentioning that `ArgonHealthDisplay` is
 doing lerp wrong

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index b6e2f494d1..3c29d068e6 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -149,6 +149,7 @@ namespace osu.Game.Screens.Play.HUD
 
                     double time = v.NewValue > GlowBarValue ? 500 : 250;
 
+                    // TODO: this should probably use interpolation in update.
                     this.TransformTo(nameof(HealthBarValue), v.NewValue, time, Easing.OutQuint);
                     if (resetMissBarDelegate == null)
                         this.TransformTo(nameof(GlowBarValue), v.NewValue, time, Easing.OutQuint);

From 1eb6c93916d015524dad238672492470a2c7c94f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:45:35 +0900
Subject: [PATCH 1738/2100] Also debounce `updatePathVertices` to reduce
 overhead

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 3c29d068e6..9c7c0684b3 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Play.HUD
                     return;
 
                 glowBarValue = value;
-                updatePathVertices();
+                Scheduler.AddOnce(updatePathVertices);
             }
         }
 
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.Play.HUD
                     return;
 
                 healthBarValue = value;
-                updatePathVertices();
+                Scheduler.AddOnce(updatePathVertices);
             }
         }
 

From 7e68b6452632f48f3a1656633df977f88a069972 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:59:48 +0900
Subject: [PATCH 1739/2100] Avoid running `finishInitialAnimation` when already
 finished

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index e297ffc411..212a223e22 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -103,6 +103,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void finishInitialAnimation()
         {
+            if (initialIncrease == null)
+                return;
+
             initialIncrease?.Cancel();
             initialIncrease = null;
 

From 4674f6365541e6f9a8c289389fc01cc4903f1212 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 16:17:34 +0900
Subject: [PATCH 1740/2100] Fix `Scheduler.AddOnce` not working in one location

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 9c7c0684b3..bc095838ab 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -142,18 +142,8 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(v =>
             {
-                Scheduler.AddOnce(() =>
-                {
-                    if (v.NewValue >= GlowBarValue)
-                        finishMissDisplay();
-
-                    double time = v.NewValue > GlowBarValue ? 500 : 250;
-
-                    // TODO: this should probably use interpolation in update.
-                    this.TransformTo(nameof(HealthBarValue), v.NewValue, time, Easing.OutQuint);
-                    if (resetMissBarDelegate == null)
-                        this.TransformTo(nameof(GlowBarValue), v.NewValue, time, Easing.OutQuint);
-                });
+                // For some reason making the delegate inline here doesn't work correctly.
+                Scheduler.AddOnce(updateCurrent);
             }, true);
 
             BarLength.BindValueChanged(l => Width = l.NewValue, true);
@@ -169,6 +159,17 @@ namespace osu.Game.Screens.Play.HUD
             return base.OnInvalidate(invalidation, source);
         }
 
+        private void updateCurrent()
+        {
+            if (Current.Value >= GlowBarValue) finishMissDisplay();
+
+            double time = Current.Value > GlowBarValue ? 500 : 250;
+
+            // TODO: this should probably use interpolation in update.
+            this.TransformTo(nameof(HealthBarValue), Current.Value, time, Easing.OutQuint);
+            if (resetMissBarDelegate == null) this.TransformTo(nameof(GlowBarValue), Current.Value, time, Easing.OutQuint);
+        }
+
         protected override void Update()
         {
             base.Update();

From 08b1a3cbe28f51e05ef75d14a65037e3f98fa858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Oct 2023 09:18:57 +0200
Subject: [PATCH 1741/2100] Add failing test case for guest user being looked
 up in API

---
 .../TestScenePlayerLocalScoreImport.cs        | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 6a7fab86d6..8e21c3ea9f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -15,6 +15,9 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -26,6 +29,7 @@ using osu.Game.Screens;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Resources;
+using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -150,6 +154,40 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
         }
 
+        [Test]
+        public void TestGuestScoreIsStoredAsGuest()
+        {
+            AddStep("set up API", () => ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case GetUserRequest userRequest:
+                        userRequest.TriggerSuccess(new APIUser
+                        {
+                            Username = "Guest",
+                            CountryCode = CountryCode.JP,
+                            Id = 1234
+                        });
+                        return true;
+
+                    default:
+                        return false;
+                }
+            });
+
+            AddStep("log out", () => API.Logout());
+            CreateTest();
+
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
+            AddStep("log back in", () => API.Login("username", "password"));
+
+            AddStep("seek to completion", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
+
+            AddUntilStep("results displayed", () => Player.GetChildScreen() is ResultsScreen);
+            AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
+            AddAssert("score is not associated with online user", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID))!.UserID == APIUser.SYSTEM_USER_ID);
+        }
+
         [Test]
         public void TestReplayExport()
         {

From 24956588e906af6aa39d1f79e95870908f359a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Oct 2023 09:28:01 +0200
Subject: [PATCH 1742/2100] Fix score importer looking up guest user by
 username online

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

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 886fb1379c..7473d887c3 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -190,6 +190,9 @@ namespace osu.Game.Scoring
         /// </summary>
         private void populateUserDetails(ScoreInfo model)
         {
+            if (model.RealmUser.OnlineID == APIUser.SYSTEM_USER_ID)
+                return;
+
             string username = model.RealmUser.Username;
 
             if (usernameLookupCache.TryGetValue(username, out var existing))

From ea400a9db770fd93bc5ff3cab43ab8f7e82722f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Oct 2023 09:30:51 +0200
Subject: [PATCH 1743/2100] Fix cross-test interference

`TestLastPlayedUpdated` was implicitly relying on running first.
`TestGuestScoreIsStoredAsGuest` showing up changed test ordering,
causing the former test to fail if it didn't get to run first.
---
 .../Visual/Gameplay/TestScenePlayerLocalScoreImport.cs           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 8e21c3ea9f..1254aa0639 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -102,6 +102,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             DateTimeOffset? getLastPlayed() => Realm.Run(r => r.Find<BeatmapInfo>(Beatmap.Value.BeatmapInfo.ID)?.LastPlayed);
 
+            AddStep("reset last played", () => Realm.Write(r => r.Find<BeatmapInfo>(Beatmap.Value.BeatmapInfo.ID)!.LastPlayed = null));
             AddAssert("last played is null", () => getLastPlayed() == null);
 
             CreateTest();

From 94192644be4f865ad5fb90d1c28de54ced3536d1 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 16:51:24 +0900
Subject: [PATCH 1744/2100] Fix tests

---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index ff87b2a833..92e94bd02d 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
             for (int i = 0; i < 4; i++)
             {
-                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], beatmap.HitObjects[i].CreateJudgement())
+                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], fourObjectBeatmap.HitObjects[i].CreateJudgement())
                 {
                     Type = i == 2 ? minResult : hitResult
                 };
@@ -277,8 +277,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
             {
                 HitObjects = new List<HitObject>
                 {
-                    new TestHitObject(HitResult.Great, HitResult.ComboBreak),
-                    new TestHitObject(HitResult.Great, HitResult.ComboBreak),
+                    new TestHitObject(HitResult.Great),
+                    new TestHitObject(HitResult.IgnoreHit, HitResult.ComboBreak),
                 }
             };
 

From 8dc9453d8dd5886e2a92175e9948c9a174a90f32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 16:59:18 +0900
Subject: [PATCH 1745/2100] Apply some xmldoc and structural changes

---
 .../Objects/Drawables/DrawableHoldNote.cs     | 21 +++++++++++--------
 .../Objects/Drawables/DrawableHoldNoteBody.cs |  5 +++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 499f8c99b0..86920927dc 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         public double? HoldStartTime { get; private set; }
 
         /// <summary>
-        /// Whether the hold note has been released potentially without having caused a break.
+        /// Used to decide whether to visually clamp the hold note to the judgement line.
         /// </summary>
         private double? releaseTime;
 
@@ -322,19 +322,22 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (e.Action != Action.Value)
                 return;
 
-            // Make sure a hold was started
-            if (HoldStartTime == null)
-                return;
-
             // do not run any of this logic when rewinding, as it inverts order of presses/releases.
             if ((Clock as IGameplayClock)?.IsRewinding == true)
                 return;
 
-            Tail.UpdateResult();
-            Body.TriggerResult(Tail.IsHit);
+            // When our action is released and we are in the middle of a hold, there's a chance that
+            // the user has released too early (before the tail).
+            //
+            // In such a case, we want to record this against the DrawableHoldNoteBody.
+            if (HoldStartTime != null)
+            {
+                Tail.UpdateResult();
+                Body.TriggerResult(Tail.IsHit);
 
-            endHold();
-            releaseTime = Time.Current;
+                endHold();
+                releaseTime = Time.Current;
+            }
         }
 
         private void endHold()
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
index ded88af145..1b2efbafdf 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
@@ -23,8 +23,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         internal void TriggerResult(bool hit)
         {
-            if (!AllJudged)
-                ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            if (AllJudged) return;
+
+            ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
     }
 }

From 18d20cad8b896b8910ab4000b6f667e6e6344068 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 17:04:21 +0900
Subject: [PATCH 1746/2100] Adjust xmldoc for readability

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Rulesets/Judgements/Judgement.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index d0c4c4395d..f60b3a6c02 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Judgements
         /// Defaults to a sane value for the given <see cref="MaxResult"/>. May be overridden to provide a supported custom value:
         /// <list type="table">
         ///   <listheader>
-        ///     <term>Valid <see cref="MaxResult"/>s</term>
+        ///     <term><see cref="MaxResult"/>s</term>
         ///     <description>Valid <see cref="MinResult"/>s</description>
         ///   </listheader>
         /// <item>

From 4319b22db825fd39f99862642d42a6bc213821d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 17:55:35 +0900
Subject: [PATCH 1747/2100] Add failing test coverage of player not pausing
 track correctly

---
 .../Multiplayer/TestSceneMultiplayerPlayer.cs       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
index 45c5c67fff..cbeff770c9 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
@@ -11,6 +11,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -28,6 +29,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
             });
 
+            AddStep("Start track playing", () =>
+            {
+                Beatmap.Value.Track.Start();
+            });
+
             AddStep("initialise gameplay", () =>
             {
                 Stack.Push(player = new MultiplayerPlayer(MultiplayerClient.ServerAPIRoom, new PlaylistItem(Beatmap.Value.BeatmapInfo)
@@ -37,7 +43,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
 
             AddUntilStep("wait for player to be current", () => player.IsCurrentScreen() && player.IsLoaded);
+
+            AddAssert("gameplay clock is paused", () => player.ChildrenOfType<GameplayClockContainer>().Single().IsPaused.Value);
+            AddAssert("gameplay clock is not running", () => !player.ChildrenOfType<GameplayClockContainer>().Single().IsRunning);
+
             AddStep("start gameplay", () => ((IMultiplayerClient)MultiplayerClient).GameplayStarted());
+
+            AddUntilStep("gameplay clock is not paused", () => !player.ChildrenOfType<GameplayClockContainer>().Single().IsPaused.Value);
+            AddAssert("gameplay clock is running", () => player.ChildrenOfType<GameplayClockContainer>().Single().IsRunning);
         }
 
         [Test]

From eee7dc02da9611c00ac3d6bc16343507b11728a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 17:58:11 +0900
Subject: [PATCH 1748/2100] Reduce severity of clock running check to avoid
 production crashes

---
 osu.Game/Screens/Play/Player.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ac9ce11cb5..91131b0aba 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1078,7 +1078,7 @@ namespace osu.Game.Screens.Play
         protected virtual void StartGameplay()
         {
             if (GameplayClockContainer.IsRunning)
-                throw new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running");
+                Logger.Error(new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running"), "Clock failure");
 
             GameplayClockContainer.Reset(startClock: true);
 

From 100c0cf5331ad7806424acfb7d1e3371c39553c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 17:58:37 +0900
Subject: [PATCH 1749/2100] Fix `MultiplayerPlayer` never calling `Reset` on
 `GameplayClockContainer`

This call is responsible for ensuring the clock is in a stopped state.
---
 osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 7b448e4b5c..e6d9dd4cd0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -148,6 +148,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 loadingDisplay.Show();
                 client.ChangeState(MultiplayerUserState.ReadyForGameplay);
             }
+
+            // This will pause the clock, pending the gameplay started callback from the server.
+            GameplayClockContainer.Reset();
         }
 
         private void failAndBail(string message = null)

From f0bd97539379ad11f54dbdf354f0adca7565044a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 18:16:12 +0900
Subject: [PATCH 1750/2100] Change `GameplayClockContainer.Reset` to directly
 call `GameplayClock.Stop`

The reasoning is explained in the inline comment, but basically this was
getting blocked by `isPaused` being in an initial `true` state (as it is
on construction), while the source clock was still `IsRunning`.

There's no real guarantee of sync between the source and the `isPaused`
bindable right now. Maybe there should be in the future, but to restore
sanity, let's ensure that a call to `Reset` can at least stop the track
as we expect.
---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index e6a38a9946..3c920babee 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -138,12 +138,15 @@ namespace osu.Game.Screens.Play
         /// Resets this <see cref="GameplayClockContainer"/> and the source to an initial state ready for gameplay.
         /// </summary>
         /// <param name="time">The time to seek to on resetting. If <c>null</c>, the existing <see cref="StartTime"/> will be used.</param>
-        /// <param name="startClock">Whether to start the clock immediately, if not already started.</param>
+        /// <param name="startClock">Whether to start the clock immediately. If <c>false</c>, the clock will remain stopped after this call.</param>
         public void Reset(double? time = null, bool startClock = false)
         {
             bool wasPaused = isPaused.Value;
 
-            Stop();
+            // The intention of the Reset method is to get things into a known sane state.
+            // As such, we intentionally stop the underlying clock directly here, bypassing Stop/StopGameplayClock.
+            // This is to avoid any kind of isPaused state checks and frequency ramping (as provided by MasterGameplayClockContainer).
+            GameplayClock.Stop();
 
             if (time != null)
                 StartTime = time.Value;

From 97e521acad28cdbcc7db526623038ebb1e6ea4a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 18:47:20 +0900
Subject: [PATCH 1751/2100] Reduce black fill of song bar

Closes https://github.com/ppy/osu/issues/24993.
---
 osu.Game.Tournament/Components/SongBar.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index cde826628e..cc1d00f62f 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -84,6 +84,7 @@ namespace osu.Game.Tournament.Components
                 {
                     Colour = colours.Gray3,
                     RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.4f,
                 },
                 flow = new FillFlowContainer
                 {

From 7220ca34f7dfc6f8e1eda76975712f02fe621322 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 19:05:01 +0900
Subject: [PATCH 1752/2100] Add failing test coverage of incorrect default
 preview time

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 28 ++++++++++++++++---
 .../Resources/beatmap-version-4.osu           |  4 +++
 ...tmap-version.osu => beatmap-version-6.osu} |  0
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/beatmap-version-4.osu
 rename osu.Game.Tests/Resources/{beatmap-version.osu => beatmap-version-6.osu} (100%)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 3d2de2914a..fec7f86eb2 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         [Test]
         public void TestDecodeBeatmapVersion()
         {
-            using (var resStream = TestResources.OpenResource("beatmap-version.osu"))
+            using (var resStream = TestResources.OpenResource("beatmap-version-6.osu"))
             using (var stream = new LineBufferedReader(resStream))
             {
                 var decoder = Decoder.GetDecoder<Beatmap>(stream);
@@ -45,6 +45,25 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestPreviewPointWithOffsets(bool applyOffsets)
+        {
+            using (var resStream = TestResources.OpenResource("beatmap-version-4.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var decoder = Decoder.GetDecoder<Beatmap>(stream);
+                ((LegacyBeatmapDecoder)decoder).ApplyOffsets = applyOffsets;
+                var working = new TestWorkingBeatmap(decoder.Decode(stream));
+
+                Assert.AreEqual(4, working.BeatmapInfo.BeatmapVersion);
+                Assert.AreEqual(4, working.Beatmap.BeatmapInfo.BeatmapVersion);
+                Assert.AreEqual(4, working.GetPlayableBeatmap(new OsuRuleset().RulesetInfo, Array.Empty<Mod>()).BeatmapInfo.BeatmapVersion);
+
+                Assert.AreEqual(-1, working.BeatmapInfo.Metadata.PreviewTime);
+            }
+        }
+
         [Test]
         public void TestDecodeBeatmapGeneral()
         {
@@ -915,10 +934,11 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        [Test]
-        public void TestLegacyDefaultsPreserved()
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestLegacyDefaultsPreserved(bool applyOffsets)
         {
-            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = applyOffsets };
 
             using (var memoryStream = new MemoryStream())
             using (var stream = new LineBufferedReader(memoryStream))
diff --git a/osu.Game.Tests/Resources/beatmap-version-4.osu b/osu.Game.Tests/Resources/beatmap-version-4.osu
new file mode 100644
index 0000000000..bba4ed46f1
--- /dev/null
+++ b/osu.Game.Tests/Resources/beatmap-version-4.osu
@@ -0,0 +1,4 @@
+osu file format v4
+
+[General]
+PreviewTime: -1
diff --git a/osu.Game.Tests/Resources/beatmap-version.osu b/osu.Game.Tests/Resources/beatmap-version-6.osu
similarity index 100%
rename from osu.Game.Tests/Resources/beatmap-version.osu
rename to osu.Game.Tests/Resources/beatmap-version-6.osu

From 27818461470c4892a3c5f9e916beffd5929521b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 19:02:04 +0900
Subject: [PATCH 1753/2100] Fix beatmaps with no preview point set getting
 incorrect default

Note that this will require a re-import to fix existing beatmaps
becuse.. it's stored to realm. Probably not worth worrying about for
now.
---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 37aa7950d3..8559ecfe69 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -196,7 +196,8 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case @"PreviewTime":
-                    metadata.PreviewTime = getOffsetTime(Parsing.ParseInt(pair.Value));
+                    int time = Parsing.ParseInt(pair.Value);
+                    metadata.PreviewTime = time == -1 ? time : getOffsetTime(time);
                     break;
 
                 case @"SampleSet":

From a1a46e58fc09d8066d33ebbe98337fe1a33c3b16 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 21:42:37 +0900
Subject: [PATCH 1754/2100] Move validation to DHO.ApplyResult()

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 ++
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs          | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e31656e0ff..3bb0e3dfb8 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -672,6 +672,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (!Result.HasResult)
                 throw new InvalidOperationException($"{GetType().ReadableName()} applied a {nameof(JudgementResult)} but did not update {nameof(JudgementResult.Type)}.");
 
+            HitResultExtensions.ValidateHitResultPair(Result.Judgement.MaxResult, Result.Judgement.MinResult);
+
             if (!Result.Type.IsValidHitResult(Result.Judgement.MinResult, Result.Judgement.MaxResult))
             {
                 throw new InvalidOperationException(
diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index bf6c2bfe28..e9f3bcb949 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -151,8 +151,6 @@ namespace osu.Game.Rulesets.Scoring
             {
                 var judgement = obj.CreateJudgement();
 
-                HitResultExtensions.ValidateHitResultPair(judgement.MaxResult, judgement.MinResult);
-
                 var result = CreateResult(obj, judgement);
                 if (result == null)
                     throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");

From 682aa06acf1928bbf08171d6edbf510a1c8d6fc8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 22:10:44 +0900
Subject: [PATCH 1755/2100] Remove `JudgementResult` from `Miss`/`Flash` as it
 is not used

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs   |  9 ++++-----
 osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs |  3 +--
 osu.Game/Screens/Play/HUD/HealthDisplay.cs        | 13 +++++--------
 osu.Game/Skinning/LegacyHealthDisplay.cs          |  7 +++----
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index bc095838ab..d101a8fd64 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -16,7 +16,6 @@ using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
@@ -178,9 +177,9 @@ namespace osu.Game.Screens.Play.HUD
             glowBar.Alpha = (float)Interpolation.DampContinuously(glowBar.Alpha, GlowBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
         }
 
-        protected override void Flash(JudgementResult result)
+        protected override void Flash()
         {
-            base.Flash(result);
+            base.Flash();
 
             mainBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour.Opacity(0.8f))
                    .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
@@ -196,9 +195,9 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        protected override void Miss(JudgementResult result)
+        protected override void Miss()
         {
-            base.Miss(result);
+            base.Miss();
 
             if (resetMissBarDelegate != null)
             {
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index 0d3bd8d46f..f531b1c609 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Judgements;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -112,7 +111,7 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
-        protected override void Flash(JudgementResult result)
+        protected override void Flash()
         {
             fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, Easing.OutQuint)
                 .Delay(glow_fade_delay)
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 212a223e22..2f96233939 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
@@ -41,8 +40,7 @@ namespace osu.Game.Screens.Play.HUD
         /// Triggered when a <see cref="Judgement"/> is a successful hit, signaling the health display to perform a flash animation (if designed to do so).
         /// Calls to this method are debounced.
         /// </summary>
-        /// <param name="result">The judgement result.</param>
-        protected virtual void Flash(JudgementResult result)
+        protected virtual void Flash()
         {
         }
 
@@ -50,8 +48,7 @@ namespace osu.Game.Screens.Play.HUD
         /// Triggered when a <see cref="Judgement"/> resulted in the player losing health.
         /// Calls to this method are debounced.
         /// </summary>
-        /// <param name="result">The judgement result.</param>
-        protected virtual void Miss(JudgementResult result)
+        protected virtual void Miss()
         {
         }
 
@@ -94,7 +91,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 double newValue = Current.Value + 0.05f;
                 this.TransformBindableTo(Current, newValue, increase_delay);
-                Scheduler.AddOnce(Flash, new JudgementResult(new HitObject(), new Judgement()));
+                Scheduler.AddOnce(Flash);
 
                 if (newValue >= 1)
                     finishInitialAnimation();
@@ -120,9 +117,9 @@ namespace osu.Game.Screens.Play.HUD
         private void onNewJudgement(JudgementResult judgement)
         {
             if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
-                Scheduler.AddOnce(Flash, judgement);
+                Scheduler.AddOnce(Flash);
             else if (judgement.Judgement.HealthIncreaseFor(judgement) < 0)
-                Scheduler.AddOnce(Miss, judgement);
+                Scheduler.AddOnce(Miss);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 08add79fc1..845fc77394 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Utils;
 using osuTK;
@@ -80,7 +79,7 @@ namespace osu.Game.Skinning
             marker.Position = fill.Position + new Vector2(fill.DrawWidth, isNewStyle ? fill.DrawHeight / 2 : 0);
         }
 
-        protected override void Flash(JudgementResult result) => marker.Flash(result);
+        protected override void Flash() => marker.Flash();
 
         private static Texture getTexture(ISkin skin, string name) => skin?.GetTexture($"scorebar-{name}");
 
@@ -238,7 +237,7 @@ namespace osu.Game.Skinning
                 });
             }
 
-            public override void Flash(JudgementResult result)
+            public override void Flash()
             {
                 bulgeMain();
 
@@ -257,7 +256,7 @@ namespace osu.Game.Skinning
         {
             public Bindable<double> Current { get; } = new Bindable<double>();
 
-            public virtual void Flash(JudgementResult result)
+            public virtual void Flash()
             {
             }
         }

From e2e28ef0ca07908b8430ed8c2ddd31fdf308e80d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 22:12:20 +0900
Subject: [PATCH 1756/2100] Remove comment regarding inlined delegate

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index d101a8fd64..9643eb8b48 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -139,11 +139,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            Current.BindValueChanged(v =>
-            {
-                // For some reason making the delegate inline here doesn't work correctly.
-                Scheduler.AddOnce(updateCurrent);
-            }, true);
+            Current.BindValueChanged(_ => Scheduler.AddOnce(updateCurrent), true);
 
             BarLength.BindValueChanged(l => Width = l.NewValue, true);
             BarHeight.BindValueChanged(_ => updatePath());

From b9dadc52b7c571f4e77e4295b83df69384803ae9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 22:54:19 +0900
Subject: [PATCH 1757/2100] Adjust comment to match current behaviour
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/Play/GameplayClockContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 3c920babee..5a713fdae7 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -138,7 +138,8 @@ namespace osu.Game.Screens.Play
         /// Resets this <see cref="GameplayClockContainer"/> and the source to an initial state ready for gameplay.
         /// </summary>
         /// <param name="time">The time to seek to on resetting. If <c>null</c>, the existing <see cref="StartTime"/> will be used.</param>
-        /// <param name="startClock">Whether to start the clock immediately. If <c>false</c>, the clock will remain stopped after this call.</param>
+        /// <param name="startClock">Whether to start the clock immediately. If <c>false</c> and the clock was already paused, the clock will remain paused after this call.
+        /// </param>
         public void Reset(double? time = null, bool startClock = false)
         {
             bool wasPaused = isPaused.Value;

From 1acc02405e9cda5f4d419451ab754b05be86f498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:18:48 +0200
Subject: [PATCH 1758/2100] Reorder `KeyBindingRow` members

---
 .../Settings/Sections/Input/KeyBindingRow.cs  | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 1e2283b58b..8fcf519a2e 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -39,14 +39,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// </summary>
         public Action<KeyBindingRow> BindingUpdated { get; set; }
 
-        private readonly object action;
-        private readonly IEnumerable<RealmKeyBinding> bindings;
+        public bool AllowMainMouseButtons;
 
-        private const float transition_time = 150;
+        public IEnumerable<KeyCombination> Defaults;
 
-        private const float height = 20;
-
-        private const float padding = 5;
+        #region IFilterable
 
         private bool matchingFilter;
 
@@ -60,23 +57,39 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }
         }
 
-        private Container content;
-
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            content.ReceivePositionalInputAt(screenSpacePos);
-
         public bool FilteringActive { get; set; }
 
+        public IEnumerable<LocalisableString> FilterTerms => bindings.Select(b => (LocalisableString)keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text);
+
+        #endregion
+
+        private readonly object action;
+        private readonly IEnumerable<RealmKeyBinding> bindings;
+
+        private Bindable<bool> isDefault { get; } = new BindableBool(true);
+
         [Resolved]
         private ReadableKeyCombinationProvider keyCombinationProvider { get; set; }
 
+        [Resolved]
+        private RealmAccess realm { get; set; }
+
+        private Container content;
+
         private OsuSpriteText text;
         private FillFlowContainer cancelAndClearButtons;
         private FillFlowContainer<KeyButton> buttons;
 
-        private Bindable<bool> isDefault { get; } = new BindableBool(true);
+        private KeyButton bindTarget;
 
-        public IEnumerable<LocalisableString> FilterTerms => bindings.Select(b => (LocalisableString)keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text);
+        private const float transition_time = 150;
+        private const float height = 20;
+        private const float padding = 5;
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            content.ReceivePositionalInputAt(screenSpacePos);
+
+        public override bool AcceptsFocus => bindTarget == null;
 
         public KeyBindingRow(object action, List<RealmKeyBinding> bindings)
         {
@@ -87,9 +100,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             AutoSizeAxes = Axes.Y;
         }
 
-        [Resolved]
-        private RealmAccess realm { get; set; }
-
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
@@ -205,14 +215,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             base.OnHoverLost(e);
         }
 
-        public override bool AcceptsFocus => bindTarget == null;
-
-        private KeyButton bindTarget;
-
-        public bool AllowMainMouseButtons;
-
-        public IEnumerable<KeyCombination> Defaults;
-
         private bool isModifier(Key k) => k < Key.F1;
 
         protected override bool OnClick(ClickEvent e) => true;

From 7ac874d17ac68e966953e8cd03d6d7fb843aea14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:20:25 +0200
Subject: [PATCH 1759/2100] Use init-only properties where applicable

---
 osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs  | 6 +++---
 .../Settings/Sections/Input/KeyBindingsSubsection.cs        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 8fcf519a2e..ac09843c96 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -37,11 +37,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
         /// </summary>
-        public Action<KeyBindingRow> BindingUpdated { get; set; }
+        public Action<KeyBindingRow> BindingUpdated { get; init; }
 
-        public bool AllowMainMouseButtons;
+        public bool AllowMainMouseButtons { get; init; }
 
-        public IEnumerable<KeyCombination> Defaults;
+        public IEnumerable<KeyCombination> Defaults { get; init; }
 
         #region IFilterable
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index d6d4abfa92..b138f54644 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// </summary>
         protected virtual bool AutoAdvanceTarget => false;
 
-        protected IEnumerable<Framework.Input.Bindings.KeyBinding> Defaults;
+        protected IEnumerable<Framework.Input.Bindings.KeyBinding> Defaults { get; init; }
 
         public RulesetInfo Ruleset { get; protected set; }
 

From 0b2b065383b337051e02892e306a21c1496ea7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:21:19 +0200
Subject: [PATCH 1760/2100] Add xmldoc

---
 .../Overlays/Settings/Sections/Input/KeyBindingRow.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index ac09843c96..54a51069e8 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -39,8 +39,14 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// </summary>
         public Action<KeyBindingRow> BindingUpdated { get; init; }
 
+        /// <summary>
+        /// Whether left and right mouse button clicks should be included in the edited bindings.
+        /// </summary>
         public bool AllowMainMouseButtons { get; init; }
 
+        /// <summary>
+        /// The default key bindings for this row.
+        /// </summary>
         public IEnumerable<KeyCombination> Defaults { get; init; }
 
         #region IFilterable
@@ -91,6 +97,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public override bool AcceptsFocus => bindTarget == null;
 
+        /// <summary>
+        /// Creates a new <see cref="KeyBindingRow"/>.
+        /// </summary>
+        /// <param name="action">The action that this row contains bindings for.</param>
+        /// <param name="bindings">The keybindings to display in this row.</param>
         public KeyBindingRow(object action, List<RealmKeyBinding> bindings)
         {
             this.action = action;

From 797109c05cf7c16e730fa4b10ab9f2f61f12971c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:30:04 +0200
Subject: [PATCH 1761/2100] Enable NRT in `KeyBindingRow`

---
 .../Settings/Sections/Input/KeyBindingRow.cs  | 49 +++++++++++++------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 54a51069e8..c0de7a1d16 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -1,15 +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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
         /// </summary>
-        public Action<KeyBindingRow> BindingUpdated { get; init; }
+        public Action<KeyBindingRow>? BindingUpdated { get; init; }
 
         /// <summary>
         /// Whether left and right mouse button clicks should be included in the edited bindings.
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// The default key bindings for this row.
         /// </summary>
-        public IEnumerable<KeyCombination> Defaults { get; init; }
+        public IEnumerable<KeyCombination> Defaults { get; init; } = Array.Empty<KeyCombination>();
 
         #region IFilterable
 
@@ -75,18 +75,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private Bindable<bool> isDefault { get; } = new BindableBool(true);
 
         [Resolved]
-        private ReadableKeyCombinationProvider keyCombinationProvider { get; set; }
+        private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
 
         [Resolved]
-        private RealmAccess realm { get; set; }
+        private RealmAccess realm { get; set; } = null!;
 
-        private Container content;
+        private Container content = null!;
 
-        private OsuSpriteText text;
-        private FillFlowContainer cancelAndClearButtons;
-        private FillFlowContainer<KeyButton> buttons;
+        private OsuSpriteText text = null!;
+        private FillFlowContainer cancelAndClearButtons = null!;
+        private FillFlowContainer<KeyButton> buttons = null!;
 
-        private KeyButton bindTarget;
+        private KeyButton? bindTarget;
 
         private const float transition_time = 150;
         private const float height = 20;
@@ -232,7 +232,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (!HasFocus || !bindTarget.IsHovered)
+            if (!HasFocus)
+                return base.OnMouseDown(e);
+
+            Debug.Assert(bindTarget != null);
+
+            if (!bindTarget.IsHovered)
                 return base.OnMouseDown(e);
 
             if (!AllowMainMouseButtons)
@@ -258,6 +263,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 return;
             }
 
+            Debug.Assert(bindTarget != null);
+
             if (bindTarget.IsHovered)
                 finalise(false);
             // prevent updating bind target before clear button's action
@@ -269,6 +276,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             if (HasFocus)
             {
+                Debug.Assert(bindTarget != null);
+
                 if (bindTarget.IsHovered)
                 {
                     bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState, e.ScrollDelta), KeyCombination.FromScrollDelta(e.ScrollDelta).First());
@@ -285,6 +294,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!HasFocus || e.Repeat)
                 return false;
 
+            Debug.Assert(bindTarget != null);
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromKey(e.Key));
             if (!isModifier(e.Key)) finalise();
 
@@ -307,6 +318,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!HasFocus)
                 return false;
 
+            Debug.Assert(bindTarget != null);
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromJoystickButton(e.Button));
             finalise();
 
@@ -329,6 +342,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!HasFocus)
                 return false;
 
+            Debug.Assert(bindTarget != null);
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromMidiKey(e.Key));
             finalise();
 
@@ -351,6 +366,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!HasFocus)
                 return false;
 
+            Debug.Assert(bindTarget != null);
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromTabletAuxiliaryButton(e.Button));
             finalise();
 
@@ -373,6 +390,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!HasFocus)
                 return false;
 
+            Debug.Assert(bindTarget != null);
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromTabletPenButton(e.Button));
             finalise();
 
@@ -486,10 +505,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public readonly OsuSpriteText Text;
 
             [Resolved]
-            private OverlayColourProvider colourProvider { get; set; }
+            private OverlayColourProvider colourProvider { get; set; } = null!;
 
             [Resolved]
-            private ReadableKeyCombinationProvider keyCombinationProvider { get; set; }
+            private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
 
             private bool isBinding;
 
@@ -612,7 +631,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 base.Dispose(isDisposing);
 
-                if (keyCombinationProvider != null)
+                if (keyCombinationProvider.IsNotNull())
                     keyCombinationProvider.KeymapChanged -= updateKeyCombinationText;
             }
         }

From 63843c79c3b3333e4cd8df844ae99257ed0579f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Oct 2023 21:12:04 +0900
Subject: [PATCH 1762/2100] Amend diffcalc to use something closer to the
 original calculation for now

---
 .../Preprocessing/OsuDifficultyHitObject.cs   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index 5c2c85d69e..f37452a79c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -215,13 +215,20 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             if (slider.LazyEndPosition != null)
                 return;
 
-            double trackingEndTime = Math.Max(
-                // SliderTailCircle always occurs at the final end time of the slider, but the player only needs to hold until within a lenience before it.
-                slider.NestedHitObjects.OfType<SliderTailCircle>().Single().StartTime + SliderEventGenerator.TAIL_LENIENCY,
-                // There's an edge case where one or more ticks/repeats fall within that leniency range.
-                // In such a case, the player needs to track until the final tick or repeat.
-                slider.NestedHitObjects.LastOrDefault(n => n is not SliderTailCircle)?.StartTime ?? double.MinValue
-            );
+            // This commented version is actually correct by the new lazer implementation, but intentionally held back from
+            // difficulty calculator to preserve known behaviour.
+            // double trackingEndTime = Math.Max(
+            //     // SliderTailCircle always occurs at the final end time of the slider, but the player only needs to hold until within a lenience before it.
+            //     slider.Duration + SliderEventGenerator.TAIL_LENIENCY,
+            //     // There's an edge case where one or more ticks/repeats fall within that leniency range.
+            //     // In such a case, the player needs to track until the final tick or repeat.
+            //     slider.NestedHitObjects.LastOrDefault(n => n is not SliderTailCircle)?.StartTime ?? double.MinValue
+            // );
+
+            double trackingEndTime = Math.Max(Math.Max(
+                slider.StartTime + slider.Duration + SliderEventGenerator.TAIL_LENIENCY,
+                slider.StartTime + slider.Duration / 2
+            ), slider.NestedHitObjects.OfType<SliderTick>().Last().StartTime);
 
             slider.LazyTravelTime = trackingEndTime - slider.StartTime;
 

From 3f29f27cd48261f7da0f96659fbc494177b0192e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 19:40:55 +0200
Subject: [PATCH 1763/2100] Assign empty hit windows to `HoldNoteBody`

It's not a timed object, so following precedent, it should have empty
hitwindows.

This is not actually just aesthetics; several components check whether a
hitobject has empty hitwindows to determine whether to include it on
various HUD displays and results screen components where timed objects
are explicitly involved.
---
 osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
index 92baa25fa9..47163d0d81 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
@@ -3,6 +3,7 @@
 
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects
 {
@@ -15,5 +16,6 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class HoldNoteBody : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new HoldNoteBodyJudgement();
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

From 041318e3e8b1e6bc139bdc1d72407c0a90598328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 19:44:46 +0200
Subject: [PATCH 1764/2100] Assign red colour to `ComboBreak` hit result

For a judgement result to show up on the colour hit error meter, it has
to be two things: be scorable, and not be bonus.

`ComboBreak` happens to meet both of those criteria - it impacts score
indirectly via decreasing the combo portion, and isn't bonus. Therefore
it would show up on the colour hit error meter, but because
`OsuColour.ForHitResult()` wasn't handling it explicitly, it was
painting the result in light blue, which isn't ideal for a miss type
judgement. Therefore, use red instead.

There is possibly an argument to be made that this judgement should not
show up on the colour hit error meter at all, but I think it's actually
okay for it to be this way. In any case it doesn't appear to be anything
so major as to warrant blocking the hold note tick removal at this time.
---
 osu.Game/Graphics/OsuColour.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 1b21f79c0a..d0e07a9e66 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -78,6 +78,7 @@ namespace osu.Game.Graphics
                 case HitResult.SmallTickMiss:
                 case HitResult.LargeTickMiss:
                 case HitResult.Miss:
+                case HitResult.ComboBreak:
                     return Red;
 
                 case HitResult.Meh:

From 712564ea4f5b527e6c0ea1a6789a1446e4f0f443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:49:52 +0200
Subject: [PATCH 1765/2100] Enable NRT in `KeyBindingsSubsection`

---
 .../TestSceneChangeAndUseGameplayBindings.cs           |  2 +-
 .../Settings/Sections/Input/KeyBindingsSubsection.cs   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs b/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs
index 5467a64b85..3a3af43cb1 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
         private KeyBindingsSubsection osuBindingSubsection => keyBindingPanel
                                                               .ChildrenOfType<VariantBindingsSubsection>()
-                                                              .FirstOrDefault(s => s.Ruleset.ShortName == "osu");
+                                                              .FirstOrDefault(s => s.Ruleset!.ShortName == "osu");
 
         private OsuButton configureBindingsButton => Game.Settings
                                                          .ChildrenOfType<BindingSettings>().SingleOrDefault()?
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index b138f54644..8285204bb3 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -1,13 +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.
 
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Localisation;
 using osu.Game.Database;
 using osu.Game.Input.Bindings;
@@ -25,9 +25,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// </summary>
         protected virtual bool AutoAdvanceTarget => false;
 
-        protected IEnumerable<Framework.Input.Bindings.KeyBinding> Defaults { get; init; }
+        protected IEnumerable<KeyBinding> Defaults { get; init; } = Array.Empty<KeyBinding>();
 
-        public RulesetInfo Ruleset { get; protected set; }
+        public RulesetInfo? Ruleset { get; protected set; }
 
         private readonly int? variant;
 
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load(RealmAccess realm)
         {
-            string rulesetName = Ruleset?.ShortName;
+            string? rulesetName = Ruleset?.ShortName;
 
             var bindings = realm.Run(r => r.All<RealmKeyBinding>()
                                            .Where(b => b.RulesetName == rulesetName && b.Variant == variant)

From 5ffc25c8e847d97b678de8946676338ed8ba379b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 03:19:43 +0900
Subject: [PATCH 1766/2100] Fix potential failure when slider has no ticks

---
 .../Difficulty/Preprocessing/OsuDifficultyHitObject.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index f37452a79c..959449fdbb 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             double trackingEndTime = Math.Max(Math.Max(
                 slider.StartTime + slider.Duration + SliderEventGenerator.TAIL_LENIENCY,
                 slider.StartTime + slider.Duration / 2
-            ), slider.NestedHitObjects.OfType<SliderTick>().Last().StartTime);
+            ), slider.NestedHitObjects.OfType<SliderTick>().LastOrDefault()?.StartTime ?? double.MinValue);
 
             slider.LazyTravelTime = trackingEndTime - slider.StartTime;
 

From 764f641bc9037c83c769f41230433cf79f1217a2 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 11 Oct 2023 12:47:12 -0700
Subject: [PATCH 1767/2100] Add extended info support to tiny mod switches

---
 .../UserInterface/TestSceneModSwitchTiny.cs   |  60 +++++++++-
 osu.Game/Rulesets/UI/ModSwitchTiny.cs         | 112 ++++++++++++++----
 2 files changed, 146 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs
index 2d953fe9ad..b7cf3fef9b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs
@@ -2,16 +2,19 @@
 // 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.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Rulesets.UI;
@@ -34,6 +37,49 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestMania() => createSwitchTestFor(new ManiaRuleset());
 
+        [Test]
+        public void TestShowRateAdjusts()
+        {
+            AddStep("create mod icons", () =>
+            {
+                Child = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Full,
+                    ChildrenEnumerable = Ruleset.Value.CreateInstance().CreateAllMods()
+                                                .OfType<ModRateAdjust>()
+                                                .SelectMany(m =>
+                                                {
+                                                    List<TestModSwitchTiny> icons = new List<TestModSwitchTiny> { new TestModSwitchTiny(m) };
+
+                                                    for (double i = m.SpeedChange.MinValue; i < m.SpeedChange.MaxValue; i += m.SpeedChange.Precision * 10)
+                                                    {
+                                                        m = (ModRateAdjust)m.DeepClone();
+                                                        m.SpeedChange.Value = i;
+                                                        icons.Add(new TestModSwitchTiny(m, true));
+                                                    }
+
+                                                    return icons;
+                                                }),
+                };
+            });
+
+            AddStep("adjust rates", () =>
+            {
+                foreach (var icon in this.ChildrenOfType<TestModSwitchTiny>())
+                {
+                    if (icon.Mod is ModRateAdjust rateAdjust)
+                    {
+                        rateAdjust.SpeedChange.Value = RNG.NextDouble() > 0.9
+                            ? rateAdjust.SpeedChange.Default
+                            : RNG.NextDouble(rateAdjust.SpeedChange.MinValue, rateAdjust.SpeedChange.MaxValue);
+                    }
+                }
+            });
+
+            AddToggleStep("toggle active", active => this.ChildrenOfType<TestModSwitchTiny>().ForEach(s => s.Active.Value = active));
+        }
+
         private void createSwitchTestFor(Ruleset ruleset)
         {
             AddStep("no colour scheme", () => Child = createContent(ruleset, null));
@@ -43,7 +89,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 AddStep($"{scheme} colour scheme", () => Child = createContent(ruleset, scheme));
             }
 
-            AddToggleStep("toggle active", active => this.ChildrenOfType<ModSwitchTiny>().ForEach(s => s.Active.Value = active));
+            AddToggleStep("toggle active", active => this.ChildrenOfType<TestModSwitchTiny>().ForEach(s => s.Active.Value = active));
         }
 
         private static Drawable createContent(Ruleset ruleset, OverlayColourScheme? colourScheme)
@@ -62,7 +108,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                                                 AutoSizeAxes = Axes.Y,
                                                 Direction = FillDirection.Full,
                                                 Spacing = new Vector2(5),
-                                                ChildrenEnumerable = group.Select(mod => new ModSwitchTiny(mod))
+                                                ChildrenEnumerable = group.Select(mod => new TestModSwitchTiny(mod))
                                             })
             };
 
@@ -81,5 +127,15 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             return switchFlow;
         }
+
+        private partial class TestModSwitchTiny : ModSwitchTiny
+        {
+            public new IMod Mod => base.Mod;
+
+            public TestModSwitchTiny(IMod mod, bool showExtendedInformation = false)
+                : base(mod, showExtendedInformation)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/ModSwitchTiny.cs b/osu.Game/Rulesets/UI/ModSwitchTiny.cs
index a5cf75bd07..a3e325ace8 100644
--- a/osu.Game/Rulesets/UI/ModSwitchTiny.cs
+++ b/osu.Game/Rulesets/UI/ModSwitchTiny.cs
@@ -3,15 +3,16 @@
 
 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.Utils;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.UI
@@ -21,8 +22,10 @@ namespace osu.Game.Rulesets.UI
         public BindableBool Active { get; } = new BindableBool();
 
         public const float DEFAULT_HEIGHT = 30;
+        private const float width = 73;
 
-        private readonly IMod mod;
+        protected readonly IMod Mod;
+        private readonly bool showExtendedInformation;
 
         private readonly Box background;
         private readonly OsuSpriteText acronymText;
@@ -33,33 +36,69 @@ namespace osu.Game.Rulesets.UI
         private Color4 activeBackgroundColour;
         private Color4 inactiveBackgroundColour;
 
-        public ModSwitchTiny(IMod mod)
-        {
-            this.mod = mod;
-            Size = new Vector2(73, DEFAULT_HEIGHT);
+        private readonly CircularContainer extendedContent;
+        private readonly Box extendedBackground;
+        private readonly OsuSpriteText extendedText;
+        private ModSettingChangeTracker? modSettingsChangeTracker;
 
-            InternalChild = new CircularContainer
+        public ModSwitchTiny(IMod mod, bool showExtendedInformation = false)
+        {
+            Mod = mod;
+            this.showExtendedInformation = showExtendedInformation;
+            AutoSizeAxes = Axes.X;
+            Height = DEFAULT_HEIGHT;
+
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                Children = new Drawable[]
+                extendedContent = new CircularContainer
                 {
-                    background = new Box
+                    Name = "extended content",
+                    Width = 100 + DEFAULT_HEIGHT / 2,
+                    RelativeSizeAxes = Axes.Y,
+                    Masking = true,
+                    X = width,
+                    Margin = new MarginPadding { Left = -DEFAULT_HEIGHT },
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                    acronymText = new OsuSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Shadow = false,
-                        Font = OsuFont.Numeric.With(size: 24, weight: FontWeight.Black),
-                        Text = mod.Acronym,
-                        Margin = new MarginPadding
+                        extendedBackground = new Box
                         {
-                            Top = 4
-                        }
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        extendedText = new OsuSpriteText
+                        {
+                            Margin = new MarginPadding { Left = 3 * DEFAULT_HEIGHT / 4 },
+                            Font = OsuFont.Default.With(size: 30f, weight: FontWeight.Bold),
+                            UseFullGlyphHeight = false,
+                            Text = mod.ExtendedIconInformation,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
                     }
+                },
+                new CircularContainer
+                {
+                    Width = width,
+                    RelativeSizeAxes = Axes.Y,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        background = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        },
+                        acronymText = new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Shadow = false,
+                            Font = OsuFont.Numeric.With(size: 24, weight: FontWeight.Black),
+                            Text = mod.Acronym,
+                            Margin = new MarginPadding
+                            {
+                                Top = 4
+                            }
+                        },
+                    },
                 }
             };
         }
@@ -68,7 +107,7 @@ namespace osu.Game.Rulesets.UI
         private void load(OsuColour colours, OverlayColourProvider? colourProvider)
         {
             inactiveBackgroundColour = colourProvider?.Background5 ?? colours.Gray3;
-            activeBackgroundColour = colours.ForModType(mod.Type);
+            activeBackgroundColour = colours.ForModType(Mod.Type);
 
             inactiveForegroundColour = colourProvider?.Background2 ?? colours.Gray5;
             activeForegroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, activeForegroundColour, 0, 1);
@@ -80,12 +119,37 @@ namespace osu.Game.Rulesets.UI
 
             Active.BindValueChanged(_ => updateState(), true);
             FinishTransforms(true);
+
+            if (Mod is Mod actualMod)
+            {
+                modSettingsChangeTracker = new ModSettingChangeTracker(new[] { actualMod });
+                modSettingsChangeTracker.SettingChanged = _ => updateExtendedInformation();
+            }
+
+            updateExtendedInformation();
+        }
+
+        private void updateExtendedInformation()
+        {
+            bool showExtended = showExtendedInformation && !string.IsNullOrEmpty(Mod.ExtendedIconInformation);
+
+            extendedContent.Alpha = showExtended ? 1 : 0;
+            extendedText.Text = Mod.ExtendedIconInformation;
         }
 
         private void updateState()
         {
             acronymText.FadeColour(Active.Value ? activeForegroundColour : inactiveForegroundColour, 200, Easing.OutQuint);
             background.FadeColour(Active.Value ? activeBackgroundColour : inactiveBackgroundColour, 200, Easing.OutQuint);
+
+            extendedText.Colour = Active.Value ? activeBackgroundColour.Lighten(0.2f) : inactiveBackgroundColour;
+            extendedBackground.Colour = Active.Value ? activeBackgroundColour.Darken(2.4f) : inactiveBackgroundColour.Darken(2.8f);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            modSettingsChangeTracker?.Dispose();
         }
     }
 }

From 29eba3c58ac14df176150b8680fb197f1aae7518 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 14:05:06 +0900
Subject: [PATCH 1768/2100] 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 b3feccbbc0..0575817460 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.1006.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1012.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 1aa3a23cdc..69675e9c1b 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.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1006.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index bf772f20f4..9b06b4a6a7 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.1006.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1012.0" />
   </ItemGroup>
 </Project>

From 194ad9650dc695a8a6684266cb6b7c99b52b3940 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 18:48:50 +0900
Subject: [PATCH 1769/2100] Remove test scene background stack and use new
 `ChangeBackgroundColour` method

---
 osu.Game/Tests/OsuTestBrowser.cs      | 10 ----------
 osu.Game/Tests/Visual/OsuTestScene.cs |  7 +++++++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs
index 0bc51a0c1e..477ffb2908 100644
--- a/osu.Game/Tests/OsuTestBrowser.cs
+++ b/osu.Game/Tests/OsuTestBrowser.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.Graphics;
 using osu.Framework.Platform;
-using osu.Framework.Screens;
 using osu.Framework.Testing;
-using osu.Game.Graphics;
-using osu.Game.Screens.Backgrounds;
 
 namespace osu.Game.Tests
 {
@@ -16,12 +12,6 @@ namespace osu.Game.Tests
         {
             base.LoadComplete();
 
-            LoadComponentAsync(new ScreenStack(new BackgroundScreenDefault { Colour = OsuColour.Gray(0.5f) })
-            {
-                Depth = 10,
-                RelativeSizeAxes = Axes.Both,
-            }, Add);
-
             // Have to construct this here, rather than in the constructor, because
             // we depend on some dependencies to be loaded within OsuGameBase.load().
             Add(new TestBrowser());
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 3ccb795a57..096917cf4f 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -16,6 +16,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
@@ -23,6 +24,7 @@ using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
+using osu.Game.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
@@ -158,10 +160,15 @@ namespace osu.Game.Tests.Visual
             return Dependencies;
         }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            ChangeBackgroundColour(ColourInfo.GradientVertical(colours.GreyCarmine, colours.GreyCarmineDarker));
+
             var parentBeatmap = Parent.Dependencies.Get<Bindable<WorkingBeatmap>>();
             parentBeatmap.Value = Beatmap.Value;
             Beatmap.BindTo(parentBeatmap);

From 5bb73632c4dfce3c15ee5754d8e0bbfa9381ec6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 14:55:16 +0900
Subject: [PATCH 1770/2100] Show maximum bonus statistics on results screen

Addresses https://github.com/ppy/osu/discussions/25088.
---
 osu.Game/Scoring/ScoreInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 2efea2105c..8531408555 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -346,7 +346,7 @@ namespace osu.Game.Scoring
                     case HitResult.LargeBonus:
                     case HitResult.SmallBonus:
                         if (MaximumStatistics.TryGetValue(r.result, out int count) && count > 0)
-                            yield return new HitResultDisplayStatistic(r.result, value, null, r.displayName);
+                            yield return new HitResultDisplayStatistic(r.result, value, count, r.displayName);
 
                         break;
 

From 256c95f0456721fdd23a27060857f6a0df141a60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 15:42:16 +0900
Subject: [PATCH 1771/2100] Add (failing) test coverage of exit/retry during
 progress to results

---
 .../Navigation/TestSceneScreenNavigation.cs   | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 3acc2f0384..fa1ebf5c56 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -215,6 +215,24 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("retry count is 1", () => player.RestartCount == 1);
         }
 
+        [Test]
+        public void TestRetryImmediatelyAfterCompletion()
+        {
+            var getOriginalPlayer = playToCompletion();
+
+            AddStep("attempt to retry", () => getOriginalPlayer().ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen != getOriginalPlayer() && Game.ScreenStack.CurrentScreen is Player);
+        }
+
+        [Test]
+        public void TestExitImmediatelyAfterCompletion()
+        {
+            var player = playToCompletion();
+
+            AddStep("attempt to exit", () => player().ChildrenOfType<HotkeyExitOverlay>().First().Action());
+            AddUntilStep("wait for results", () => Game.ScreenStack.CurrentScreen is ResultsScreen);
+        }
+
         [Test]
         public void TestRetryFromResults()
         {
@@ -778,6 +796,13 @@ namespace osu.Game.Tests.Visual.Navigation
         }
 
         private Func<Player> playToResults()
+        {
+            var player = playToCompletion();
+            AddUntilStep("wait for results", () => (Game.ScreenStack.CurrentScreen as ResultsScreen)?.IsLoaded == true);
+            return player;
+        }
+
+        private Func<Player> playToCompletion()
         {
             Player player = null;
 
@@ -803,7 +828,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             AddUntilStep("wait for track playing", () => beatmap().Track.IsRunning);
             AddStep("seek to near end", () => player.ChildrenOfType<GameplayClockContainer>().First().Seek(beatmap().Beatmap.HitObjects[^1].StartTime - 1000));
-            AddUntilStep("wait for pass", () => (Game.ScreenStack.CurrentScreen as ResultsScreen)?.IsLoaded == true);
+            AddUntilStep("wait for complete", () => player.GameplayState.HasPassed);
+
             return () => player;
         }
 

From 7c0d4967305a7290e26cb91224b843ae6439b748 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 14:42:45 +0900
Subject: [PATCH 1772/2100] Show results immediately if user hits "back" key
 after finishing gameplay

I've gone ahead and matched the osu!stable behaviour for this, as it
seems like it's what people are used to and they will settle for no
less.

Closes https://github.com/ppy/osu/issues/18089.
---
 osu.Game/Screens/Play/Player.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 91131b0aba..66b4b306f3 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -601,8 +601,13 @@ namespace osu.Game.Screens.Play
                 }
             }
 
-            // if an exit has been requested, cancel any pending completion (the user has shown intention to exit).
-            resultsDisplayDelegate?.Cancel();
+            // Matching osu!stable behaviour, if the results screen is pending and the user requests an exit,
+            // show the results instead.
+            if (resultsDisplayDelegate != null)
+            {
+                progressToResults(false);
+                return;
+            }
 
             // import current score if possible.
             prepareAndImportScoreAsync();

From 242a41371c10503b9221b4b16db8ec98bbfc1bdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 15:42:50 +0900
Subject: [PATCH 1773/2100] Fix `HotkeyOverlay` fade out occurring when exit is
 blocked

---
 osu.Game/Screens/Play/Player.cs | 39 ++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 66b4b306f3..ad796744fc 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -279,8 +279,10 @@ namespace osu.Game.Screens.Play
                     {
                         if (!this.IsCurrentScreen()) return;
 
-                        fadeOut(true);
-                        PerformExit(false);
+                        if (PerformExit(false))
+                            // The hotkey overlay dims the screen.
+                            // If the operation succeeds, we want to make sure we stay dimmed to keep continuity.
+                            fadeOut(true);
                     },
                 },
             });
@@ -298,8 +300,10 @@ namespace osu.Game.Screens.Play
                         {
                             if (!this.IsCurrentScreen()) return;
 
-                            fadeOut(true);
-                            Restart(true);
+                            if (Restart(true))
+                                // The hotkey overlay dims the screen.
+                                // If the operation succeeds, we want to make sure we stay dimmed to keep continuity.
+                                fadeOut(true);
                         },
                     },
                 });
@@ -565,7 +569,8 @@ namespace osu.Game.Screens.Play
         /// Whether the pause or fail dialog should be shown before performing an exit.
         /// If <see langword="true"/> and a dialog is not yet displayed, the exit will be blocked and the relevant dialog will display instead.
         /// </param>
-        protected void PerformExit(bool showDialogFirst)
+        /// <returns>Whether this call resulted in a final exit.</returns>
+        protected bool PerformExit(bool showDialogFirst)
         {
             // there is a chance that an exit request occurs after the transition to results has already started.
             // even in such a case, the user has shown intent, so forcefully return to this screen (to proceed with the upwards exit process).
@@ -576,7 +581,7 @@ namespace osu.Game.Screens.Play
                 // in the potential case that this instance has already been exited, this is required to avoid a crash.
                 if (this.GetChildScreen() != null)
                     this.MakeCurrent();
-                return;
+                return true;
             }
 
             bool pauseOrFailDialogVisible =
@@ -588,7 +593,7 @@ namespace osu.Game.Screens.Play
                 if (ValidForResume && GameplayState.HasFailed)
                 {
                     failAnimationContainer.FinishTransforms(true);
-                    return;
+                    return false;
                 }
 
                 // even if this call has requested a dialog, there is a chance the current player mode doesn't support pausing.
@@ -597,16 +602,16 @@ namespace osu.Game.Screens.Play
                     // in the case a dialog needs to be shown, attempt to pause and show it.
                     // this may fail (see internal checks in Pause()) but the fail cases are temporary, so don't fall through to Exit().
                     Pause();
-                    return;
+                    return false;
                 }
             }
 
             // Matching osu!stable behaviour, if the results screen is pending and the user requests an exit,
             // show the results instead.
-            if (resultsDisplayDelegate != null)
+            if (resultsDisplayDelegate != null && !isRestarting)
             {
                 progressToResults(false);
-                return;
+                return false;
             }
 
             // import current score if possible.
@@ -617,6 +622,7 @@ namespace osu.Game.Screens.Play
             // - the pause / fail dialog was requested but is already displayed (user showing intention to exit).
             // - the pause / fail dialog was requested but couldn't be displayed due to the type or state of this Player instance.
             this.Exit();
+            return true;
         }
 
         private void performUserRequestedSkip()
@@ -665,10 +671,10 @@ namespace osu.Game.Screens.Play
         /// <remarks>This can be called from a child screen in order to trigger the restart process.</remarks>
         /// </summary>
         /// <param name="quickRestart">Whether a quick restart was requested (skipping intro etc.).</param>
-        public void Restart(bool quickRestart = false)
+        public bool Restart(bool quickRestart = false)
         {
             if (!Configuration.AllowRestart)
-                return;
+                return false;
 
             isRestarting = true;
 
@@ -678,7 +684,7 @@ namespace osu.Game.Screens.Play
 
             RestartRequested?.Invoke(quickRestart);
 
-            PerformExit(false);
+            return PerformExit(false);
         }
 
         /// <summary>
@@ -1205,8 +1211,11 @@ namespace osu.Game.Screens.Play
             float fadeOutDuration = instant ? 0 : 250;
             this.FadeOut(fadeOutDuration);
 
-            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
-            storyboardReplacesBackground.Value = false;
+            if (this.IsCurrentScreen())
+            {
+                ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+                storyboardReplacesBackground.Value = false;
+            }
         }
 
         #endregion

From 73b81467298301dc47d35d3b23c033f28c4b2664 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 14:49:07 +0900
Subject: [PATCH 1774/2100] Update tests in line with new behaviour

---
 osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 283866bef2..09f729e468 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("disable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, false));
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
-            AddAssert("player exited", () => Stack.CurrentScreen == null);
+            AddUntilStep("reached results screen", () => Stack.CurrentScreen is ResultsScreen);
         }
 
         [Test]

From 3023e4419607de57f8605a1c27f3a6274a3b45f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 15:52:48 +0900
Subject: [PATCH 1775/2100] Remove unused using statements

---
 .../Visual/UserInterface/TestSceneNotificationOverlay.cs       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 332053d71e..114c070acc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -4,9 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -14,7 +12,6 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;

From 55a9de034d9d79d8b9d9818e55ea914f8ab29e59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 16:00:23 +0900
Subject: [PATCH 1776/2100] Change `NotificationOverlay` type based logic to
 not require specifying every type of notification

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

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 67cf868fb0..dd4924d07a 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -113,7 +113,8 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.X,
                                     Children = new[]
                                     {
-                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(SimpleNotification), typeof(UserAvatarNotification) }),
+                                        // The main section adds as a catch-all for notifications which don't group into other sections.
+                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(Notification) }),
                                         new NotificationSection(NotificationsStrings.RunningTasks, new[] { typeof(ProgressNotification) }),
                                     }
                                 }
@@ -205,7 +206,7 @@ namespace osu.Game.Overlays
             var ourType = notification.GetType();
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
 
-            var section = sections.Children.First(s => s.AcceptedNotificationTypes.Any(accept => accept.IsAssignableFrom(ourType)));
+            var section = sections.Children.Last(s => s.AcceptedNotificationTypes.Any(accept => accept.IsAssignableFrom(ourType)));
 
             section.Add(notification, depth);
 

From e6103fea95ed8bffde81ca16bfd4da2631c91ad4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 16:00:36 +0900
Subject: [PATCH 1777/2100] Fix `async` usage in `TestSceneNotificationOverlay`

---
 .../Visual/UserInterface/TestSceneNotificationOverlay.cs     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 114c070acc..c584c7dba0 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -541,9 +542,9 @@ namespace osu.Game.Tests.Visual.UserInterface
             progressingNotifications.Add(n);
         }
 
-        private async void sendUserNotification()
+        private void sendUserNotification()
         {
-            var user = await userLookupCache.GetUserAsync(0).ConfigureAwait(true);
+            var user = userLookupCache.GetUserAsync(0).GetResultSafely();
             if (user == null) return;
 
             var n = new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match!");

From aee8ba789c1f4f022eaa3abf90173afce1fcc591 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 16:02:19 +0900
Subject: [PATCH 1778/2100] Tidy up `UserAvatarNotification` implementation

---
 .../Overlays/Notifications/Notification.cs    |  4 +-
 .../Notifications/UserAvatarNotification.cs   | 39 ++++++++-----------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 8cdc373417..d619d1d3c3 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -53,6 +53,8 @@ namespace osu.Game.Overlays.Notifications
         public virtual string PopInSampleName => "UI/notification-default";
         public virtual string PopOutSampleName => "UI/overlay-pop-out";
 
+        protected const float CORNER_RADIUS = 6;
+
         protected NotificationLight Light;
 
         protected Container IconContent;
@@ -128,7 +130,7 @@ namespace osu.Game.Overlays.Notifications
                     AutoSizeAxes = Axes.Y,
                 }.WithChild(MainContent = new Container
                 {
-                    CornerRadius = 6,
+                    CornerRadius = CORNER_RADIUS,
                     Masking = true,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
diff --git a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
index af881a5008..04766f7743 100644
--- a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
+++ b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
@@ -39,39 +39,34 @@ namespace osu.Game.Overlays.Notifications
             Text = text;
         }
 
-        private DrawableAvatar? avatar;
-
         protected override IconUsage CloseButtonIcon => FontAwesome.Solid.Times;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            IconContent.Masking = true;
-
-            // Workaround for the corner radius on parent's mask breaking if we add masking to IconContent
-            IconContent.CornerRadius = 6;
-
-            IconContent.AddRange(new Drawable[]
-            {
-                new Box()
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background5,
-                },
-            });
-
-            avatar = new DrawableAvatar(user)
-            {
-                FillMode = FillMode.Fill,
-            };
-            LoadComponentAsync(avatar, IconContent.Add);
-
             Content.Add(textDrawable = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 14, weight: FontWeight.Medium))
             {
                 AutoSizeAxes = Axes.Y,
                 RelativeSizeAxes = Axes.X,
                 Text = text
             });
+
+            IconContent.Masking = true;
+            IconContent.CornerRadius = CORNER_RADIUS;
+
+            IconContent.AddRange(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background5,
+                },
+            });
+
+            LoadComponentAsync(new DrawableAvatar(user)
+            {
+                FillMode = FillMode.Fill,
+            }, IconContent.Add);
         }
     }
 }

From 20f32e2025a3d992bdd1b4b75eeb9360ea9932fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 16:05:48 +0900
Subject: [PATCH 1779/2100] Add light colouring for user notifications and
 adjust lighting slightly

---
 osu.Game/Overlays/Notifications/Notification.cs           | 5 ++---
 osu.Game/Overlays/Notifications/UserAvatarNotification.cs | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index d619d1d3c3..8108861dca 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -473,10 +473,9 @@ namespace osu.Game.Overlays.Notifications
                     base.Colour = value;
                     pulsateLayer.EdgeEffect = new EdgeEffectParameters
                     {
-                        Colour = ((Color4)value).Opacity(0.5f), //todo: avoid cast
+                        Colour = ((Color4)value).Opacity(0.18f),
                         Type = EdgeEffectType.Glow,
-                        Radius = 12,
-                        Roundness = 12,
+                        Radius = 14,
                     };
                 }
             }
diff --git a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
index 04766f7743..5a9241a2a1 100644
--- a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
+++ b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
@@ -42,8 +42,10 @@ namespace osu.Game.Overlays.Notifications
         protected override IconUsage CloseButtonIcon => FontAwesome.Solid.Times;
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OsuColour colours, OverlayColourProvider colourProvider)
         {
+            Light.Colour = colours.Orange2;
+
             Content.Add(textDrawable = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 14, weight: FontWeight.Medium))
             {
                 AutoSizeAxes = Axes.Y,

From a512ef56379637181bd0eab2393295d5608d9726 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:41:31 +0900
Subject: [PATCH 1780/2100] Add exceptions to online state handling

---
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs | 5 ++++-
 osu.Game/Users/UserPanel.cs                            | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 5047992c8b..02f0a6e80d 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Overlays.Dashboard
                     {
                         users.GetUserAsync(userId).ContinueWith(task =>
                         {
-                            var user = task.GetResultSafely();
+                            APIUser user = task.GetResultSafely();
 
                             if (user == null)
                                 return;
@@ -130,6 +130,9 @@ namespace osu.Game.Overlays.Dashboard
                                 if (!playingUsers.Contains(user.Id))
                                     return;
 
+                                // TODO: remove this once online state is being updated more correctly.
+                                user.IsOnline = true;
+
                                 userFlow.Add(createUserPanel(user));
                             });
                         });
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 98b306e264..273faf9bd1 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -123,7 +123,8 @@ namespace osu.Game.Users
                 }
 
                 if (
-                    User.IsOnline &&
+                    // TODO: uncomment this once lazer / osu-web is updating online states
+                    // User.IsOnline &&
                     multiplayerClient?.Room != null &&
                     multiplayerClient.Room.Users.All(u => u.UserID != User.Id)
                 )

From 94d7a65e4062578ac13b96da10e9dc3c70b67899 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:42:02 +0900
Subject: [PATCH 1781/2100] Schedule `Join` operations rather than using
 `OnLoadComplete` for added safety

---
 osu.Game/OsuGame.cs                           | 11 +++---
 .../OnlinePlay/Lounge/LoungeSubScreen.cs      | 37 ++++++++++---------
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  5 +--
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    |  4 +-
 4 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5372f9227f..ecf27cd116 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -654,14 +654,13 @@ namespace osu.Game
         {
             PerformFromScreen(screen =>
             {
-                Multiplayer multiplayer = new Multiplayer();
-                multiplayer.OnLoadComplete += _ =>
-                {
-                    multiplayer.Join(room, password);
-                };
+                if (!(screen is Multiplayer multiplayer))
+                    screen.Push(multiplayer = new Multiplayer());
 
-                screen.Push(multiplayer);
+                multiplayer.Join(room, password);
             });
+            // TODO: We should really be able to use `validScreens: new[] { typeof(Multiplayer) }` here
+            // but `PerformFromScreen` doesn't understand nested stacks.
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index fc4a5357c6..04ea59621d 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -297,26 +297,29 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             popoverContainer.HidePopover();
         }
 
-        public virtual void Join(Room room, string password, Action<Room> onSuccess = null, Action<string> onFailure = null) => Schedule(() =>
+        public void Join(Room room, string password, Action<Room> onSuccess = null, Action<string> onFailure = null)
         {
-            if (joiningRoomOperation != null)
-                return;
-
-            joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
-
-            RoomManager?.JoinRoom(room, password, _ =>
+            Schedule(() =>
             {
-                Open(room);
-                joiningRoomOperation?.Dispose();
-                joiningRoomOperation = null;
-                onSuccess?.Invoke(room);
-            }, error =>
-            {
-                joiningRoomOperation?.Dispose();
-                joiningRoomOperation = null;
-                onFailure?.Invoke(error);
+                if (joiningRoomOperation != null)
+                    return;
+
+                joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
+
+                RoomManager?.JoinRoom(room, password, _ =>
+                {
+                    Open(room);
+                    joiningRoomOperation?.Dispose();
+                    joiningRoomOperation = null;
+                    onSuccess?.Invoke(room);
+                }, error =>
+                {
+                    joiningRoomOperation?.Dispose();
+                    joiningRoomOperation = null;
+                    onFailure?.Invoke(error);
+                });
             });
-        });
+        }
 
         /// <summary>
         /// Copies a room and opens it as a fresh (not-yet-created) one.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index f899b24d30..edf5ce276a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -91,10 +91,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override LoungeSubScreen CreateLounge() => new MultiplayerLoungeSubScreen();
 
-        public void Join(Room room, string? password)
-        {
-            Lounge.Join(room, password);
-        }
+        public void Join(Room room, string? password) => Schedule(() => Lounge.Join(room, password));
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 57e388f016..88bbff6b92 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Screens.OnlinePlay
         [Cached]
         protected readonly OverlayColourProvider ColourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);
 
+        public IScreen CurrentSubScreen => screenStack.CurrentScreen;
+
         public override bool CursorVisible => (screenStack?.CurrentScreen as IOnlinePlaySubScreen)?.CursorVisible ?? true;
 
         // this is required due to PlayerLoader eventually being pushed to the main stack
@@ -225,8 +227,6 @@ namespace osu.Game.Screens.OnlinePlay
                 ((IBindable<UserActivity>)Activity).BindTo(newOsuScreen.Activity);
         }
 
-        public IScreen CurrentSubScreen => screenStack.CurrentScreen;
-
         protected abstract string ScreenTitle { get; }
 
         protected virtual RoomManager CreateRoomManager() => new RoomManager();

From cde4fad61027010d411e444b25ac0d111db16dce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:55:14 +0900
Subject: [PATCH 1782/2100] Simplify `async` lookup logic in `Invited` handling

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 8b4c38a152..6ba7953c8d 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -11,7 +11,6 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Development;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Database;
@@ -447,13 +446,8 @@ namespace osu.Game.Online.Multiplayer
 
         async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password)
         {
-            var loadUserTask = userLookupCache.GetUserAsync(invitedBy);
-            var loadRoomTask = lookupRoom(roomID);
-
-            await Task.WhenAll(loadUserTask, loadRoomTask).ConfigureAwait(false);
-
-            APIUser? apiUser = loadUserTask.GetResultSafely();
-            Room? apiRoom = loadRoomTask.GetResultSafely();
+            APIUser? apiUser = await userLookupCache.GetUserAsync(invitedBy);
+            Room? apiRoom = await lookupRoom(roomID);
 
             if (apiUser == null || apiRoom == null) return;
 

From a1a9bb75b79097e3abace2fa2e533ef031c73848 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:55:58 +0900
Subject: [PATCH 1783/2100] Remove unnecessary schedule logic

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 6ba7953c8d..3f4a26bf6c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -451,19 +451,16 @@ namespace osu.Game.Online.Multiplayer
 
             if (apiUser == null || apiRoom == null) return;
 
-            Scheduler.Add(() =>
-            {
-                PostNotification?.Invoke(
-                    new UserAvatarNotification(apiUser, $"{apiUser.Username} invited you to a multiplayer match:\"{apiRoom.Name}\"!")
+            PostNotification?.Invoke(
+                new UserAvatarNotification(apiUser, $"{apiUser.Username} invited you to a multiplayer match:\"{apiRoom.Name}\"!")
+                {
+                    Activated = () =>
                     {
-                        Activated = () =>
-                        {
-                            InviteAccepted?.Invoke(apiRoom, password);
-                            return true;
-                        }
+                        InviteAccepted?.Invoke(apiRoom, password);
+                        return true;
                     }
-                );
-            });
+                }
+            );
         }
 
         private Task<Room?> lookupRoom(long id)

From d2aa601912c3cd75fd8d28491e06584b493b0294 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:59:08 +0900
Subject: [PATCH 1784/2100] Allow localisation of the invite notification

---
 osu.Game/Localisation/NotificationsStrings.cs    | 5 +++++
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index 53687f2b28..9cb286bc91 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -93,6 +93,11 @@ Please try changing your audio device to a working setting.");
         /// </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);
 
+        /// <summary>
+        /// "{0} invited you to the multiplayer match &quot;{1}&quot;! Click to join."
+        /// </summary>
+        public static LocalisableString InvitedYouToTheMultiplayer(string username, string roomName) => new TranslatableString(getKey(@"invited_you_to_the_multiplayer"), @"{0} invited you to the multiplayer match ""{1}""! Click to join.", username, roomName);
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 3f4a26bf6c..e8653b86be 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -23,6 +23,7 @@ using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Utils;
+using osu.Game.Localisation;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -452,7 +453,7 @@ namespace osu.Game.Online.Multiplayer
             if (apiUser == null || apiRoom == null) return;
 
             PostNotification?.Invoke(
-                new UserAvatarNotification(apiUser, $"{apiUser.Username} invited you to a multiplayer match:\"{apiRoom.Name}\"!")
+                new UserAvatarNotification(apiUser, NotificationsStrings.InvitedYouToTheMultiplayer(apiUser.Username, apiRoom.Name.Value))
                 {
                     Activated = () =>
                     {

From 361d70f68affb6e422edc9cc521be89d66a0a66c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:59:47 +0900
Subject: [PATCH 1785/2100] Rename callback to match standards

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 4 ++--
 osu.Game/OsuGame.cs                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index e8653b86be..978eee505c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Online.Multiplayer
     {
         public Action<Notification>? PostNotification { protected get; set; }
 
-        public Action<Room, string>? InviteAccepted { protected get; set; }
+        public Action<Room, string>? PresentMatch { protected get; set; }
 
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
@@ -457,7 +457,7 @@ namespace osu.Game.Online.Multiplayer
                 {
                     Activated = () =>
                     {
-                        InviteAccepted?.Invoke(apiRoom, password);
+                        PresentMatch?.Invoke(apiRoom, password);
                         return true;
                     }
                 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ecf27cd116..885077a8e8 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -873,7 +873,7 @@ namespace osu.Game
             ScoreManager.PresentImport = items => PresentScore(items.First().Value);
 
             MultiplayerClient.PostNotification = n => Notifications.Post(n);
-            MultiplayerClient.InviteAccepted = PresentMultiplayerMatch;
+            MultiplayerClient.PresentMatch = PresentMultiplayerMatch;
 
             // make config aware of how to lookup skins for on-screen display purposes.
             // if this becomes a more common thing, tracked settings should be reconsidered to allow local DI.

From 5f62c225bf7e7b03950aa931962a2fc168216ffe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 18:07:03 +0900
Subject: [PATCH 1786/2100] Ad localisation (and adjust messaging) of invite
 failures

---
 osu.Game/Localisation/OnlinePlayStrings.cs            | 10 ++++++++++
 .../Online/Multiplayer/OnlineMultiplayerClient.cs     | 11 +++--------
 osu.Game/Online/Multiplayer/UserBlockedException.cs   |  2 +-
 osu.Game/Online/Multiplayer/UserBlocksPMsException.cs |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Localisation/OnlinePlayStrings.cs b/osu.Game/Localisation/OnlinePlayStrings.cs
index 1853cb753a..1918519d36 100644
--- a/osu.Game/Localisation/OnlinePlayStrings.cs
+++ b/osu.Game/Localisation/OnlinePlayStrings.cs
@@ -14,6 +14,16 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString SupporterOnlyDurationNotice => new TranslatableString(getKey(@"supporter_only_duration_notice"), @"Playlist durations longer than 2 weeks require an active osu!supporter tag.");
 
+        /// <summary>
+        /// "Can&#39;t invite this user as you have blocked them or they have blocked you."
+        /// </summary>
+        public static LocalisableString InviteFailedUserBlocked => new TranslatableString(getKey(@"cant_invite_this_user_as"), @"Can't invite this user as you have blocked them or they have blocked you.");
+
+        /// <summary>
+        /// "Can&#39;t invite this user as they have opted out of non-friend communications."
+        /// </summary>
+        public static LocalisableString InviteFailedUserOptOut => new TranslatableString(getKey(@"cant_invite_this_user_as1"), @"Can't invite this user as they have opted out of non-friend communications.");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 08e82f2ad3..20ec030eac 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -13,6 +13,7 @@ using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Localisation;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -124,17 +125,11 @@ namespace osu.Game.Online.Multiplayer
                 switch (exception.GetHubExceptionMessage())
                 {
                     case UserBlockedException.MESSAGE:
-                        PostNotification?.Invoke(new SimpleErrorNotification
-                        {
-                            Text = "User cannot be invited by someone they have blocked or are blocked by."
-                        });
+                        PostNotification?.Invoke(new SimpleErrorNotification { Text = OnlinePlayStrings.InviteFailedUserBlocked });
                         break;
 
                     case UserBlocksPMsException.MESSAGE:
-                        PostNotification?.Invoke(new SimpleErrorNotification
-                        {
-                            Text = "User cannot be invited because they cannot receive private messages from people not on their friends list."
-                        });
+                        PostNotification?.Invoke(new SimpleErrorNotification { Text = OnlinePlayStrings.InviteFailedUserOptOut });
                         break;
                 }
             }
diff --git a/osu.Game/Online/Multiplayer/UserBlockedException.cs b/osu.Game/Online/Multiplayer/UserBlockedException.cs
index f2b69411c7..e964b13c75 100644
--- a/osu.Game/Online/Multiplayer/UserBlockedException.cs
+++ b/osu.Game/Online/Multiplayer/UserBlockedException.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Online.Multiplayer
     [Serializable]
     public class UserBlockedException : HubException
     {
-        public const string MESSAGE = "User cannot be invited by someone they have blocked or are blocked by.";
+        public const string MESSAGE = @"Cannot perform action due to user being blocked.";
 
         public UserBlockedException()
             : base(MESSAGE)
diff --git a/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
index 0fd4e1f0c1..14ed6fc212 100644
--- a/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
+++ b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Online.Multiplayer
     [Serializable]
     public class UserBlocksPMsException : HubException
     {
-        public const string MESSAGE = "User cannot be invited because they have disabled private messages.";
+        public const string MESSAGE = "Cannot perform action because user has disabled non-friend communications.";
 
         public UserBlocksPMsException()
             : base(MESSAGE)

From a591af2b9754af0cd09ad5b1c1e28b2f07235c19 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 18:11:04 +0900
Subject: [PATCH 1787/2100] Fix too many tasks in `lookupRoom` method

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 978eee505c..dd131ee2e6 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -448,7 +448,7 @@ namespace osu.Game.Online.Multiplayer
         async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password)
         {
             APIUser? apiUser = await userLookupCache.GetUserAsync(invitedBy);
-            Room? apiRoom = await lookupRoom(roomID);
+            Room? apiRoom = await getRoomAsync(roomID);
 
             if (apiUser == null || apiRoom == null) return;
 
@@ -462,23 +462,19 @@ namespace osu.Game.Online.Multiplayer
                     }
                 }
             );
-        }
 
-        private Task<Room?> lookupRoom(long id)
-        {
-            return Task.Run(() =>
+            Task<Room?> getRoomAsync(long id)
             {
-                var t = new TaskCompletionSource<Room?>();
+                TaskCompletionSource<Room?> taskCompletionSource = new TaskCompletionSource<Room?>();
+
                 var request = new GetRoomRequest(id);
-
-                request.Success += room => t.TrySetResult(room);
-
-                request.Failure += e => t.TrySetResult(null);
+                request.Success += room => taskCompletionSource.TrySetResult(room);
+                request.Failure += _ => taskCompletionSource.TrySetResult(null);
 
                 API.Queue(request);
 
-                return t.Task;
-            });
+                return taskCompletionSource.Task;
+            }
         }
 
         private void addUserToAPIRoom(MultiplayerRoomUser user)

From e48c4fa430ca938b9c3648f906ac36525d770a32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 18:15:15 +0900
Subject: [PATCH 1788/2100] Add missing `ConfigureAwait` calls

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index dd131ee2e6..515a0dda08 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -447,8 +447,8 @@ namespace osu.Game.Online.Multiplayer
 
         async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password)
         {
-            APIUser? apiUser = await userLookupCache.GetUserAsync(invitedBy);
-            Room? apiRoom = await getRoomAsync(roomID);
+            APIUser? apiUser = await userLookupCache.GetUserAsync(invitedBy).ConfigureAwait(false);
+            Room? apiRoom = await getRoomAsync(roomID).ConfigureAwait(false);
 
             if (apiUser == null || apiRoom == null) return;
 

From a42e75452ecfd88fb065eda4357a98dbc0c390c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 11:16:51 +0200
Subject: [PATCH 1789/2100] Remove remaining usages of `LargeTickHit` in mania

---
 .../Judgements/ManiaJudgement.cs                    |  6 ------
 osu.Game.Rulesets.Mania/ManiaRuleset.cs             | 13 -------------
 2 files changed, 19 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
index d28b7bdf58..2b75bcdc3d 100644
--- a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
@@ -12,12 +12,6 @@ namespace osu.Game.Rulesets.Mania.Judgements
         {
             switch (result)
             {
-                case HitResult.LargeTickHit:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
-
-                case HitResult.LargeTickMiss:
-                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.1;
-
                 case HitResult.Meh:
                     return -DEFAULT_MAX_HEALTH_INCREASE * 0.5;
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index b977c07dfb..ff34b69d19 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -385,22 +385,9 @@ namespace osu.Game.Rulesets.Mania
                 HitResult.Good,
                 HitResult.Ok,
                 HitResult.Meh,
-
-                HitResult.LargeTickHit,
             };
         }
 
-        public override LocalisableString GetDisplayNameForHitResult(HitResult result)
-        {
-            switch (result)
-            {
-                case HitResult.LargeTickHit:
-                    return "hold tick";
-            }
-
-            return base.GetDisplayNameForHitResult(result);
-        }
-
         public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
         {
             new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)

From fc1287b4c695d821465984f0a2835e17e6ad0f02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 18:25:20 +0900
Subject: [PATCH 1790/2100] Reword xmldoc on invite method to better describe
 what is happening

---
 osu.Game/Online/Multiplayer/IMultiplayerClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index ba9e8a237c..327fb0d76a 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Online.Multiplayer
         Task UserKicked(MultiplayerRoomUser user);
 
         /// <summary>
-        /// Signals that a user has been invited into a multiplayer room.
+        /// Signals that the local user has been invited into a multiplayer room.
         /// </summary>
         /// <param name="invitedBy">Id of user that invited the player.</param>
         /// <param name="roomID">Id of the room the user got invited to.</param>

From 34bab38e80bb2bc410b9ef2cb876ca0d2020a4a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 11:34:59 +0200
Subject: [PATCH 1791/2100] Fix judgement counter test failure due to
 exploiting mania ruleset

Large ticks are not a thing in mania anymore, so the judgement counter
tests began to fail as `LargeTickHit` is no longer a valid hit result
in that ruleset.
---
 osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
index f117569657..dae6dc7b4b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
@@ -11,8 +11,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD.JudgementCounter;
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             };
         });
 
-        protected override Ruleset CreateRuleset() => new ManiaRuleset();
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
 
         private void applyOneJudgement(HitResult result)
         {

From 1ce268be3fe04c62b0bdae4ed100aa07011d500e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 18:58:42 +0900
Subject: [PATCH 1792/2100] Update some packages to match
 `osu.Server.Spectator`

---
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj |  2 +-
 osu.Game/osu.Game.csproj                       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index febe353b81..5de21a68d0 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
     <PackageReference Include="nunit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 69675e9c1b..f0a4b38c03 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,13 +21,13 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="AutoMapper" Version="12.0.1" />
     <PackageReference Include="DiffPlex" Version="1.7.1" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.53" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
-    <PackageReference Include="MessagePack" Version="2.5.124" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.11" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.11" />
+    <PackageReference Include="MessagePack" Version="2.5.129" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.12" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.12" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.12" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.12" />
     <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" />
@@ -38,8 +38,8 @@
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
-    <PackageReference Include="Sentry" Version="3.39.1" />
-    <PackageReference Include="SharpCompress" Version="0.33.0" />
+    <PackageReference Include="Sentry" Version="3.40.0" />
+    <PackageReference Include="SharpCompress" Version="0.34.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.6" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 32eda99c3a985fb88ba59cbffe0627eaab724b7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 19:06:19 +0900
Subject: [PATCH 1793/2100] Add missing xmldoc returns

---
 osu.Game/Screens/Play/Player.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ad796744fc..54693a95cc 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -671,6 +671,7 @@ namespace osu.Game.Screens.Play
         /// <remarks>This can be called from a child screen in order to trigger the restart process.</remarks>
         /// </summary>
         /// <param name="quickRestart">Whether a quick restart was requested (skipping intro etc.).</param>
+        /// <returns>Whether this call resulted in a restart.</returns>
         public bool Restart(bool quickRestart = false)
         {
             if (!Configuration.AllowRestart)

From d174a6ce613c39efd24ec8167288a453d58dd90f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 19:09:43 +0900
Subject: [PATCH 1794/2100] Remove dead code which was only there for the
 exit-specific scenario

---
 osu.Game/Screens/Play/Player.cs       | 38 ++++++++++++---------------
 osu.Game/Screens/Play/PlayerLoader.cs |  2 ++
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 54693a95cc..50ebe8cd86 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -572,18 +572,6 @@ namespace osu.Game.Screens.Play
         /// <returns>Whether this call resulted in a final exit.</returns>
         protected bool PerformExit(bool showDialogFirst)
         {
-            // there is a chance that an exit request occurs after the transition to results has already started.
-            // even in such a case, the user has shown intent, so forcefully return to this screen (to proceed with the upwards exit process).
-            if (!this.IsCurrentScreen())
-            {
-                ValidForResume = false;
-
-                // in the potential case that this instance has already been exited, this is required to avoid a crash.
-                if (this.GetChildScreen() != null)
-                    this.MakeCurrent();
-                return true;
-            }
-
             bool pauseOrFailDialogVisible =
                 PauseOverlay.State.Value == Visibility.Visible || FailOverlay.State.Value == Visibility.Visible;
 
@@ -617,11 +605,16 @@ namespace osu.Game.Screens.Play
             // import current score if possible.
             prepareAndImportScoreAsync();
 
-            // The actual exit is performed if
-            // - the pause / fail dialog was not requested
-            // - the pause / fail dialog was requested but is already displayed (user showing intention to exit).
-            // - the pause / fail dialog was requested but couldn't be displayed due to the type or state of this Player instance.
-            this.Exit();
+            // Screen may not be current if a restart has been performed.
+            if (this.IsCurrentScreen())
+            {
+                // The actual exit is performed if
+                // - the pause / fail dialog was not requested
+                // - the pause / fail dialog was requested but is already displayed (user showing intention to exit).
+                // - the pause / fail dialog was requested but couldn't be displayed due to the type or state of this Player instance.
+                this.Exit();
+            }
+
             return true;
         }
 
@@ -741,9 +734,6 @@ namespace osu.Game.Screens.Play
             // is no chance that a user could return to the (already completed) Player instance from a child screen.
             ValidForResume = false;
 
-            if (!Configuration.ShowResults)
-                return;
-
             bool storyboardStillRunning = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
 
             // If the current beatmap has a storyboard, this method will be called again on storyboard completion.
@@ -766,10 +756,16 @@ namespace osu.Game.Screens.Play
         /// <param name="withDelay">Whether a minimum delay (<see cref="RESULTS_DISPLAY_DELAY"/>) should be added before the screen is displayed.</param>
         private void progressToResults(bool withDelay)
         {
-            resultsDisplayDelegate?.Cancel();
+            if (!Configuration.ShowResults)
+                return;
+
+            // Setting this early in the process means that even if something were to go wrong in the order of events following, there
+            // is no chance that a user could return to the (already completed) Player instance from a child screen.
+            ValidForResume = false;
 
             double delay = withDelay ? RESULTS_DISPLAY_DELAY : 0;
 
+            resultsDisplayDelegate?.Cancel();
             resultsDisplayDelegate = new ScheduledDelegate(() =>
             {
                 if (prepareScoreForDisplayTask == null)
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 4054e456b9..681189d184 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -414,6 +414,8 @@ namespace osu.Game.Screens.Play
             quickRestart = quickRestartRequested;
             hideOverlays = true;
             ValidForResume = true;
+
+            this.MakeCurrent();
         }
 
         private void contentIn()

From fa47309eeffbeba428af323b1ce317f4b761b63f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 19:26:32 +0900
Subject: [PATCH 1795/2100] Fix exit key during storyboard outro not
 progressing to results

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs           | 4 ++--
 osu.Game/Screens/Play/Player.cs                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 09f729e468..98825b27d4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -72,12 +72,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestStoryboardExitDuringOutroStillExits()
+        public void TestStoryboardExitDuringOutroProgressesToResults()
         {
             CreateTest();
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
-            AddAssert("player exited", () => !Player.IsCurrentScreen() && Player.GetChildScreen() == null);
+            AddUntilStep("reached results screen", () => Stack.CurrentScreen is ResultsScreen);
         }
 
         [TestCase(false)]
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 50ebe8cd86..97bfa35d49 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -596,7 +596,7 @@ namespace osu.Game.Screens.Play
 
             // Matching osu!stable behaviour, if the results screen is pending and the user requests an exit,
             // show the results instead.
-            if (resultsDisplayDelegate != null && !isRestarting)
+            if (GameplayState.HasPassed && !isRestarting)
             {
                 progressToResults(false);
                 return false;

From 3849b1164436d227f2418a645d062c96711934e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 19:48:45 +0900
Subject: [PATCH 1796/2100] Fix "Hard Rock" mod affecting CS/AR in osu!mania

Closes https://github.com/ppy/osu/issues/25090.

Not sure if there are other exceptions we should account for here.
---
 osu.Game.Rulesets.Catch/Mods/CatchModHardRock.cs | 9 +++++++++
 osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs     | 9 +++++++++
 osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs | 3 +++
 osu.Game/Rulesets/Mods/ModHardRock.cs            | 9 ++++-----
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHardRock.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHardRock.cs
index 93eadcc13e..62fded0980 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHardRock.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHardRock.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.Beatmaps;
 using osu.Game.Rulesets.Catch.Beatmaps;
@@ -16,5 +17,13 @@ namespace osu.Game.Rulesets.Catch.Mods
             var catchProcessor = (CatchBeatmapProcessor)beatmapProcessor;
             catchProcessor.HardRockOffsets = true;
         }
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            base.ApplyToDifficulty(difficulty);
+
+            difficulty.CircleSize = Math.Min(difficulty.CircleSize * 1.3f, 10.0f); // CS uses a custom 1.3 ratio.
+            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ADJUST_RATIO, 10.0f);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
index 19d4a1bf83..d24597eeed 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
@@ -22,5 +23,13 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             OsuHitObjectGenerationUtils.ReflectVerticallyAlongPlayfield(osuObject);
         }
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            base.ApplyToDifficulty(difficulty);
+
+            difficulty.CircleSize = Math.Min(difficulty.CircleSize * 1.3f, 10.0f); // CS uses a custom 1.3 ratio.
+            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ADJUST_RATIO, 10.0f);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
index ba41175461..37a630c8ad 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.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.Beatmaps;
 using osu.Game.Rulesets.Mods;
 
@@ -23,7 +24,9 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
             base.ApplyToDifficulty(difficulty);
+
             difficulty.SliderMultiplier *= slider_multiplier;
+            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ADJUST_RATIO, 10.0f);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHardRock.cs b/osu.Game/Rulesets/Mods/ModHardRock.cs
index 2886e59c54..4b2d1d050e 100644
--- a/osu.Game/Rulesets/Mods/ModHardRock.cs
+++ b/osu.Game/Rulesets/Mods/ModHardRock.cs
@@ -18,17 +18,16 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Everything just got a bit harder...";
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModDifficultyAdjust) };
 
+        protected const float ADJUST_RATIO = 1.4f;
+
         public void ReadFromDifficulty(IBeatmapDifficultyInfo difficulty)
         {
         }
 
         public virtual void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
-            const float ratio = 1.4f;
-            difficulty.CircleSize = Math.Min(difficulty.CircleSize * 1.3f, 10.0f); // CS uses a custom 1.3 ratio.
-            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ratio, 10.0f);
-            difficulty.DrainRate = Math.Min(difficulty.DrainRate * ratio, 10.0f);
-            difficulty.OverallDifficulty = Math.Min(difficulty.OverallDifficulty * ratio, 10.0f);
+            difficulty.DrainRate = Math.Min(difficulty.DrainRate * ADJUST_RATIO, 10.0f);
+            difficulty.OverallDifficulty = Math.Min(difficulty.OverallDifficulty * ADJUST_RATIO, 10.0f);
         }
     }
 }

From 2a0e4c364d11c681b4a8ada723f56b0f1687666d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 14:06:39 +0200
Subject: [PATCH 1797/2100] Add method to unmap `RealmKeyBinding.Action` to
 actual enum-typed value

---
 osu.Game.Tests/Input/RealmKeyBindingTest.cs | 48 +++++++++++++++++++++
 osu.Game/Input/Bindings/RealmKeyBinding.cs  | 24 +++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 osu.Game.Tests/Input/RealmKeyBindingTest.cs

diff --git a/osu.Game.Tests/Input/RealmKeyBindingTest.cs b/osu.Game.Tests/Input/RealmKeyBindingTest.cs
new file mode 100644
index 0000000000..366d5ea825
--- /dev/null
+++ b/osu.Game.Tests/Input/RealmKeyBindingTest.cs
@@ -0,0 +1,48 @@
+// Copyright (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.Input.Bindings;
+using osu.Framework.Testing;
+using osu.Game.Input.Bindings;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
+using osu.Game.Tests.Visual;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Input
+{
+    [HeadlessTest]
+    public partial class RealmKeyBindingTest : OsuTestScene
+    {
+        [Resolved]
+        private RulesetStore rulesets { get; set; } = null!;
+
+        [Test]
+        public void TestUnmapGlobalAction()
+        {
+            var keyBinding = new RealmKeyBinding(GlobalAction.ToggleReplaySettings, KeyCombination.FromKey(Key.Z));
+
+            AddAssert("action is integer", () => keyBinding.Action, () => Is.EqualTo((int)GlobalAction.ToggleReplaySettings));
+            AddAssert("action unmaps correctly", () => keyBinding.GetAction(rulesets), () => Is.EqualTo(GlobalAction.ToggleReplaySettings));
+        }
+
+        [TestCase(typeof(OsuRuleset), OsuAction.Smoke, null)]
+        [TestCase(typeof(TaikoRuleset), TaikoAction.LeftCentre, null)]
+        [TestCase(typeof(CatchRuleset), CatchAction.MoveRight, null)]
+        [TestCase(typeof(ManiaRuleset), ManiaAction.Key7, 7)]
+        public void TestUnmapRulesetActions(Type rulesetType, object action, int? variant)
+        {
+            string rulesetName = ((Ruleset)Activator.CreateInstance(rulesetType)!).ShortName;
+            var keyBinding = new RealmKeyBinding(action, KeyCombination.FromKey(Key.Z), rulesetName, variant);
+
+            AddAssert("action is integer", () => keyBinding.Action, () => Is.EqualTo((int)action));
+            AddAssert("action unmaps correctly", () => keyBinding.GetAction(rulesets), () => Is.EqualTo(action));
+        }
+    }
+}
diff --git a/osu.Game/Input/Bindings/RealmKeyBinding.cs b/osu.Game/Input/Bindings/RealmKeyBinding.cs
index 4af0357535..28b142978b 100644
--- a/osu.Game/Input/Bindings/RealmKeyBinding.cs
+++ b/osu.Game/Input/Bindings/RealmKeyBinding.cs
@@ -2,9 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Input.Bindings;
 using osu.Game.Database;
+using osu.Game.Rulesets;
 using Realms;
 
 namespace osu.Game.Input.Bindings
@@ -26,6 +28,13 @@ namespace osu.Game.Input.Bindings
             set => KeyCombinationString = value.ToString();
         }
 
+        /// <summary>
+        /// The resultant action which is triggered by this binding.
+        /// </summary>
+        /// <remarks>
+        /// This implementation always returns an integer.
+        /// If wanting to get the actual enum-typed value, use <see cref="GetAction"/>.
+        /// </remarks>
         [Ignored]
         public object Action
         {
@@ -53,5 +62,20 @@ namespace osu.Game.Input.Bindings
         private RealmKeyBinding()
         {
         }
+
+        public object GetAction(RulesetStore rulesets)
+        {
+            if (string.IsNullOrEmpty(RulesetName))
+                return (GlobalAction)ActionInt;
+
+            var ruleset = rulesets.GetRuleset(RulesetName);
+            var actionType = ruleset!.CreateInstance()
+                                     .GetDefaultKeyBindings(Variant ?? 0)
+                                     .First() // let's just assume nobody does something stupid like mix multiple types...
+                                     .Action
+                                     .GetType();
+
+            return Enum.ToObject(actionType, ActionInt);
+        }
     }
 }

From 1c784c9abec3ca18a566b2bff1be2fd2fa7467aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 14:24:21 +0200
Subject: [PATCH 1798/2100] Add API for retrieving global key bindings per
 section

---
 .../Input/Bindings/GlobalActionContainer.cs   | 59 ++++++++++++++++---
 .../Input/GlobalKeyBindingsSection.cs         | 14 ++---
 2 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 296232d9ea..9419bd2a0e 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.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.Input;
@@ -37,7 +38,7 @@ namespace osu.Game.Input.Bindings
                                                                        // based on such usages potentially requiring a lot more key bindings that may be "shared" with global ones.
                                                                        .Concat(OverlayKeyBindings);
 
-        public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
+        public static IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {
             new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
             new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
@@ -67,7 +68,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F12, GlobalAction.TakeScreenshot),
         };
 
-        public IEnumerable<KeyBinding> OverlayKeyBindings => new[]
+        public static IEnumerable<KeyBinding> OverlayKeyBindings => new[]
         {
             new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
             new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
@@ -77,7 +78,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
         };
 
-        public IEnumerable<KeyBinding> EditorKeyBindings => new[]
+        public static IEnumerable<KeyBinding> EditorKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.F1 }, GlobalAction.EditorComposeMode),
             new KeyBinding(new[] { InputKey.F2 }, GlobalAction.EditorDesignMode),
@@ -101,7 +102,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.R }, GlobalAction.EditorToggleRotateControl),
         };
 
-        public IEnumerable<KeyBinding> InGameKeyBindings => new[]
+        public static IEnumerable<KeyBinding> InGameKeyBindings => new[]
         {
             new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene),
             new KeyBinding(InputKey.ExtraMouseButton2, GlobalAction.SkipCutscene),
@@ -118,7 +119,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F2, GlobalAction.ExportReplay),
         };
 
-        public IEnumerable<KeyBinding> ReplayKeyBindings => new[]
+        public static IEnumerable<KeyBinding> ReplayKeyBindings => new[]
         {
             new KeyBinding(InputKey.Space, GlobalAction.TogglePauseReplay),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.TogglePauseReplay),
@@ -127,7 +128,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.H }, GlobalAction.ToggleReplaySettings),
         };
 
-        public IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
+        public static IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
         {
             new KeyBinding(InputKey.F1, GlobalAction.ToggleModSelection),
             new KeyBinding(InputKey.F2, GlobalAction.SelectNextRandom),
@@ -136,7 +137,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.BackSpace, GlobalAction.DeselectAllMods),
         };
 
-        public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
+        public static IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.Alt, InputKey.Up }, GlobalAction.IncreaseVolume),
             new KeyBinding(new[] { InputKey.Alt, InputKey.Down }, GlobalAction.DecreaseVolume),
@@ -154,6 +155,39 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
         };
 
+        public static IEnumerable<KeyBinding> GetDefaultBindingsFor(GlobalActionCategory category)
+        {
+            switch (category)
+            {
+                case GlobalActionCategory.General:
+                    return GlobalKeyBindings;
+
+                case GlobalActionCategory.Editor:
+                    return EditorKeyBindings;
+
+                case GlobalActionCategory.InGame:
+                    return InGameKeyBindings;
+
+                case GlobalActionCategory.Replay:
+                    return ReplayKeyBindings;
+
+                case GlobalActionCategory.SongSelect:
+                    return SongSelectKeyBindings;
+
+                case GlobalActionCategory.AudioControl:
+                    return AudioControlKeyBindings;
+
+                case GlobalActionCategory.Overlays:
+                    return OverlayKeyBindings;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(category), category, $"Unexpected {nameof(GlobalActionCategory)}");
+            }
+        }
+
+        public static IEnumerable<GlobalAction> GetGlobalActionsFor(GlobalActionCategory category)
+            => GetDefaultBindingsFor(category).Select(binding => binding.Action).Cast<GlobalAction>().Distinct();
+
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) => handler?.OnPressed(e) == true;
 
         public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => handler?.OnReleased(e);
@@ -365,4 +399,15 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorToggleRotateControl))]
         EditorToggleRotateControl,
     }
+
+    public enum GlobalActionCategory
+    {
+        General,
+        Editor,
+        InGame,
+        Replay,
+        SongSelect,
+        AudioControl,
+        Overlays
+    }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
index 291e9a93cf..c1e7cf160f 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public DefaultBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.GlobalKeyBindings;
+                Defaults = GlobalActionContainer.GlobalKeyBindings;
             }
         }
 
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public OverlayBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.OverlayKeyBindings;
+                Defaults = GlobalActionContainer.OverlayKeyBindings;
             }
         }
 
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public SongSelectKeyBindingSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.SongSelectKeyBindings;
+                Defaults = GlobalActionContainer.SongSelectKeyBindings;
             }
         }
 
@@ -69,7 +69,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public InGameKeyBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.InGameKeyBindings;
+                Defaults = GlobalActionContainer.InGameKeyBindings;
             }
         }
 
@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public ReplayKeyBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.ReplayKeyBindings;
+                Defaults = GlobalActionContainer.ReplayKeyBindings;
             }
         }
 
@@ -91,7 +91,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public AudioControlKeyBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.AudioControlKeyBindings;
+                Defaults = GlobalActionContainer.AudioControlKeyBindings;
             }
         }
 
@@ -102,7 +102,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public EditorKeyBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.EditorKeyBindings;
+                Defaults = GlobalActionContainer.EditorKeyBindings;
             }
         }
     }

From c2e92cbb704aa79f0c8b6ab04ad675ccd45f3075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 14:51:19 +0200
Subject: [PATCH 1799/2100] Refactor key binding panel leveraging new helper
 methods

---
 .../Input/GlobalKeyBindingsSection.cs         | 96 +++----------------
 .../Input/GlobalKeyBindingsSubsection.cs      | 36 +++++++
 .../Sections/Input/KeyBindingPanel.cs         |  5 +-
 .../Settings/Sections/Input/KeyBindingRow.cs  |  2 +-
 .../Sections/Input/KeyBindingsSubsection.cs   | 36 ++++---
 .../Sections/Input/RulesetBindingsSection.cs  |  5 +
 .../Input/VariantBindingsSubsection.cs        | 25 ++++-
 7 files changed, 97 insertions(+), 108 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSubsection.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
index c1e7cf160f..5a05d78905 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.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.Sprites;
 using osu.Framework.Localisation;
@@ -18,92 +19,19 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public override LocalisableString Header => InputSettingsStrings.GlobalKeyBindingHeader;
 
-        public GlobalKeyBindingsSection(GlobalActionContainer manager)
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            Add(new DefaultBindingsSubsection(manager));
-            Add(new OverlayBindingsSubsection(manager));
-            Add(new AudioControlKeyBindingsSubsection(manager));
-            Add(new SongSelectKeyBindingSubsection(manager));
-            Add(new InGameKeyBindingsSubsection(manager));
-            Add(new ReplayKeyBindingsSubsection(manager));
-            Add(new EditorKeyBindingsSubsection(manager));
-        }
-
-        private partial class DefaultBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => string.Empty;
-
-            public DefaultBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
+            AddRange(new[]
             {
-                Defaults = GlobalActionContainer.GlobalKeyBindings;
-            }
-        }
-
-        private partial class OverlayBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.OverlaysSection;
-
-            public OverlayBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.OverlayKeyBindings;
-            }
-        }
-
-        private partial class SongSelectKeyBindingSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.SongSelectSection;
-
-            public SongSelectKeyBindingSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.SongSelectKeyBindings;
-            }
-        }
-
-        private partial class InGameKeyBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.InGameSection;
-
-            public InGameKeyBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.InGameKeyBindings;
-            }
-        }
-
-        private partial class ReplayKeyBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.ReplaySection;
-
-            public ReplayKeyBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.ReplayKeyBindings;
-            }
-        }
-
-        private partial class AudioControlKeyBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.AudioSection;
-
-            public AudioControlKeyBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.AudioControlKeyBindings;
-            }
-        }
-
-        private partial class EditorKeyBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.EditorSection;
-
-            public EditorKeyBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.EditorKeyBindings;
-            }
+                new GlobalKeyBindingsSubsection(string.Empty, GlobalActionCategory.General),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.OverlaysSection, GlobalActionCategory.Overlays),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.AudioSection, GlobalActionCategory.AudioControl),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.SongSelectSection, GlobalActionCategory.SongSelect),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.InGameSection, GlobalActionCategory.InGame),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.ReplaySection, GlobalActionCategory.Replay),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.EditorSection, GlobalActionCategory.Editor),
+            });
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSubsection.cs
new file mode 100644
index 0000000000..2e42e46330
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSubsection.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.Collections.Generic;
+using System.Linq;
+using osu.Framework.Localisation;
+using osu.Game.Database;
+using osu.Game.Input.Bindings;
+using Realms;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public partial class GlobalKeyBindingsSubsection : KeyBindingsSubsection
+    {
+        protected override LocalisableString Header { get; }
+
+        private readonly GlobalActionCategory category;
+
+        public GlobalKeyBindingsSubsection(LocalisableString header, GlobalActionCategory category)
+        {
+            Header = header;
+            this.category = category;
+            Defaults = GlobalActionContainer.GetDefaultBindingsFor(category);
+        }
+
+        protected override IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm)
+        {
+            var bindings = realm.All<RealmKeyBinding>()
+                                .Where(b => b.RulesetName == null && b.Variant == null)
+                                .Detach();
+
+            var actionsInSection = GlobalActionContainer.GetGlobalActionsFor(category).Cast<int>().ToHashSet();
+            return bindings.Where(kb => actionsInSection.Contains(kb.ActionInt));
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs
index 7296003c7f..4c5610a15e 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Rulesets;
 
@@ -14,9 +13,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         protected override Drawable CreateHeader() => new SettingsHeader(InputSettingsStrings.KeyBindingPanelHeader, InputSettingsStrings.KeyBindingPanelDescription);
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(RulesetStore rulesets, GlobalActionContainer global)
+        private void load(RulesetStore rulesets)
         {
-            AddSection(new GlobalKeyBindingsSection(global));
+            AddSection(new GlobalKeyBindingsSection());
 
             foreach (var ruleset in rulesets.AvailableRulesets)
                 AddSection(new RulesetBindingsSection(ruleset));
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index c0de7a1d16..2e44d8b02d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
         /// </summary>
-        public Action<KeyBindingRow>? BindingUpdated { get; init; }
+        public Action<KeyBindingRow>? BindingUpdated { get; set; }
 
         /// <summary>
         /// Whether left and right mouse button clicks should be included in the edited bindings.
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index 8285204bb3..1ad9442631 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -11,9 +11,9 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Localisation;
 using osu.Game.Database;
 using osu.Game.Input.Bindings;
-using osu.Game.Rulesets;
 using osu.Game.Localisation;
 using osuTK;
+using Realms;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -27,37 +27,26 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected IEnumerable<KeyBinding> Defaults { get; init; } = Array.Empty<KeyBinding>();
 
-        public RulesetInfo? Ruleset { get; protected set; }
-
-        private readonly int? variant;
-
-        protected KeyBindingsSubsection(int? variant)
+        protected KeyBindingsSubsection()
         {
-            this.variant = variant;
-
             FlowContent.Spacing = new Vector2(0, 3);
         }
 
         [BackgroundDependencyLoader]
         private void load(RealmAccess realm)
         {
-            string? rulesetName = Ruleset?.ShortName;
-
-            var bindings = realm.Run(r => r.All<RealmKeyBinding>()
-                                           .Where(b => b.RulesetName == rulesetName && b.Variant == variant)
-                                           .Detach());
+            var bindings = realm.Run(r => GetKeyBindings(r).Detach());
 
             foreach (var defaultGroup in Defaults.GroupBy(d => d.Action))
             {
                 int intKey = (int)defaultGroup.Key;
 
                 // one row per valid action.
-                Add(new KeyBindingRow(defaultGroup.Key, bindings.Where(b => b.ActionInt.Equals(intKey)).ToList())
-                {
-                    AllowMainMouseButtons = Ruleset != null,
-                    Defaults = defaultGroup.Select(d => d.KeyCombination),
-                    BindingUpdated = onBindingUpdated
-                });
+                Add(CreateKeyBindingRow(
+                        defaultGroup.Key,
+                        bindings.Where(b => b.ActionInt.Equals(intKey)).ToList(),
+                        defaultGroup)
+                    .With(row => row.BindingUpdated = onBindingUpdated));
             }
 
             Add(new ResetButton
@@ -66,6 +55,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             });
         }
 
+        protected abstract IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm);
+
+        protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<RealmKeyBinding> keyBindings, IEnumerable<KeyBinding> defaults)
+            => new KeyBindingRow(action, keyBindings.ToList())
+            {
+                AllowMainMouseButtons = false,
+                Defaults = defaults.Select(d => d.KeyCombination),
+            };
+
         private void onBindingUpdated(KeyBindingRow sender)
         {
             if (AutoAdvanceTarget)
diff --git a/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs b/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
index 3b5002b423..f326592016 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.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.Localisation;
 using osu.Game.Rulesets;
@@ -18,7 +19,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public RulesetBindingsSection(RulesetInfo ruleset)
         {
             this.ruleset = ruleset;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             var r = ruleset.CreateInstance();
 
             foreach (int variant in r.AvailableVariants)
diff --git a/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
index d00de7f549..46da8a1453 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
@@ -1,8 +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 System.Linq;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Localisation;
+using osu.Game.Input.Bindings;
 using osu.Game.Rulesets;
+using Realms;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -12,15 +17,33 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected override LocalisableString Header { get; }
 
+        public RulesetInfo Ruleset { get; }
+        private readonly int variant;
+
         public VariantBindingsSubsection(RulesetInfo ruleset, int variant)
-            : base(variant)
         {
             Ruleset = ruleset;
+            this.variant = variant;
 
             var rulesetInstance = ruleset.CreateInstance();
 
             Header = rulesetInstance.GetVariantName(variant);
             Defaults = rulesetInstance.GetDefaultKeyBindings(variant);
         }
+
+        protected override IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm)
+        {
+            string rulesetName = Ruleset.ShortName;
+
+            return realm.All<RealmKeyBinding>()
+                        .Where(b => b.RulesetName == rulesetName && b.Variant == variant);
+        }
+
+        protected override KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<RealmKeyBinding> keyBindings, IEnumerable<KeyBinding> defaults)
+            => new KeyBindingRow(action, keyBindings.ToList())
+            {
+                AllowMainMouseButtons = true,
+                Defaults = defaults.Select(d => d.KeyCombination),
+            };
     }
 }

From 5f0b1d69a508925fd326a374e119a2ec7dba2532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 11:08:10 +0200
Subject: [PATCH 1800/2100] Prepare `KeyBindingRow` for accepting external
 changes

---
 .../Settings/TestSceneKeyBindingPanel.cs      |  4 +-
 .../Visual/Settings/TestSceneKeyBindingRow.cs | 60 +++++++++++++++++++
 .../Settings/Sections/Input/KeyBindingRow.cs  | 58 +++++++++++-------
 .../Sections/Input/KeyBindingsSubsection.cs   | 13 ++--
 .../Input/VariantBindingsSubsection.cs        |  4 +-
 5 files changed, 108 insertions(+), 31 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneKeyBindingRow.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 449ca0f258..5a001ca127 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -207,7 +207,7 @@ namespace osu.Game.Tests.Visual.Settings
             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)));
+                () => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.Value.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0)));
         }
 
         [Test]
@@ -237,7 +237,7 @@ namespace osu.Game.Tests.Visual.Settings
             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)));
+                () => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.Value.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0)));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingRow.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingRow.cs
new file mode 100644
index 0000000000..ff996a9ca1
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingRow.cs
@@ -0,0 +1,60 @@
+// Copyright (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.Input.Bindings;
+using osu.Framework.Testing;
+using osu.Game.Input.Bindings;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Settings.Sections.Input;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    public partial class TestSceneKeyBindingRow : OsuTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
+        [Test]
+        public void TestChangesAfterConstruction()
+        {
+            KeyBindingRow row = null!;
+
+            AddStep("create row", () => Child = new Container
+            {
+                Width = 500,
+                AutoSizeAxes = Axes.Y,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Child = row = new KeyBindingRow(GlobalAction.Back)
+                {
+                    Defaults = new[]
+                    {
+                        new KeyCombination(InputKey.Escape),
+                        new KeyCombination(InputKey.ExtraMouseButton1)
+                    }
+                }
+            });
+
+            AddStep("change key bindings", () =>
+            {
+                row.KeyBindings.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.Escape)));
+                row.KeyBindings.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.ExtraMouseButton1)));
+            });
+            AddUntilStep("revert to default button not shown", () => row.ChildrenOfType<RevertToDefaultButton<bool>>().Single().Alpha, () => Is.Zero);
+
+            AddStep("change key bindings", () =>
+            {
+                row.KeyBindings.Clear();
+                row.KeyBindings.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.X)));
+                row.KeyBindings.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.Z)));
+                row.KeyBindings.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.I)));
+            });
+            AddUntilStep("revert to default button not shown", () => row.ChildrenOfType<RevertToDefaultButton<bool>>().Single().Alpha, () => Is.Not.Zero);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 2e44d8b02d..0ba3dc9b9a 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -44,6 +44,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// </summary>
         public bool AllowMainMouseButtons { get; init; }
 
+        /// <summary>
+        /// The bindings to display in this row.
+        /// </summary>
+        public BindableList<RealmKeyBinding> KeyBindings { get; } = new BindableList<RealmKeyBinding>();
+
         /// <summary>
         /// The default key bindings for this row.
         /// </summary>
@@ -65,12 +70,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public bool FilteringActive { get; set; }
 
-        public IEnumerable<LocalisableString> FilterTerms => bindings.Select(b => (LocalisableString)keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text);
+        public IEnumerable<LocalisableString> FilterTerms => KeyBindings.Select(b => (LocalisableString)keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text);
 
         #endregion
 
         private readonly object action;
-        private readonly IEnumerable<RealmKeyBinding> bindings;
 
         private Bindable<bool> isDefault { get; } = new BindableBool(true);
 
@@ -101,11 +105,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// Creates a new <see cref="KeyBindingRow"/>.
         /// </summary>
         /// <param name="action">The action that this row contains bindings for.</param>
-        /// <param name="bindings">The keybindings to display in this row.</param>
-        public KeyBindingRow(object action, List<RealmKeyBinding> bindings)
+        public KeyBindingRow(object action)
         {
             this.action = action;
-            this.bindings = bindings;
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -191,10 +193,23 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 }
             };
 
-            foreach (var b in bindings)
-                buttons.Add(new KeyButton(b));
+            KeyBindings.BindCollectionChanged((_, _) =>
+            {
+                Scheduler.AddOnce(updateButtons);
+                updateIsDefaultValue();
+            }, true);
+        }
 
-            updateIsDefaultValue();
+        private void updateButtons()
+        {
+            if (buttons.Count > KeyBindings.Count)
+                buttons.RemoveRange(buttons.Skip(KeyBindings.Count).ToArray(), true);
+
+            while (buttons.Count < KeyBindings.Count)
+                buttons.Add(new KeyButton());
+
+            foreach (var (button, binding) in buttons.Zip(KeyBindings))
+                button.KeyBinding.Value = binding;
         }
 
         public void RestoreDefaults()
@@ -472,11 +487,11 @@ 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.Value.ID)!.KeyCombinationString = button.KeyBinding.Value.KeyCombinationString);
 
         private void updateIsDefaultValue()
         {
-            isDefault.Value = bindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
+            isDefault.Value = KeyBindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
         }
 
         private partial class CancelButton : RoundedButton
@@ -499,7 +514,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public partial class KeyButton : Container
         {
-            public readonly RealmKeyBinding KeyBinding;
+            public Bindable<RealmKeyBinding> KeyBinding { get; } = new Bindable<RealmKeyBinding>();
 
             private readonly Box box;
             public readonly OsuSpriteText Text;
@@ -525,13 +540,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 }
             }
 
-            public KeyButton(RealmKeyBinding keyBinding)
+            public KeyButton()
             {
-                if (keyBinding.IsManaged)
-                    throw new ArgumentException("Key binding should not be attached as we make temporary changes", nameof(keyBinding));
-
-                KeyBinding = keyBinding;
-
                 Margin = new MarginPadding(padding);
 
                 Masking = true;
@@ -567,6 +577,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 base.LoadComplete();
 
+                KeyBinding.BindValueChanged(_ =>
+                {
+                    if (KeyBinding.Value.IsManaged)
+                        throw new ArgumentException("Key binding should not be attached as we make temporary changes", nameof(KeyBinding));
+
+                    updateKeyCombinationText();
+                });
                 keyCombinationProvider.KeymapChanged += updateKeyCombinationText;
                 updateKeyCombinationText();
             }
@@ -575,6 +592,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             private void load()
             {
                 updateHoverState();
+                FinishTransforms(true);
             }
 
             protected override bool OnHover(HoverEvent e)
@@ -613,10 +631,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             public void UpdateKeyCombination(KeyCombination newCombination)
             {
-                if (KeyBinding.RulesetName != null && !RealmKeyBindingStore.CheckValidForGameplay(newCombination))
+                if (KeyBinding.Value.RulesetName != null && !RealmKeyBindingStore.CheckValidForGameplay(newCombination))
                     return;
 
-                KeyBinding.KeyCombination = newCombination;
+                KeyBinding.Value.KeyCombination = newCombination;
                 updateKeyCombinationText();
             }
 
@@ -624,7 +642,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 Scheduler.AddOnce(updateText);
 
-                void updateText() => Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.KeyCombination);
+                void updateText() => Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.Value.KeyCombination);
             }
 
             protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index 1ad9442631..f7e36e0dd2 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -42,11 +42,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 int intKey = (int)defaultGroup.Key;
 
                 // one row per valid action.
-                Add(CreateKeyBindingRow(
-                        defaultGroup.Key,
-                        bindings.Where(b => b.ActionInt.Equals(intKey)).ToList(),
-                        defaultGroup)
-                    .With(row => row.BindingUpdated = onBindingUpdated));
+                var row = CreateKeyBindingRow(defaultGroup.Key, defaultGroup)
+                    .With(row => row.BindingUpdated = onBindingUpdated);
+                row.KeyBindings.AddRange(bindings.Where(b => b.ActionInt.Equals(intKey)));
+                Add(row);
             }
 
             Add(new ResetButton
@@ -57,8 +56,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected abstract IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm);
 
-        protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<RealmKeyBinding> keyBindings, IEnumerable<KeyBinding> defaults)
-            => new KeyBindingRow(action, keyBindings.ToList())
+        protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<KeyBinding> defaults)
+            => new KeyBindingRow(action)
             {
                 AllowMainMouseButtons = false,
                 Defaults = defaults.Select(d => d.KeyCombination),
diff --git a/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
index 46da8a1453..6db8aa7259 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
@@ -39,8 +39,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         .Where(b => b.RulesetName == rulesetName && b.Variant == variant);
         }
 
-        protected override KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<RealmKeyBinding> keyBindings, IEnumerable<KeyBinding> defaults)
-            => new KeyBindingRow(action, keyBindings.ToList())
+        protected override KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<KeyBinding> defaults)
+            => new KeyBindingRow(action)
             {
                 AllowMainMouseButtons = true,
                 Defaults = defaults.Select(d => d.KeyCombination),

From aa8dbd742e847fbb86ec19b84593b06c06745dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 11:25:19 +0200
Subject: [PATCH 1801/2100] Hoist database update to subsection level

The end goal here is to be able to better coordinate deconfliction of
bindings at the subsection level rather than try to jam that logic into
individual rows somehow.

The flipside is that this is going to require a flow to update the
individual rows after the subsection's intervention, but that's what the
previous commit was for.
---
 .../Settings/Sections/Input/KeyBindingRow.cs  | 21 +++++++------------
 .../Sections/Input/KeyBindingsSubsection.cs   |  9 ++++++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 0ba3dc9b9a..aab6ed6d74 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -18,7 +18,6 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -37,7 +36,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
         /// </summary>
-        public Action<KeyBindingRow>? BindingUpdated { get; set; }
+        public KeyBindingUpdated? BindingUpdated { get; set; }
+
+        public delegate void KeyBindingUpdated(KeyBindingRow sender, KeyBindingUpdatedEventArgs args);
+
+        public record KeyBindingUpdatedEventArgs(Guid KeyBindingID, string KeyCombinationString);
 
         /// <summary>
         /// Whether left and right mouse button clicks should be included in the edited bindings.
@@ -81,9 +84,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [Resolved]
         private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
 
-        [Resolved]
-        private RealmAccess realm { get; set; } = null!;
-
         private Container content = null!;
 
         private OsuSpriteText text = null!;
@@ -220,8 +220,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 var button = buttons[i++];
                 button.UpdateKeyCombination(d);
-
-                updateStoreFromButton(button);
+                finalise();
             }
 
             isDefault.Value = true;
@@ -437,17 +436,16 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             if (bindTarget != null)
             {
-                updateStoreFromButton(bindTarget);
-
                 updateIsDefaultValue();
 
                 bindTarget.IsBinding = false;
+                var args = new KeyBindingUpdatedEventArgs(bindTarget.KeyBinding.Value.ID, bindTarget.KeyBinding.Value.KeyCombinationString);
                 Schedule(() =>
                 {
                     // schedule to ensure we don't instantly get focus back on next OnMouseClick (see AcceptFocus impl.)
                     bindTarget = null;
                     if (hasChanged)
-                        BindingUpdated?.Invoke(this);
+                        BindingUpdated?.Invoke(this, args);
                 });
             }
 
@@ -486,9 +484,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (bindTarget != null) bindTarget.IsBinding = true;
         }
 
-        private void updateStoreFromButton(KeyButton button) =>
-            realm.WriteAsync(r => r.Find<RealmKeyBinding>(button.KeyBinding.Value.ID)!.KeyCombinationString = button.KeyBinding.Value.KeyCombinationString);
-
         private void updateIsDefaultValue()
         {
             isDefault.Value = KeyBindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index f7e36e0dd2..57f6e58058 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -27,13 +27,16 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected IEnumerable<KeyBinding> Defaults { get; init; } = Array.Empty<KeyBinding>();
 
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
+
         protected KeyBindingsSubsection()
         {
             FlowContent.Spacing = new Vector2(0, 3);
         }
 
         [BackgroundDependencyLoader]
-        private void load(RealmAccess realm)
+        private void load()
         {
             var bindings = realm.Run(r => GetKeyBindings(r).Detach());
 
@@ -63,8 +66,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Defaults = defaults.Select(d => d.KeyCombination),
             };
 
-        private void onBindingUpdated(KeyBindingRow sender)
+        private void onBindingUpdated(KeyBindingRow sender, KeyBindingRow.KeyBindingUpdatedEventArgs args)
         {
+            realm.WriteAsync(r => r.Find<RealmKeyBinding>(args.KeyBindingID)!.KeyCombinationString = args.KeyCombinationString);
+
             if (AutoAdvanceTarget)
             {
                 var next = Children.SkipWhile(c => c != sender).Skip(1).FirstOrDefault();

From 7b6563116ac9bfb57eacd19889d612d326f90489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 13:09:33 +0200
Subject: [PATCH 1802/2100] Implement visual appearance of key binding conflict
 popover

---
 .../TestSceneKeyBindingConflictPopover.cs     |  59 +++++
 .../Input/KeyBindingConflictPopover.cs        | 249 ++++++++++++++++++
 2 files changed, 308 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
new file mode 100644
index 0000000000..972e1cbe79
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
@@ -0,0 +1,59 @@
+// Copyright (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.Framework.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Bindings;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Settings.Sections.Input;
+using osu.Game.Rulesets.Osu;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    public partial class TestSceneKeyBindingConflictPopover : OsuTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
+        [Test]
+        public void TestAppearance()
+        {
+            ButtonWithConflictPopover button = null!;
+
+            AddStep("create content", () =>
+            {
+                Child = new PopoverContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = button = new ButtonWithConflictPopover
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Text = "Open popover",
+                        Width = 300
+                    }
+                };
+            });
+            AddStep("show popover", () => button.TriggerClick());
+        }
+
+        private partial class ButtonWithConflictPopover : RoundedButton, IHasPopover
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Action = this.ShowPopover;
+            }
+
+            public Popover GetPopover() => new KeyBindingConflictPopover(
+                OsuAction.LeftButton,
+                OsuAction.RightButton,
+                new KeyCombination(InputKey.Z));
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
new file mode 100644
index 0000000000..55b4ee3390
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -0,0 +1,249 @@
+// Copyright (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.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
+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.UserInterfaceV2;
+using osuTK;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public partial class KeyBindingConflictPopover : OsuPopover
+    {
+        private readonly object existingAction;
+        private readonly object newAction;
+        private readonly KeyCombination conflictingCombination;
+
+        private ConflictingKeyBindingPreview newPreview = null!;
+        private ConflictingKeyBindingPreview existingPreview = null!;
+        private HoverableRoundedButton keepExistingButton = null!;
+        private HoverableRoundedButton applyNewButton = null!;
+
+        public KeyBindingConflictPopover(object existingAction, object newAction, KeyCombination conflictingCombination)
+        {
+            this.existingAction = existingAction;
+            this.newAction = newAction;
+            this.conflictingCombination = conflictingCombination;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new FillFlowContainer
+            {
+                Width = 250,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(10),
+                Children = new Drawable[]
+                {
+                    new OsuTextFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Text = "The binding you've selected conflicts with another existing binding.",
+                        Margin = new MarginPadding { Bottom = 10 }
+                    },
+                    existingPreview = new ConflictingKeyBindingPreview(existingAction, conflictingCombination),
+                    newPreview = new ConflictingKeyBindingPreview(newAction, conflictingCombination),
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Margin = new MarginPadding { Top = 10 },
+                        Children = new[]
+                        {
+                            keepExistingButton = new HoverableRoundedButton
+                            {
+                                Text = "Keep existing",
+                                RelativeSizeAxes = Axes.X,
+                                Width = 0.48f,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                Action = Hide
+                            },
+                            applyNewButton = new HoverableRoundedButton
+                            {
+                                Text = "Apply new",
+                                RelativeSizeAxes = Axes.X,
+                                Width = 0.48f,
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Action = Hide
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            keepExistingButton.IsHoveredBindable.BindValueChanged(_ => updatePreviews());
+            applyNewButton.IsHoveredBindable.BindValueChanged(_ => updatePreviews());
+            updatePreviews();
+        }
+
+        private void updatePreviews()
+        {
+            if (!keepExistingButton.IsHovered && !applyNewButton.IsHovered)
+            {
+                existingPreview.IsChosen.Value = newPreview.IsChosen.Value = null;
+                return;
+            }
+
+            existingPreview.IsChosen.Value = keepExistingButton.IsHovered;
+            newPreview.IsChosen.Value = applyNewButton.IsHovered;
+        }
+
+        private partial class ConflictingKeyBindingPreview : CompositeDrawable
+        {
+            private readonly object action;
+            private readonly KeyCombination keyCombination;
+
+            private OsuSpriteText newBindingText = null!;
+
+            public Bindable<bool?> IsChosen { get; } = new Bindable<bool?>();
+
+            [Resolved]
+            private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
+
+            [Resolved]
+            private OsuColour colours { get; set; } = null!;
+
+            public ConflictingKeyBindingPreview(object action, KeyCombination keyCombination)
+            {
+                this.action = action;
+                this.keyCombination = keyCombination;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+
+                InternalChild = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    CornerRadius = 5,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = colourProvider.Background5
+                        },
+                        new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(),
+                                new Dimension(GridSizeMode.AutoSize, minSize: 80),
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new OsuSpriteText
+                                    {
+                                        Text = action.GetLocalisableDescription(),
+                                        Margin = new MarginPadding(7.5f),
+                                    },
+                                    new Container
+                                    {
+                                        AutoSizeAxes = Axes.Y,
+                                        RelativeSizeAxes = Axes.X,
+                                        CornerRadius = 5,
+                                        Masking = true,
+                                        Anchor = Anchor.CentreRight,
+                                        Origin = Anchor.CentreRight,
+                                        X = -5,
+                                        Children = new Drawable[]
+                                        {
+                                            new Box
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Colour = colourProvider.Background6
+                                            },
+                                            newBindingText = new OsuSpriteText
+                                            {
+                                                Font = OsuFont.Numeric.With(size: 10),
+                                                Margin = new MarginPadding(5),
+                                                Text = keyCombinationProvider.GetReadableString(keyCombination),
+                                                Anchor = Anchor.Centre,
+                                                Origin = Anchor.Centre
+                                            }
+                                        }
+                                    },
+                                }
+                            }
+                        }
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                IsChosen.BindValueChanged(_ => updateState(), true);
+            }
+
+            private void updateState()
+            {
+                switch (IsChosen.Value)
+                {
+                    case true:
+                        newBindingText.Text = keyCombinationProvider.GetReadableString(keyCombination);
+                        newBindingText.Colour = colours.Green1;
+                        break;
+
+                    case false:
+                        newBindingText.Text = "(none)";
+                        newBindingText.Colour = colours.Red1;
+                        break;
+
+                    case null:
+                        newBindingText.Text = keyCombinationProvider.GetReadableString(keyCombination);
+                        newBindingText.Colour = Colour4.White;
+                        break;
+                }
+            }
+        }
+
+        private partial class HoverableRoundedButton : RoundedButton
+        {
+            public BindableBool IsHoveredBindable { get; set; } = new BindableBool();
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                IsHoveredBindable.Value = IsHovered;
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                IsHoveredBindable.Value = IsHovered;
+                base.OnHoverLost(e);
+            }
+        }
+    }
+}

From f5a6781e5a439c5a364e38fd76a9c15b6dc2394d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 15:36:27 +0200
Subject: [PATCH 1803/2100] Integrate key binding conflict popover into
 keybindings panel

---
 .../TestSceneKeyBindingConflictPopover.cs     | 15 +++-
 .../Sections/Input/KeyBindingConflictInfo.cs  | 15 ++++
 .../Input/KeyBindingConflictPopover.cs        | 75 ++++++++++++++-----
 .../Settings/Sections/Input/KeyBindingRow.cs  | 42 ++++++++---
 .../Sections/Input/KeyBindingsSubsection.cs   | 44 ++++++++++-
 osu.Game/Overlays/SettingsPanel.cs            | 55 +++++++-------
 6 files changed, 184 insertions(+), 62 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
index 972e1cbe79..7251350616 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.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.Extensions;
@@ -12,6 +13,7 @@ using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Rulesets.Osu;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Settings
 {
@@ -50,10 +52,15 @@ namespace osu.Game.Tests.Visual.Settings
                 Action = this.ShowPopover;
             }
 
-            public Popover GetPopover() => new KeyBindingConflictPopover(
-                OsuAction.LeftButton,
-                OsuAction.RightButton,
-                new KeyCombination(InputKey.Z));
+            public Popover GetPopover() => new KeyBindingConflictPopover
+            {
+                ConflictInfo =
+                {
+                    Value = new KeyBindingConflictInfo(
+                        new ConflictingKeyBinding(Guid.NewGuid(), OsuAction.LeftButton, KeyCombination.FromKey(Key.X), new KeyCombination(InputKey.None)),
+                        new ConflictingKeyBinding(Guid.NewGuid(), OsuAction.RightButton, KeyCombination.FromKey(Key.Z), KeyCombination.FromKey(Key.X)))
+                }
+            };
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs
new file mode 100644
index 0000000000..ea127456af
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.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 System;
+using osu.Framework.Input.Bindings;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    /// <summary>
+    /// Contains information about the key binding conflict to be resolved.
+    /// </summary>
+    public record KeyBindingConflictInfo(ConflictingKeyBinding Existing, ConflictingKeyBinding New);
+
+    public record ConflictingKeyBinding(Guid ID, object Action, KeyCombination CombinationWhenChosen, KeyCombination CombinationWhenNotChosen);
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 55b4ee3390..4206380dfe 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.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.Extensions;
@@ -10,34 +11,34 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Input.Bindings;
 using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public partial class KeyBindingConflictPopover : OsuPopover
     {
-        private readonly object existingAction;
-        private readonly object newAction;
-        private readonly KeyCombination conflictingCombination;
+        public Bindable<KeyBindingConflictInfo> ConflictInfo { get; } = new Bindable<KeyBindingConflictInfo>();
+
+        public Action? BindingConflictResolved { get; init; }
 
         private ConflictingKeyBindingPreview newPreview = null!;
         private ConflictingKeyBindingPreview existingPreview = null!;
         private HoverableRoundedButton keepExistingButton = null!;
         private HoverableRoundedButton applyNewButton = null!;
 
-        public KeyBindingConflictPopover(object existingAction, object newAction, KeyCombination conflictingCombination)
-        {
-            this.existingAction = existingAction;
-            this.newAction = newAction;
-            this.conflictingCombination = conflictingCombination;
-        }
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load() => recreateDisplay();
+
+        private void recreateDisplay()
         {
             Child = new FillFlowContainer
             {
@@ -54,8 +55,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         Text = "The binding you've selected conflicts with another existing binding.",
                         Margin = new MarginPadding { Bottom = 10 }
                     },
-                    existingPreview = new ConflictingKeyBindingPreview(existingAction, conflictingCombination),
-                    newPreview = new ConflictingKeyBindingPreview(newAction, conflictingCombination),
+                    existingPreview = new ConflictingKeyBindingPreview(ConflictInfo.Value.Existing.Action, ConflictInfo.Value.Existing.CombinationWhenChosen, ConflictInfo.Value.Existing.CombinationWhenNotChosen),
+                    newPreview = new ConflictingKeyBindingPreview(ConflictInfo.Value.New.Action, ConflictInfo.Value.New.CombinationWhenChosen, ConflictInfo.Value.New.CombinationWhenNotChosen),
                     new Container
                     {
                         RelativeSizeAxes = Axes.X,
@@ -79,7 +80,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
-                                Action = Hide
+                                Action = applyNew
                             }
                         }
                     }
@@ -87,6 +88,32 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             };
         }
 
+        private void applyNew()
+        {
+            // only "apply new" needs to cause actual realm changes, since the flow in `KeyBindingsSubsection` does not actually make db changes
+            // if it detects a binding conflict.
+            // the temporary visual changes will be reverted by calling `Hide()` / `BindingConflictResolved`.
+            realm.Write(r =>
+            {
+                var existingBinding = r.Find<RealmKeyBinding>(ConflictInfo.Value.Existing.ID);
+                existingBinding!.KeyCombinationString = ConflictInfo.Value.Existing.CombinationWhenNotChosen.ToString();
+
+                var newBinding = r.Find<RealmKeyBinding>(ConflictInfo.Value.New.ID);
+                newBinding!.KeyCombinationString = ConflictInfo.Value.Existing.CombinationWhenChosen.ToString();
+            });
+
+            Hide();
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+
+            // workaround for `VisibilityContainer.PopOut()` being called in `LoadAsyncComplete()`
+            if (IsLoaded)
+                BindingConflictResolved?.Invoke();
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -111,7 +138,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private partial class ConflictingKeyBindingPreview : CompositeDrawable
         {
             private readonly object action;
-            private readonly KeyCombination keyCombination;
+            private readonly KeyCombination combinationWhenChosen;
+            private readonly KeyCombination combinationWhenNotChosen;
 
             private OsuSpriteText newBindingText = null!;
 
@@ -123,10 +151,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             [Resolved]
             private OsuColour colours { get; set; } = null!;
 
-            public ConflictingKeyBindingPreview(object action, KeyCombination keyCombination)
+            public ConflictingKeyBindingPreview(object action, KeyCombination combinationWhenChosen, KeyCombination combinationWhenNotChosen)
             {
                 this.action = action;
-                this.keyCombination = keyCombination;
+                this.combinationWhenChosen = combinationWhenChosen;
+                this.combinationWhenNotChosen = combinationWhenNotChosen;
             }
 
             [BackgroundDependencyLoader]
@@ -187,7 +216,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                                             {
                                                 Font = OsuFont.Numeric.With(size: 10),
                                                 Margin = new MarginPadding(5),
-                                                Text = keyCombinationProvider.GetReadableString(keyCombination),
                                                 Anchor = Anchor.Centre,
                                                 Origin = Anchor.Centre
                                             }
@@ -209,23 +237,30 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             private void updateState()
             {
+                string newBinding;
+
                 switch (IsChosen.Value)
                 {
                     case true:
-                        newBindingText.Text = keyCombinationProvider.GetReadableString(keyCombination);
+                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenChosen);
                         newBindingText.Colour = colours.Green1;
                         break;
 
                     case false:
-                        newBindingText.Text = "(none)";
+                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenNotChosen);
                         newBindingText.Colour = colours.Red1;
                         break;
 
                     case null:
-                        newBindingText.Text = keyCombinationProvider.GetReadableString(keyCombination);
+                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenChosen);
                         newBindingText.Colour = Colour4.White;
                         break;
                 }
+
+                if (string.IsNullOrEmpty(newBinding))
+                    newBinding = "(none)";
+
+                newBindingText.Text = newBinding;
             }
         }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index aab6ed6d74..c8d4f339da 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -12,8 +12,10 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
@@ -31,7 +33,7 @@ using osuTK.Input;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
-    public partial class KeyBindingRow : Container, IFilterable
+    public partial class KeyBindingRow : Container, IFilterable, IHasPopover
     {
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
@@ -40,7 +42,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public delegate void KeyBindingUpdated(KeyBindingRow sender, KeyBindingUpdatedEventArgs args);
 
-        public record KeyBindingUpdatedEventArgs(Guid KeyBindingID, string KeyCombinationString);
+        public record KeyBindingUpdatedEventArgs(object Action, Guid KeyBindingID, KeyCombination KeyCombination);
+
+        public Action? BindingConflictResolved { get; set; }
 
         /// <summary>
         /// Whether left and right mouse button clicks should be included in the edited bindings.
@@ -77,7 +81,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         #endregion
 
-        private readonly object action;
+        public readonly object Action;
 
         private Bindable<bool> isDefault { get; } = new BindableBool(true);
 
@@ -107,7 +111,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <param name="action">The action that this row contains bindings for.</param>
         public KeyBindingRow(object action)
         {
-            this.action = action;
+            this.Action = action;
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -163,7 +167,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                                 },
                                 text = new OsuSpriteText
                                 {
-                                    Text = action.GetLocalisableDescription(),
+                                    Text = Action.GetLocalisableDescription(),
                                     Margin = new MarginPadding(1.5f * padding),
                                 },
                                 buttons = new FillFlowContainer<KeyButton>
@@ -220,7 +224,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 var button = buttons[i++];
                 button.UpdateKeyCombination(d);
-                finalise();
+
+                var args = new KeyBindingUpdatedEventArgs(Action, button.KeyBinding.Value.ID, button.KeyBinding.Value.KeyCombination);
+                BindingUpdated?.Invoke(this, args);
             }
 
             isDefault.Value = true;
@@ -280,7 +286,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             Debug.Assert(bindTarget != null);
 
             if (bindTarget.IsHovered)
-                finalise(false);
+                finalise();
             // prevent updating bind target before clear button's action
             else if (!cancelAndClearButtons.Any(b => b.IsHovered))
                 updateBindTarget();
@@ -429,7 +435,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 return;
 
             bindTarget.UpdateKeyCombination(InputKey.None);
-            finalise(false);
+            finalise();
         }
 
         private void finalise(bool hasChanged = true)
@@ -439,7 +445,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 updateIsDefaultValue();
 
                 bindTarget.IsBinding = false;
-                var args = new KeyBindingUpdatedEventArgs(bindTarget.KeyBinding.Value.ID, bindTarget.KeyBinding.Value.KeyCombinationString);
+                var args = new KeyBindingUpdatedEventArgs(Action, bindTarget.KeyBinding.Value.ID, bindTarget.KeyBinding.Value.KeyCombination);
                 Schedule(() =>
                 {
                     // schedule to ensure we don't instantly get focus back on next OnMouseClick (see AcceptFocus impl.)
@@ -489,6 +495,24 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             isDefault.Value = KeyBindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
         }
 
+        #region Handling conflicts
+
+        private readonly Bindable<KeyBindingConflictInfo> keyBindingConflictInfo = new Bindable<KeyBindingConflictInfo>();
+
+        public Popover GetPopover() => new KeyBindingConflictPopover
+        {
+            ConflictInfo = { BindTarget = keyBindingConflictInfo },
+            BindingConflictResolved = BindingConflictResolved
+        };
+
+        public void ShowBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
+        {
+            keyBindingConflictInfo.Value = conflictInfo;
+            this.ShowPopover();
+        }
+
+        #endregion
+
         private partial class CancelButton : RoundedButton
         {
             public CancelButton()
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index 57f6e58058..6360877116 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -38,15 +38,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load()
         {
-            var bindings = realm.Run(r => GetKeyBindings(r).Detach());
+            var bindings = getAllBindings();
 
             foreach (var defaultGroup in Defaults.GroupBy(d => d.Action))
             {
                 int intKey = (int)defaultGroup.Key;
 
-                // one row per valid action.
                 var row = CreateKeyBindingRow(defaultGroup.Key, defaultGroup)
-                    .With(row => row.BindingUpdated = onBindingUpdated);
+                    .With(row =>
+                    {
+                        row.BindingUpdated = onBindingUpdated;
+                        row.BindingConflictResolved = reloadAllBindings;
+                    });
                 row.KeyBindings.AddRange(bindings.Where(b => b.ActionInt.Equals(intKey)));
                 Add(row);
             }
@@ -59,6 +62,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected abstract IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm);
 
+        private List<RealmKeyBinding> getAllBindings() => realm.Run(r => GetKeyBindings(r).Detach());
+
         protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<KeyBinding> defaults)
             => new KeyBindingRow(action)
             {
@@ -66,9 +71,40 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Defaults = defaults.Select(d => d.KeyCombination),
             };
 
+        private void reloadAllBindings()
+        {
+            var bindings = getAllBindings();
+
+            foreach (var row in Children.OfType<KeyBindingRow>())
+            {
+                row.KeyBindings.Clear();
+                row.KeyBindings.AddRange(bindings.Where(b => b.ActionInt.Equals((int)row.Action)));
+            }
+        }
+
         private void onBindingUpdated(KeyBindingRow sender, KeyBindingRow.KeyBindingUpdatedEventArgs args)
         {
-            realm.WriteAsync(r => r.Find<RealmKeyBinding>(args.KeyBindingID)!.KeyCombinationString = args.KeyCombinationString);
+            var bindings = getAllBindings();
+            var existingBinding = args.KeyCombination.Equals(new KeyCombination(InputKey.None))
+                ? null
+                : bindings.FirstOrDefault(kb => kb.ID != args.KeyBindingID && kb.KeyCombination.Equals(args.KeyCombination));
+
+            if (existingBinding != null)
+            {
+                // `RealmKeyBinding`'s  `Action` is just an int, always.
+                // we need more than that for proper display, so leverage `Defaults` (which have the correct enum-typed object in `Action` inside).
+                object existingAssignedAction = Defaults.First(binding => (int)binding.Action == existingBinding.ActionInt).Action;
+                var bindingBeforeUpdate = bindings.Single(binding => binding.ID == args.KeyBindingID);
+
+                sender.ShowBindingConflictPopover(
+                    new KeyBindingConflictInfo(
+                        new ConflictingKeyBinding(existingBinding.ID, existingAssignedAction, existingBinding.KeyCombination, new KeyCombination(InputKey.None)),
+                        new ConflictingKeyBinding(bindingBeforeUpdate.ID, args.Action, args.KeyCombination, bindingBeforeUpdate.KeyCombination)));
+
+                return;
+            }
+
+            realm.WriteAsync(r => r.Find<RealmKeyBinding>(args.KeyBindingID)!.KeyCombinationString = args.KeyCombination.ToString());
 
             if (AutoAdvanceTarget)
             {
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 58c56a5514..2517a58491 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -14,6 +14,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
@@ -106,39 +107,43 @@ namespace osu.Game.Overlays
                 }
             };
 
-            Add(SectionsContainer = new SettingsSectionsContainer
+            Add(new PopoverContainer
             {
-                Masking = true,
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Colour = Color4.Black.Opacity(0),
-                    Type = EdgeEffectType.Shadow,
-                    Hollow = true,
-                    Radius = 10
-                },
-                MaskingSmoothness = 0,
                 RelativeSizeAxes = Axes.Both,
-                ExpandableHeader = CreateHeader(),
-                SelectedSection = { BindTarget = CurrentSection },
-                FixedHeader = new Container
+                Child = SectionsContainer = new SettingsSectionsContainer
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
                     {
-                        Vertical = 20,
-                        Horizontal = CONTENT_MARGINS
+                        Colour = Color4.Black.Opacity(0),
+                        Type = EdgeEffectType.Shadow,
+                        Hollow = true,
+                        Radius = 10
                     },
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Child = searchTextBox = new SeekLimitedSearchTextBox
+                    MaskingSmoothness = 0,
+                    RelativeSizeAxes = Axes.Both,
+                    ExpandableHeader = CreateHeader(),
+                    SelectedSection = { BindTarget = CurrentSection },
+                    FixedHeader = new Container
                     {
                         RelativeSizeAxes = Axes.X,
-                        Origin = Anchor.TopCentre,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding
+                        {
+                            Vertical = 20,
+                            Horizontal = CONTENT_MARGINS
+                        },
                         Anchor = Anchor.TopCentre,
-                    }
-                },
-                Footer = CreateFooter().With(f => f.Alpha = 0)
+                        Origin = Anchor.TopCentre,
+                        Child = searchTextBox = new SeekLimitedSearchTextBox
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                        }
+                    },
+                    Footer = CreateFooter().With(f => f.Alpha = 0)
+                }
             });
 
             if (showSidebar)

From b09252a8f85e22132922b76c67bcc26ab9dbc5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 12:19:07 +0200
Subject: [PATCH 1804/2100] Fix restore-to-default button for entire section
 triggering conflicts

---
 .../Sections/Input/KeyBindingsSubsection.cs       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index 6360877116..31c57452a9 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Localisation;
@@ -56,7 +55,19 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             Add(new ResetButton
             {
-                Action = () => Children.OfType<KeyBindingRow>().ForEach(k => k.RestoreDefaults())
+                Action = () =>
+                {
+                    realm.Write(r =>
+                    {
+                        // can't use `RestoreDefaults()` for each key binding row here as it might trigger binding conflicts along the way.
+                        foreach (var row in Children.OfType<KeyBindingRow>())
+                        {
+                            foreach (var (currentBinding, defaultBinding) in row.KeyBindings.Zip(row.Defaults))
+                                r.Find<RealmKeyBinding>(currentBinding.ID)!.KeyCombinationString = defaultBinding.ToString();
+                        }
+                    });
+                    reloadAllBindings();
+                }
             });
         }
 

From 5d637520e702de574a10ec79728e051015bf34f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:38:51 +0200
Subject: [PATCH 1805/2100] Add test coverage for key binding conflict
 resolution

---
 .../Settings/TestSceneKeyBindingPanel.cs      | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 5a001ca127..fcbb16bef6 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -10,8 +10,11 @@ using osu.Framework.Testing;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.Settings.Sections.Input;
+using osu.Game.Rulesets.Taiko;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Settings
@@ -288,6 +291,106 @@ namespace osu.Game.Tests.Visual.Settings
             AddUntilStep("all reset section bindings buttons shown", () => panel.ChildrenOfType<ResetButton>().All(button => button.Alpha == 1));
         }
 
+        [Test]
+        public void TestBindingConflictResolvedByRollback()
+        {
+            AddStep("reset taiko section to default", () =>
+            {
+                var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
+                section.ChildrenOfType<ResetButton>().Single().TriggerClick();
+            });
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
+            scrollToAndStartBinding("Left (rim)");
+            AddStep("attempt to bind M1 to two keys", () => InputManager.Click(MouseButton.Left));
+
+            KeyBindingConflictPopover popover = null;
+            AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
+            AddStep("click first button", () => popover.ChildrenOfType<RoundedButton>().First().TriggerClick());
+            checkBinding("Left (centre)", "M1");
+            checkBinding("Left (rim)", "M2");
+        }
+
+        [Test]
+        public void TestBindingConflictResolvedByOverwrite()
+        {
+            AddStep("reset taiko section to default", () =>
+            {
+                var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
+                section.ChildrenOfType<ResetButton>().Single().TriggerClick();
+            });
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
+            scrollToAndStartBinding("Left (rim)");
+            AddStep("attempt to bind M1 to two keys", () => InputManager.Click(MouseButton.Left));
+
+            KeyBindingConflictPopover popover = null;
+            AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
+            AddStep("click second button", () => popover.ChildrenOfType<RoundedButton>().ElementAt(1).TriggerClick());
+            checkBinding("Left (centre)", string.Empty);
+            checkBinding("Left (rim)", "M1");
+        }
+
+        [Test]
+        public void TestBindingConflictCausedByResetToDefaultOfSingleRow()
+        {
+            AddStep("reset taiko section to default", () =>
+            {
+                var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
+                section.ChildrenOfType<ResetButton>().Single().TriggerClick();
+            });
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
+            scrollToAndStartBinding("Left (centre)");
+            AddStep("clear binding", () =>
+            {
+                var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
+                row.ChildrenOfType<KeyBindingRow.ClearButton>().Single().TriggerClick();
+            });
+            scrollToAndStartBinding("Left (rim)");
+            AddStep("bind M1", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("reset Left (centre) to default", () =>
+            {
+                var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
+                row.ChildrenOfType<RevertToDefaultButton<bool>>().Single().TriggerClick();
+            });
+
+            KeyBindingConflictPopover popover = null;
+            AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
+            AddStep("click second button", () => popover.ChildrenOfType<RoundedButton>().ElementAt(1).TriggerClick());
+            checkBinding("Left (centre)", "M1");
+            checkBinding("Left (rim)", string.Empty);
+        }
+
+        [Test]
+        public void TestResettingEntireSectionDoesNotCauseBindingConflicts()
+        {
+            AddStep("reset taiko section to default", () =>
+            {
+                var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
+                section.ChildrenOfType<ResetButton>().Single().TriggerClick();
+            });
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
+            scrollToAndStartBinding("Left (centre)");
+            AddStep("clear binding", () =>
+            {
+                var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
+                row.ChildrenOfType<KeyBindingRow.ClearButton>().Single().TriggerClick();
+            });
+            scrollToAndStartBinding("Left (rim)");
+            AddStep("bind M1", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("reset taiko section to default", () =>
+            {
+                var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
+                section.ChildrenOfType<ResetButton>().Single().TriggerClick();
+            });
+            AddWaitStep("wait a bit", 3);
+            AddUntilStep("conflict popover not shown", () => panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Null);
+        }
+
         private void checkBinding(string name, string keyName)
         {
             AddAssert($"Check {name} is bound to {keyName}", () =>

From 9468371556fbf59175229f3e47110665a5ce5e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 13:05:50 +0200
Subject: [PATCH 1806/2100] Fix min width not really working as intended

---
 .../Settings/Sections/Input/KeyBindingConflictPopover.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 4206380dfe..9f5766f29d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             ColumnDimensions = new[]
                             {
                                 new Dimension(),
-                                new Dimension(GridSizeMode.AutoSize, minSize: 80),
+                                new Dimension(GridSizeMode.AutoSize),
                             },
                             Content = new[]
                             {
@@ -198,20 +198,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                                     },
                                     new Container
                                     {
-                                        AutoSizeAxes = Axes.Y,
-                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Both,
                                         CornerRadius = 5,
                                         Masking = true,
                                         Anchor = Anchor.CentreRight,
                                         Origin = Anchor.CentreRight,
                                         X = -5,
-                                        Children = new Drawable[]
+                                        Children = new[]
                                         {
                                             new Box
                                             {
                                                 RelativeSizeAxes = Axes.Both,
                                                 Colour = colourProvider.Background6
                                             },
+                                            Empty().With(d => d.Width = 80), // poor man's min-width
                                             newBindingText = new OsuSpriteText
                                             {
                                                 Font = OsuFont.Numeric.With(size: 10),

From 991e425b9ab8fa82985c95ccc5986d81dee6b166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 16:30:22 +0200
Subject: [PATCH 1807/2100] Refactor conflict handling flow to be less
 back-and-forth

---
 .../Settings/Sections/Input/KeyBindingRow.cs  | 54 ++++++++++++++-----
 .../Sections/Input/KeyBindingsSubsection.cs   | 33 ++++--------
 2 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index c8d4f339da..ef54cecf0a 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -20,6 +20,7 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -27,6 +28,7 @@ using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -42,9 +44,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public delegate void KeyBindingUpdated(KeyBindingRow sender, KeyBindingUpdatedEventArgs args);
 
-        public record KeyBindingUpdatedEventArgs(object Action, Guid KeyBindingID, KeyCombination KeyCombination);
+        public record KeyBindingUpdatedEventArgs(bool BindingConflictResolved, bool CanAdvanceToNextBinding);
 
-        public Action? BindingConflictResolved { get; set; }
+        public Func<List<RealmKeyBinding>> GetAllSectionBindings { get; set; } = null!;
 
         /// <summary>
         /// Whether left and right mouse button clicks should be included in the edited bindings.
@@ -85,6 +87,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private Bindable<bool> isDefault { get; } = new BindableBool(true);
 
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; } = null!;
+
         [Resolved]
         private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
 
@@ -111,7 +119,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <param name="action">The action that this row contains bindings for.</param>
         public KeyBindingRow(object action)
         {
-            this.Action = action;
+            Action = action;
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -225,8 +233,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 var button = buttons[i++];
                 button.UpdateKeyCombination(d);
 
-                var args = new KeyBindingUpdatedEventArgs(Action, button.KeyBinding.Value.ID, button.KeyBinding.Value.KeyCombination);
-                BindingUpdated?.Invoke(this, args);
+                tryPersistKeyBinding(button.KeyBinding.Value, advanceToNextBinding: false);
             }
 
             isDefault.Value = true;
@@ -286,7 +293,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             Debug.Assert(bindTarget != null);
 
             if (bindTarget.IsHovered)
-                finalise();
+                finalise(false);
             // prevent updating bind target before clear button's action
             else if (!cancelAndClearButtons.Any(b => b.IsHovered))
                 updateBindTarget();
@@ -435,23 +442,22 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 return;
 
             bindTarget.UpdateKeyCombination(InputKey.None);
-            finalise();
+            finalise(false);
         }
 
-        private void finalise(bool hasChanged = true)
+        private void finalise(bool advanceToNextBinding = true)
         {
             if (bindTarget != null)
             {
                 updateIsDefaultValue();
 
                 bindTarget.IsBinding = false;
-                var args = new KeyBindingUpdatedEventArgs(Action, bindTarget.KeyBinding.Value.ID, bindTarget.KeyBinding.Value.KeyCombination);
+                var bindingToPersist = bindTarget.KeyBinding.Value;
                 Schedule(() =>
                 {
                     // schedule to ensure we don't instantly get focus back on next OnMouseClick (see AcceptFocus impl.)
                     bindTarget = null;
-                    if (hasChanged)
-                        BindingUpdated?.Invoke(this, args);
+                    tryPersistKeyBinding(bindingToPersist, advanceToNextBinding);
                 });
             }
 
@@ -462,6 +468,28 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             cancelAndClearButtons.BypassAutoSizeAxes |= Axes.Y;
         }
 
+        private void tryPersistKeyBinding(RealmKeyBinding keyBinding, bool advanceToNextBinding)
+        {
+            var bindings = GetAllSectionBindings();
+            var existingBinding = keyBinding.KeyCombination.Equals(new KeyCombination(InputKey.None))
+                ? null
+                : bindings.FirstOrDefault(other => other.ID != keyBinding.ID && other.KeyCombination.Equals(keyBinding.KeyCombination));
+
+            if (existingBinding == null)
+            {
+                realm.WriteAsync(r => r.Find<RealmKeyBinding>(keyBinding.ID)!.KeyCombinationString = keyBinding.KeyCombination.ToString());
+                BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(BindingConflictResolved: false, advanceToNextBinding));
+                return;
+            }
+
+            var keyBindingBeforeUpdate = bindings.Single(other => other.ID == keyBinding.ID);
+
+            showBindingConflictPopover(
+                new KeyBindingConflictInfo(
+                    new ConflictingKeyBinding(existingBinding.ID, existingBinding.GetAction(rulesets), existingBinding.KeyCombination, new KeyCombination(InputKey.None)),
+                    new ConflictingKeyBinding(keyBindingBeforeUpdate.ID, Action, keyBinding.KeyCombination, keyBindingBeforeUpdate.KeyCombination)));
+        }
+
         protected override void OnFocus(FocusEvent e)
         {
             content.AutoSizeDuration = 500;
@@ -502,10 +530,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public Popover GetPopover() => new KeyBindingConflictPopover
         {
             ConflictInfo = { BindTarget = keyBindingConflictInfo },
-            BindingConflictResolved = BindingConflictResolved
+            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(BindingConflictResolved: true, CanAdvanceToNextBinding: false))
         };
 
-        public void ShowBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
+        private void showBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
         {
             keyBindingConflictInfo.Value = conflictInfo;
             this.ShowPopover();
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index 31c57452a9..dd0a88bfb1 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     .With(row =>
                     {
                         row.BindingUpdated = onBindingUpdated;
-                        row.BindingConflictResolved = reloadAllBindings;
+                        row.GetAllSectionBindings = getAllBindings;
                     });
                 row.KeyBindings.AddRange(bindings.Where(b => b.ActionInt.Equals(intKey)));
                 Add(row);
@@ -73,7 +73,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected abstract IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm);
 
-        private List<RealmKeyBinding> getAllBindings() => realm.Run(r => GetKeyBindings(r).Detach());
+        private List<RealmKeyBinding> getAllBindings() => realm.Run(r =>
+        {
+            r.Refresh();
+            return GetKeyBindings(r).Detach();
+        });
 
         protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<KeyBinding> defaults)
             => new KeyBindingRow(action)
@@ -95,29 +99,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private void onBindingUpdated(KeyBindingRow sender, KeyBindingRow.KeyBindingUpdatedEventArgs args)
         {
-            var bindings = getAllBindings();
-            var existingBinding = args.KeyCombination.Equals(new KeyCombination(InputKey.None))
-                ? null
-                : bindings.FirstOrDefault(kb => kb.ID != args.KeyBindingID && kb.KeyCombination.Equals(args.KeyCombination));
+            if (args.BindingConflictResolved)
+                reloadAllBindings();
 
-            if (existingBinding != null)
-            {
-                // `RealmKeyBinding`'s  `Action` is just an int, always.
-                // we need more than that for proper display, so leverage `Defaults` (which have the correct enum-typed object in `Action` inside).
-                object existingAssignedAction = Defaults.First(binding => (int)binding.Action == existingBinding.ActionInt).Action;
-                var bindingBeforeUpdate = bindings.Single(binding => binding.ID == args.KeyBindingID);
-
-                sender.ShowBindingConflictPopover(
-                    new KeyBindingConflictInfo(
-                        new ConflictingKeyBinding(existingBinding.ID, existingAssignedAction, existingBinding.KeyCombination, new KeyCombination(InputKey.None)),
-                        new ConflictingKeyBinding(bindingBeforeUpdate.ID, args.Action, args.KeyCombination, bindingBeforeUpdate.KeyCombination)));
-
-                return;
-            }
-
-            realm.WriteAsync(r => r.Find<RealmKeyBinding>(args.KeyBindingID)!.KeyCombinationString = args.KeyCombination.ToString());
-
-            if (AutoAdvanceTarget)
+            if (AutoAdvanceTarget && args.CanAdvanceToNextBinding)
             {
                 var next = Children.SkipWhile(c => c != sender).Skip(1).FirstOrDefault();
                 if (next != null)

From 08bdea0036397bd2618aa9e8177c13483989c947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 19:04:47 +0200
Subject: [PATCH 1808/2100] Reformat code

---
 .../Sections/Input/KeyBindingConflictPopover.cs        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 9f5766f29d..9634f30451 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -55,8 +55,14 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         Text = "The binding you've selected conflicts with another existing binding.",
                         Margin = new MarginPadding { Bottom = 10 }
                     },
-                    existingPreview = new ConflictingKeyBindingPreview(ConflictInfo.Value.Existing.Action, ConflictInfo.Value.Existing.CombinationWhenChosen, ConflictInfo.Value.Existing.CombinationWhenNotChosen),
-                    newPreview = new ConflictingKeyBindingPreview(ConflictInfo.Value.New.Action, ConflictInfo.Value.New.CombinationWhenChosen, ConflictInfo.Value.New.CombinationWhenNotChosen),
+                    existingPreview = new ConflictingKeyBindingPreview(
+                        ConflictInfo.Value.Existing.Action,
+                        ConflictInfo.Value.Existing.CombinationWhenChosen,
+                        ConflictInfo.Value.Existing.CombinationWhenNotChosen),
+                    newPreview = new ConflictingKeyBindingPreview(
+                        ConflictInfo.Value.New.Action,
+                        ConflictInfo.Value.New.CombinationWhenChosen,
+                        ConflictInfo.Value.New.CombinationWhenNotChosen),
                     new Container
                     {
                         RelativeSizeAxes = Axes.X,

From f1c1ffbdfd0c830ca3610863f89385f748400429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 19:10:33 +0200
Subject: [PATCH 1809/2100] Add localisation support

---
 osu.Game/Localisation/InputSettingsStrings.cs | 20 +++++++++++++++++
 .../Input/KeyBindingConflictPopover.cs        | 22 ++++++++++---------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Localisation/InputSettingsStrings.cs b/osu.Game/Localisation/InputSettingsStrings.cs
index 2c9b175dfb..834609053b 100644
--- a/osu.Game/Localisation/InputSettingsStrings.cs
+++ b/osu.Game/Localisation/InputSettingsStrings.cs
@@ -64,6 +64,26 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString KeyBindingPanelDescription => new TranslatableString(getKey(@"key_binding_panel_description"), @"Customise your keys!");
 
+        /// <summary>
+        /// "The binding you&#39;ve selected conflicts with another existing binding."
+        /// </summary>
+        public static LocalisableString KeyBindingConflictDetected => new TranslatableString(getKey(@"key_binding_conflict_detected"), @"The binding you've selected conflicts with another existing binding.");
+
+        /// <summary>
+        /// "Keep existing"
+        /// </summary>
+        public static LocalisableString KeepExisting => new TranslatableString(getKey(@"keep_existing"), @"Keep existing");
+
+        /// <summary>
+        /// "Apply new"
+        /// </summary>
+        public static LocalisableString ApplyNew => new TranslatableString(getKey(@"apply_new"), @"Apply new");
+
+        /// <summary>
+        /// "(none)"
+        /// </summary>
+        public static LocalisableString EmptyBinding => new TranslatableString(getKey(@"none"), @"(none)");
+
         private static string getKey(string key) => $"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 9634f30451..8f836bd9c6 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -18,6 +19,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Input.Bindings;
 using osuTK;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -52,7 +54,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Text = "The binding you've selected conflicts with another existing binding.",
+                        Text = InputSettingsStrings.KeyBindingConflictDetected,
                         Margin = new MarginPadding { Bottom = 10 }
                     },
                     existingPreview = new ConflictingKeyBindingPreview(
@@ -72,7 +74,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         {
                             keepExistingButton = new HoverableRoundedButton
                             {
-                                Text = "Keep existing",
+                                Text = InputSettingsStrings.KeepExisting,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreLeft,
@@ -81,7 +83,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             },
                             applyNewButton = new HoverableRoundedButton
                             {
-                                Text = "Apply new",
+                                Text = InputSettingsStrings.ApplyNew,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreRight,
@@ -243,30 +245,30 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             private void updateState()
             {
-                string newBinding;
+                LocalisableString keyCombinationText;
 
                 switch (IsChosen.Value)
                 {
                     case true:
-                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenChosen);
+                        keyCombinationText = keyCombinationProvider.GetReadableString(combinationWhenChosen);
                         newBindingText.Colour = colours.Green1;
                         break;
 
                     case false:
-                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenNotChosen);
+                        keyCombinationText = keyCombinationProvider.GetReadableString(combinationWhenNotChosen);
                         newBindingText.Colour = colours.Red1;
                         break;
 
                     case null:
-                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenChosen);
+                        keyCombinationText = keyCombinationProvider.GetReadableString(combinationWhenChosen);
                         newBindingText.Colour = Colour4.White;
                         break;
                 }
 
-                if (string.IsNullOrEmpty(newBinding))
-                    newBinding = "(none)";
+                if (LocalisableString.IsNullOrEmpty(keyCombinationText))
+                    keyCombinationText = InputSettingsStrings.EmptyBinding;
 
-                newBindingText.Text = newBinding;
+                newBindingText.Text = keyCombinationText;
             }
         }
 

From f083309e64e1901ee7167920adf498ed5b2c4896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 19:27:19 +0200
Subject: [PATCH 1810/2100] Move type back next to exposing class

---
 .../TestSceneKeyBindingConflictPopover.cs         |  6 +++---
 .../Sections/Input/KeyBindingConflictInfo.cs      | 15 ---------------
 .../Sections/Input/KeyBindingConflictPopover.cs   |  2 +-
 .../Settings/Sections/Input/KeyBindingRow.cs      |  7 +++++++
 4 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
index 7251350616..da5a9dd513 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
@@ -56,9 +56,9 @@ namespace osu.Game.Tests.Visual.Settings
             {
                 ConflictInfo =
                 {
-                    Value = new KeyBindingConflictInfo(
-                        new ConflictingKeyBinding(Guid.NewGuid(), OsuAction.LeftButton, KeyCombination.FromKey(Key.X), new KeyCombination(InputKey.None)),
-                        new ConflictingKeyBinding(Guid.NewGuid(), OsuAction.RightButton, KeyCombination.FromKey(Key.Z), KeyCombination.FromKey(Key.X)))
+                    Value = new KeyBindingRow.KeyBindingConflictInfo(
+                        new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.LeftButton, KeyCombination.FromKey(Key.X), new KeyCombination(InputKey.None)),
+                        new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.RightButton, KeyCombination.FromKey(Key.Z), KeyCombination.FromKey(Key.X)))
                 }
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs
deleted file mode 100644
index ea127456af..0000000000
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs
+++ /dev/null
@@ -1,15 +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.Input.Bindings;
-
-namespace osu.Game.Overlays.Settings.Sections.Input
-{
-    /// <summary>
-    /// Contains information about the key binding conflict to be resolved.
-    /// </summary>
-    public record KeyBindingConflictInfo(ConflictingKeyBinding Existing, ConflictingKeyBinding New);
-
-    public record ConflictingKeyBinding(Guid ID, object Action, KeyCombination CombinationWhenChosen, KeyCombination CombinationWhenNotChosen);
-}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 8f836bd9c6..a7e871d508 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public partial class KeyBindingConflictPopover : OsuPopover
     {
-        public Bindable<KeyBindingConflictInfo> ConflictInfo { get; } = new Bindable<KeyBindingConflictInfo>();
+        public Bindable<KeyBindingRow.KeyBindingConflictInfo> ConflictInfo { get; } = new Bindable<KeyBindingRow.KeyBindingConflictInfo>();
 
         public Action? BindingConflictResolved { get; init; }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index ef54cecf0a..8c645996c8 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -539,6 +539,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             this.ShowPopover();
         }
 
+        /// <summary>
+        /// Contains information about the key binding conflict to be resolved.
+        /// </summary>
+        public record KeyBindingConflictInfo(ConflictingKeyBinding Existing, ConflictingKeyBinding New);
+
+        public record ConflictingKeyBinding(Guid ID, object Action, KeyCombination CombinationWhenChosen, KeyCombination CombinationWhenNotChosen);
+
         #endregion
 
         private partial class CancelButton : RoundedButton

From 6c8490bc7ef47b521d3c90c59573c82ecc2f18bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 20:39:04 +0200
Subject: [PATCH 1811/2100] Revert changes to `LoungeSubScreen.Join()`

- `virtual` modifier was used in mocking.
- The spacing change revert is just mostly to keep it out of the final
  diff.
---
 .../OnlinePlay/Lounge/LoungeSubScreen.cs      | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 04ea59621d..fc4a5357c6 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -297,29 +297,26 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             popoverContainer.HidePopover();
         }
 
-        public void Join(Room room, string password, Action<Room> onSuccess = null, Action<string> onFailure = null)
+        public virtual void Join(Room room, string password, Action<Room> onSuccess = null, Action<string> onFailure = null) => Schedule(() =>
         {
-            Schedule(() =>
+            if (joiningRoomOperation != null)
+                return;
+
+            joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
+
+            RoomManager?.JoinRoom(room, password, _ =>
             {
-                if (joiningRoomOperation != null)
-                    return;
-
-                joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
-
-                RoomManager?.JoinRoom(room, password, _ =>
-                {
-                    Open(room);
-                    joiningRoomOperation?.Dispose();
-                    joiningRoomOperation = null;
-                    onSuccess?.Invoke(room);
-                }, error =>
-                {
-                    joiningRoomOperation?.Dispose();
-                    joiningRoomOperation = null;
-                    onFailure?.Invoke(error);
-                });
+                Open(room);
+                joiningRoomOperation?.Dispose();
+                joiningRoomOperation = null;
+                onSuccess?.Invoke(room);
+            }, error =>
+            {
+                joiningRoomOperation?.Dispose();
+                joiningRoomOperation = null;
+                onFailure?.Invoke(error);
             });
-        }
+        });
 
         /// <summary>
         /// Copies a room and opens it as a fresh (not-yet-created) one.

From 9289c47cd4c45d9e77e32cb7030c456a61184baf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 13:47:51 +0900
Subject: [PATCH 1812/2100] Tidy up `GlobalActionContainer` a bit

---
 .../Input/Bindings/GlobalActionContainer.cs   | 115 +++++++++---------
 1 file changed, 60 insertions(+), 55 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 9419bd2a0e..20220d88cd 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Input.Bindings
 {
     public partial class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput, IKeyBindingHandler<GlobalAction>
     {
+        protected override bool Prioritised => true;
+
         private readonly IKeyBindingHandler<GlobalAction>? handler;
 
         public GlobalActionContainer(OsuGameBase? game)
@@ -23,22 +25,62 @@ namespace osu.Game.Input.Bindings
                 handler = h;
         }
 
-        protected override bool Prioritised => true;
-
-        // IMPORTANT: Take care when changing order of the items in the enumerable.
-        // It is used to decide the order of precedence, with the earlier items having higher precedence.
-        public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings
-                                                                       .Concat(EditorKeyBindings)
-                                                                       .Concat(InGameKeyBindings)
-                                                                       .Concat(ReplayKeyBindings)
-                                                                       .Concat(SongSelectKeyBindings)
-                                                                       .Concat(AudioControlKeyBindings)
+        /// <summary>
+        /// All default key bindings across all categories, ordered with highest priority first.
+        /// </summary>
+        /// <remarks>
+        /// IMPORTANT: Take care when changing order of the items in the enumerable.
+        /// It is used to decide the order of precedence, with the earlier items having higher precedence.
+        /// </remarks>
+        public override IEnumerable<IKeyBinding> DefaultKeyBindings => globalKeyBindings
+                                                                       .Concat(editorKeyBindings)
+                                                                       .Concat(inGameKeyBindings)
+                                                                       .Concat(replayKeyBindings)
+                                                                       .Concat(songSelectKeyBindings)
+                                                                       .Concat(audioControlKeyBindings)
                                                                        // Overlay bindings may conflict with more local cases like the editor so they are checked last.
                                                                        // It has generally been agreed on that local screens like the editor should have priority,
                                                                        // based on such usages potentially requiring a lot more key bindings that may be "shared" with global ones.
-                                                                       .Concat(OverlayKeyBindings);
+                                                                       .Concat(overlayKeyBindings);
 
-        public static IEnumerable<KeyBinding> GlobalKeyBindings => new[]
+        public static IEnumerable<KeyBinding> GetDefaultBindingsFor(GlobalActionCategory category)
+        {
+            switch (category)
+            {
+                case GlobalActionCategory.General:
+                    return globalKeyBindings;
+
+                case GlobalActionCategory.Editor:
+                    return editorKeyBindings;
+
+                case GlobalActionCategory.InGame:
+                    return inGameKeyBindings;
+
+                case GlobalActionCategory.Replay:
+                    return replayKeyBindings;
+
+                case GlobalActionCategory.SongSelect:
+                    return songSelectKeyBindings;
+
+                case GlobalActionCategory.AudioControl:
+                    return audioControlKeyBindings;
+
+                case GlobalActionCategory.Overlays:
+                    return overlayKeyBindings;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(category), category, $"Unexpected {nameof(GlobalActionCategory)}");
+            }
+        }
+
+        public static IEnumerable<GlobalAction> GetGlobalActionsFor(GlobalActionCategory category)
+            => GetDefaultBindingsFor(category).Select(binding => binding.Action).Cast<GlobalAction>().Distinct();
+
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) => handler?.OnPressed(e) == true;
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => handler?.OnReleased(e);
+
+        private static IEnumerable<KeyBinding> globalKeyBindings => new[]
         {
             new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
             new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
@@ -68,7 +110,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F12, GlobalAction.TakeScreenshot),
         };
 
-        public static IEnumerable<KeyBinding> OverlayKeyBindings => new[]
+        private static IEnumerable<KeyBinding> overlayKeyBindings => new[]
         {
             new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
             new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
@@ -78,7 +120,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
         };
 
-        public static IEnumerable<KeyBinding> EditorKeyBindings => new[]
+        private static IEnumerable<KeyBinding> editorKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.F1 }, GlobalAction.EditorComposeMode),
             new KeyBinding(new[] { InputKey.F2 }, GlobalAction.EditorDesignMode),
@@ -102,7 +144,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.R }, GlobalAction.EditorToggleRotateControl),
         };
 
-        public static IEnumerable<KeyBinding> InGameKeyBindings => new[]
+        private static IEnumerable<KeyBinding> inGameKeyBindings => new[]
         {
             new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene),
             new KeyBinding(InputKey.ExtraMouseButton2, GlobalAction.SkipCutscene),
@@ -119,7 +161,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F2, GlobalAction.ExportReplay),
         };
 
-        public static IEnumerable<KeyBinding> ReplayKeyBindings => new[]
+        private static IEnumerable<KeyBinding> replayKeyBindings => new[]
         {
             new KeyBinding(InputKey.Space, GlobalAction.TogglePauseReplay),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.TogglePauseReplay),
@@ -128,7 +170,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.H }, GlobalAction.ToggleReplaySettings),
         };
 
-        public static IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
+        private static IEnumerable<KeyBinding> songSelectKeyBindings => new[]
         {
             new KeyBinding(InputKey.F1, GlobalAction.ToggleModSelection),
             new KeyBinding(InputKey.F2, GlobalAction.SelectNextRandom),
@@ -137,7 +179,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.BackSpace, GlobalAction.DeselectAllMods),
         };
 
-        public static IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
+        private static IEnumerable<KeyBinding> audioControlKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.Alt, InputKey.Up }, GlobalAction.IncreaseVolume),
             new KeyBinding(new[] { InputKey.Alt, InputKey.Down }, GlobalAction.DecreaseVolume),
@@ -154,43 +196,6 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.PlayPause, GlobalAction.MusicPlay),
             new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
         };
-
-        public static IEnumerable<KeyBinding> GetDefaultBindingsFor(GlobalActionCategory category)
-        {
-            switch (category)
-            {
-                case GlobalActionCategory.General:
-                    return GlobalKeyBindings;
-
-                case GlobalActionCategory.Editor:
-                    return EditorKeyBindings;
-
-                case GlobalActionCategory.InGame:
-                    return InGameKeyBindings;
-
-                case GlobalActionCategory.Replay:
-                    return ReplayKeyBindings;
-
-                case GlobalActionCategory.SongSelect:
-                    return SongSelectKeyBindings;
-
-                case GlobalActionCategory.AudioControl:
-                    return AudioControlKeyBindings;
-
-                case GlobalActionCategory.Overlays:
-                    return OverlayKeyBindings;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(category), category, $"Unexpected {nameof(GlobalActionCategory)}");
-            }
-        }
-
-        public static IEnumerable<GlobalAction> GetGlobalActionsFor(GlobalActionCategory category)
-            => GetDefaultBindingsFor(category).Select(binding => binding.Action).Cast<GlobalAction>().Distinct();
-
-        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) => handler?.OnPressed(e) == true;
-
-        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => handler?.OnReleased(e);
     }
 
     public enum GlobalAction

From a3b21281e68a67fc609c719abe9bc4a488f8ee41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 14:25:38 +0900
Subject: [PATCH 1813/2100] Add reordering support to match existing diffcalc
 100%

---
 .../Preprocessing/OsuDifficultyHitObject.cs   | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index 959449fdbb..488d1e2e9f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             if (slider.LazyEndPosition != null)
                 return;
 
-            // This commented version is actually correct by the new lazer implementation, but intentionally held back from
+            // TODO: This commented version is actually correct by the new lazer implementation, but intentionally held back from
             // difficulty calculator to preserve known behaviour.
             // double trackingEndTime = Math.Max(
             //     // SliderTailCircle always occurs at the final end time of the slider, but the player only needs to hold until within a lenience before it.
@@ -225,10 +225,33 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             //     slider.NestedHitObjects.LastOrDefault(n => n is not SliderTailCircle)?.StartTime ?? double.MinValue
             // );
 
-            double trackingEndTime = Math.Max(Math.Max(
+            double trackingEndTime = Math.Max(
                 slider.StartTime + slider.Duration + SliderEventGenerator.TAIL_LENIENCY,
                 slider.StartTime + slider.Duration / 2
-            ), slider.NestedHitObjects.OfType<SliderTick>().LastOrDefault()?.StartTime ?? double.MinValue);
+            );
+
+            IList<HitObject> nestedObjects = slider.NestedHitObjects;
+
+            SliderTick? lastRealTick = slider.NestedHitObjects.OfType<SliderTick>().LastOrDefault();
+
+            if (lastRealTick?.StartTime > trackingEndTime)
+            {
+                trackingEndTime = lastRealTick.StartTime;
+
+                // When the last tick falls after the tracking end time, we need to re-sort the nested objects
+                // based on time. This creates a somewhat weird ordering which is counter to how a user would
+                // understand the slider, but allows a zero-diff with known diffcalc output.
+                //
+                // To reiterate, this is definitely not correct from a difficulty calculation perspective
+                // and should be revisited at a later date (likely by replacing this whole code with the commented
+                // version above).
+                List<HitObject> reordered = nestedObjects.ToList();
+
+                reordered.Remove(lastRealTick);
+                reordered.Add(lastRealTick);
+
+                nestedObjects = reordered;
+            }
 
             slider.LazyTravelTime = trackingEndTime - slider.StartTime;
 
@@ -239,12 +262,14 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
                 endTimeMin %= 1;
 
             slider.LazyEndPosition = slider.StackedPosition + slider.Path.PositionAt(endTimeMin); // temporary lazy end position until a real result can be derived.
-            var currCursorPosition = slider.StackedPosition;
+
+            Vector2 currCursorPosition = slider.StackedPosition;
+
             double scalingFactor = NORMALISED_RADIUS / slider.Radius; // lazySliderDistance is coded to be sensitive to scaling, this makes the maths easier with the thresholds being used.
 
-            for (int i = 1; i < slider.NestedHitObjects.Count; i++)
+            for (int i = 1; i < nestedObjects.Count; i++)
             {
-                var currMovementObj = (OsuHitObject)slider.NestedHitObjects[i];
+                var currMovementObj = (OsuHitObject)nestedObjects[i];
 
                 Vector2 currMovement = Vector2.Subtract(currMovementObj.StackedPosition, currCursorPosition);
                 double currMovementLength = scalingFactor * currMovement.Length;
@@ -252,7 +277,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
                 // Amount of movement required so that the cursor position needs to be updated.
                 double requiredMovement = assumed_slider_radius;
 
-                if (i == slider.NestedHitObjects.Count - 1)
+                if (i == nestedObjects.Count - 1)
                 {
                     // The end of a slider has special aim rules due to the relaxed time constraint on position.
                     // There is both a lazy end position as well as the actual end slider position. We assume the player takes the simpler movement.
@@ -279,7 +304,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
                     slider.LazyTravelDistance += (float)currMovementLength;
                 }
 
-                if (i == slider.NestedHitObjects.Count - 1)
+                if (i == nestedObjects.Count - 1)
                     slider.LazyEndPosition = currCursorPosition;
             }
         }

From 17df2fdf0104d8433be92f48384e783a32fcd03c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 15:42:49 +0900
Subject: [PATCH 1814/2100] Restrict `followpoint` size

See https://github.com/ppy/osu/issues/24940#issuecomment-1760980461.
---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 88a4e17120..f06cad7061 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 switch (osuComponent.Component)
                 {
                     case OsuSkinComponents.FollowPoint:
-                        return this.GetAnimation("followpoint", true, true, true, startAtCurrentTime: false);
+                        return this.GetAnimation("followpoint", true, true, true, startAtCurrentTime: false, maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2, OsuHitObject.OBJECT_RADIUS));
 
                     case OsuSkinComponents.SliderScorePoint:
                         return this.GetAnimation("sliderscorepoint", false, false);

From 0b64852181f219f05529d90d6c0c08807c81fa80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 15:43:18 +0900
Subject: [PATCH 1815/2100] Limit `sliderscorepoint` to hitcicle dimensions

You'd never use anything above this unless crazy.
---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index f06cad7061..3002cbe0ae 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return this.GetAnimation("followpoint", true, true, true, startAtCurrentTime: false, maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2, OsuHitObject.OBJECT_RADIUS));
 
                     case OsuSkinComponents.SliderScorePoint:
-                        return this.GetAnimation("sliderscorepoint", false, false);
+                        return this.GetAnimation("sliderscorepoint", false, false, maxSize: OsuHitObject.OBJECT_DIMENSIONS);
 
                     case OsuSkinComponents.SliderFollowCircle:
                         var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: MAX_FOLLOW_CIRCLE_AREA_SIZE);

From 61b8d035fe938ef274694357ac15f0e0774b81d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 09:08:13 +0200
Subject: [PATCH 1816/2100] Use dangerous colour for "apply new" button

---
 .../Settings/Sections/Input/KeyBindingConflictPopover.cs      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index a7e871d508..297d8fab63 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -37,6 +37,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load() => recreateDisplay();
 
@@ -84,6 +87,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             applyNewButton = new HoverableRoundedButton
                             {
                                 Text = InputSettingsStrings.ApplyNew,
+                                BackgroundColour = colours.Pink3,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreRight,

From 37873484485dc59e3e1f1506a013ee57db849f4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 16:29:02 +0900
Subject: [PATCH 1817/2100] Change `Perfect` judgement to not give extra score

---
 osu.Game/Rulesets/Judgements/Judgement.cs | 5 ++---
 osu.Game/Rulesets/Scoring/HitResult.cs    | 7 +++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index f60b3a6c02..cd1e81046d 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -190,10 +190,9 @@ namespace osu.Game.Rulesets.Judgements
                     return 200;
 
                 case HitResult.Great:
-                    return 300;
-
+                // Perfect doesn't actually give more score / accuracy directly.
                 case HitResult.Perfect:
-                    return 315;
+                    return 300;
 
                 case HitResult.SmallBonus:
                     return SMALL_BONUS_SCORE;
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index ccd1f49de4..fed338b012 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -55,6 +55,13 @@ namespace osu.Game.Rulesets.Scoring
         [Order(1)]
         Great,
 
+        /// <summary>
+        /// This is an optional timing window tighter than <see cref="Great"/>.
+        /// </summary>
+        /// <remarks>
+        /// By default, this does not give any bonus accuracy or score.
+        /// To have it affect scoring, consider adding a nested bonus object.
+        /// </remarks>
         [Description(@"Perfect")]
         [EnumMember(Value = "perfect")]
         [Order(0)]

From 79cec7707d46b4381c59e5d51d5d258f779d45a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 09:56:46 +0200
Subject: [PATCH 1818/2100] Privatise setter

---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 88bbff6b92..f652e88f5a 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.OnlinePlay
         // while leases may be taken out by a subscreen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
-        protected LoungeSubScreen Lounge;
+        protected LoungeSubScreen Lounge { get; private set; }
 
         private MultiplayerWaveContainer waves;
         private ScreenStack screenStack;

From 94b64044e01681d3ce3da221255b26822b52c8e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 17:01:48 +0900
Subject: [PATCH 1819/2100] Add nested bonus judgement to `DrawableNote` for
 perfect bonus score

---
 .../Objects/Drawables/DrawableNote.cs         | 39 +++++++++++++++++++
 .../Drawables/DrawablePerfectBonusNote.cs     | 25 ++++++++++++
 osu.Game.Rulesets.Mania/Objects/Note.cs       |  8 ++++
 .../Objects/PerfectBonusNote.cs               | 19 +++++++++
 osu.Game.Rulesets.Mania/UI/Column.cs          |  1 +
 5 files changed, 92 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
 create mode 100644 osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 0819e8401c..dbc9446585 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System.Diagnostics;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -13,6 +14,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Skinning.Default;
+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.Edit;
@@ -38,6 +41,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private Drawable headPiece;
 
+        [CanBeNull]
+        private DrawablePerfectBonusNote bonusNote;
+
         public DrawableNote()
             : this(null)
         {
@@ -89,7 +95,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (!userTriggered)
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
+                {
+                    bonusNote!.TriggerResult(false);
                     ApplyResult(r => r.Type = r.Judgement.MinResult);
+                }
+
                 return;
             }
 
@@ -97,6 +107,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (result == HitResult.None)
                 return;
 
+            bonusNote!.TriggerResult(result == HitResult.Perfect);
             ApplyResult(r => r.Type = result);
         }
 
@@ -115,6 +126,34 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
         }
 
+        protected override void AddNestedHitObject(DrawableHitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case DrawablePerfectBonusNote bonus:
+                    AddInternal(bonusNote = bonus);
+                    break;
+            }
+        }
+
+        protected override void ClearNestedHitObjects()
+        {
+            if (bonusNote != null)
+                RemoveInternal(bonusNote, false);
+            bonusNote = null;
+        }
+
+        protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case PerfectBonusNote bonus:
+                    return new DrawablePerfectBonusNote(bonus);
+            }
+
+            return base.CreateNestedHitObject(hitObject);
+        }
+
         private void updateSnapColour()
         {
             if (beatmap == null || HitObject == null) return;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
new file mode 100644
index 0000000000..9f51f9c5b3
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.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.
+
+namespace osu.Game.Rulesets.Mania.Objects.Drawables
+{
+    public partial class DrawablePerfectBonusNote : DrawableManiaHitObject<PerfectBonusNote>
+    {
+        public DrawablePerfectBonusNote()
+            : this(null!)
+        {
+            AlwaysPresent = true;
+        }
+
+        public DrawablePerfectBonusNote(PerfectBonusNote hitObject)
+            : base(hitObject)
+        {
+        }
+
+        /// <summary>
+        /// Apply a judgement result.
+        /// </summary>
+        /// <param name="hit">Whether this tick was reached.</param>
+        internal void TriggerResult(bool hit) => ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 0035960c63..955d3e9c7d 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.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.Threading;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -12,5 +13,12 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class Note : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new ManiaJudgement();
+
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
+        {
+            base.CreateNestedHitObjects(cancellationToken);
+
+            AddNested(new PerfectBonusNote { StartTime = StartTime });
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
new file mode 100644
index 0000000000..b601a0614b
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.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.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Judgements;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Objects
+{
+    public class PerfectBonusNote : ManiaHitObject
+    {
+        public override Judgement CreateJudgement() => new PerfectBonusNoteJudgement();
+
+        public class PerfectBonusNoteJudgement : ManiaJudgement
+        {
+            public override HitResult MaxResult => HitResult.SmallBonus;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 6cd55bb099..68d1e929be 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -109,6 +109,7 @@ namespace osu.Game.Rulesets.Mania.UI
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
             RegisterPool<Note, DrawableNote>(10, 50);
+            RegisterPool<PerfectBonusNote, DrawablePerfectBonusNote>(10, 50);
             RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);

From e04a57d67f68db5b45a9ab5767bc0ed57f0b1a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 10:31:00 +0200
Subject: [PATCH 1820/2100] Use less dodgy method of specifying allowable
 notification types

---
 osu.Game/Overlays/NotificationOverlay.cs               |  5 +++--
 osu.Game/Overlays/Notifications/NotificationSection.cs | 10 +++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index dd4924d07a..81233b4343 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Overlays
                                     Children = new[]
                                     {
                                         // The main section adds as a catch-all for notifications which don't group into other sections.
-                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(Notification) }),
+                                        new NotificationSection(AccountsStrings.NotificationsTitle),
                                         new NotificationSection(NotificationsStrings.RunningTasks, new[] { typeof(ProgressNotification) }),
                                     }
                                 }
@@ -206,7 +206,8 @@ namespace osu.Game.Overlays
             var ourType = notification.GetType();
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
 
-            var section = sections.Children.Last(s => s.AcceptedNotificationTypes.Any(accept => accept.IsAssignableFrom(ourType)));
+            var section = sections.Children.FirstOrDefault(s => s.AcceptedNotificationTypes?.Any(accept => accept.IsAssignableFrom(ourType)) == true)
+                          ?? sections.First();
 
             section.Add(notification, depth);
 
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 10c2900d63..895f13ee9c 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -37,13 +37,17 @@ namespace osu.Game.Overlays.Notifications
             notifications.Insert((int)position, notification);
         }
 
-        public IEnumerable<Type> AcceptedNotificationTypes { get; }
+        /// <summary>
+        /// Enumerable of notification types accepted in this section.
+        /// If <see langword="null"/>, the section accepts any and all notifications.
+        /// </summary>
+        public IEnumerable<Type>? AcceptedNotificationTypes { get; }
 
         private readonly LocalisableString titleText;
 
-        public NotificationSection(LocalisableString title, IEnumerable<Type> acceptedNotificationTypes)
+        public NotificationSection(LocalisableString title, IEnumerable<Type>? acceptedNotificationTypes = null)
         {
-            AcceptedNotificationTypes = acceptedNotificationTypes.ToArray();
+            AcceptedNotificationTypes = acceptedNotificationTypes?.ToArray();
 
             titleText = title;
         }

From 125f28219dd32b8039f27a721bd2926eb3bfa48a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 17:36:19 +0900
Subject: [PATCH 1821/2100] Fix hodl tail notes not correctly handling nested
 bonus judgement

---
 .../Objects/Drawables/DrawableHoldNoteTail.cs | 35 +++++--------------
 .../Objects/Drawables/DrawableNote.cs         |  4 ++-
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index a559e91f1b..a183231310 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System.Diagnostics;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Scoring;
@@ -33,35 +32,19 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public void UpdateResult() => base.UpdateResult(true);
 
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
-        {
-            Debug.Assert(HitObject.HitWindows != null);
-
+        protected override void CheckForResult(bool userTriggered, double timeOffset) =>
             // Factor in the release lenience
-            timeOffset /= TailNote.RELEASE_WINDOW_LENIENCE;
+            base.CheckForResult(userTriggered, timeOffset / TailNote.RELEASE_WINDOW_LENIENCE);
 
-            if (!userTriggered)
-            {
-                if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                    ApplyResult(r => r.Type = r.Judgement.MinResult);
+        protected override HitResult MutateResultApplication(HitResult result)
+        {
+            // If the head wasn't hit or the hold note was broken, cap the max score to Meh.
+            bool hasComboBreak = !HoldNote.Head.IsHit || HoldNote.Body.HasHoldBreak;
 
-                return;
-            }
+            if (result > HitResult.Meh && hasComboBreak)
+                return HitResult.Meh;
 
-            var result = HitObject.HitWindows.ResultFor(timeOffset);
-            if (result == HitResult.None)
-                return;
-
-            ApplyResult(r =>
-            {
-                // If the head wasn't hit or the hold note was broken, cap the max score to Meh.
-                bool hasComboBreak = !HoldNote.Head.IsHit || HoldNote.Body.HasHoldBreak;
-
-                if (result > HitResult.Meh && hasComboBreak)
-                    result = HitResult.Meh;
-
-                r.Type = result;
-            });
+            return result;
         }
 
         public override bool OnPressed(KeyBindingPressEvent<ManiaAction> e) => false; // Handled by the hold note
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index dbc9446585..eaeac33a11 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -108,9 +108,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 return;
 
             bonusNote!.TriggerResult(result == HitResult.Perfect);
-            ApplyResult(r => r.Type = result);
+            ApplyResult(r => r.Type = MutateResultApplication(result));
         }
 
+        protected virtual HitResult MutateResultApplication(HitResult result) => result;
+
         public virtual bool OnPressed(KeyBindingPressEvent<ManiaAction> e)
         {
             if (e.Action != Action.Value)

From 850950ba610018e87980bb2e2dfa80c371b16578 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 17:36:30 +0900
Subject: [PATCH 1822/2100] Add note about why `SmallBonus` is not listed in
 `GetValidHitResults`

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index ff34b69d19..0055e10ada 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -385,6 +385,9 @@ namespace osu.Game.Rulesets.Mania
                 HitResult.Good,
                 HitResult.Ok,
                 HitResult.Meh,
+
+                // HitResult.SmallBonus is used for awarding perfect bonus score but is not included here as
+                // it would be a bit redundant to show this to the user.
             };
         }
 

From d7a06059f201420da2cd0b223f0a0a8aa33a2384 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 17:49:48 +0900
Subject: [PATCH 1823/2100] Rename string properties to give more hinting to
 localisers

---
 osu.Game/Localisation/InputSettingsStrings.cs               | 6 +++---
 .../Settings/Sections/Input/KeyBindingConflictPopover.cs    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Localisation/InputSettingsStrings.cs b/osu.Game/Localisation/InputSettingsStrings.cs
index 834609053b..a13a9dc498 100644
--- a/osu.Game/Localisation/InputSettingsStrings.cs
+++ b/osu.Game/Localisation/InputSettingsStrings.cs
@@ -72,17 +72,17 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "Keep existing"
         /// </summary>
-        public static LocalisableString KeepExisting => new TranslatableString(getKey(@"keep_existing"), @"Keep existing");
+        public static LocalisableString KeepExistingBinding => new TranslatableString(getKey(@"keep_existing"), @"Keep existing");
 
         /// <summary>
         /// "Apply new"
         /// </summary>
-        public static LocalisableString ApplyNew => new TranslatableString(getKey(@"apply_new"), @"Apply new");
+        public static LocalisableString ApplyNewBinding => new TranslatableString(getKey(@"apply_new"), @"Apply new");
 
         /// <summary>
         /// "(none)"
         /// </summary>
-        public static LocalisableString EmptyBinding => new TranslatableString(getKey(@"none"), @"(none)");
+        public static LocalisableString ActionHasNoKeyBinding => new TranslatableString(getKey(@"none"), @"(none)");
 
         private static string getKey(string key) => $"{prefix}:{key}";
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 297d8fab63..a0f6192587 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         {
                             keepExistingButton = new HoverableRoundedButton
                             {
-                                Text = InputSettingsStrings.KeepExisting,
+                                Text = InputSettingsStrings.KeepExistingBinding,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreLeft,
@@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             },
                             applyNewButton = new HoverableRoundedButton
                             {
-                                Text = InputSettingsStrings.ApplyNew,
+                                Text = InputSettingsStrings.ApplyNewBinding,
                                 BackgroundColour = colours.Pink3,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
@@ -270,7 +270,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 }
 
                 if (LocalisableString.IsNullOrEmpty(keyCombinationText))
-                    keyCombinationText = InputSettingsStrings.EmptyBinding;
+                    keyCombinationText = InputSettingsStrings.ActionHasNoKeyBinding;
 
                 newBindingText.Text = keyCombinationText;
             }

From 8e609b6f1dbfad804eca91394d5bccfcf20aaa75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 18:18:06 +0900
Subject: [PATCH 1824/2100] Switch records to classes for sanity

I don't have anything against records except for the capitalisation when
including the paramter names in a constructor.

ie. `new Record(This: 1);`
---
 .../Settings/Sections/Input/KeyBindingRow.cs  | 53 ++++++++++++++++---
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 8c645996c8..c7791f4412 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -44,8 +44,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public delegate void KeyBindingUpdated(KeyBindingRow sender, KeyBindingUpdatedEventArgs args);
 
-        public record KeyBindingUpdatedEventArgs(bool BindingConflictResolved, bool CanAdvanceToNextBinding);
-
         public Func<List<RealmKeyBinding>> GetAllSectionBindings { get; set; } = null!;
 
         /// <summary>
@@ -470,15 +468,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private void tryPersistKeyBinding(RealmKeyBinding keyBinding, bool advanceToNextBinding)
         {
-            var bindings = GetAllSectionBindings();
-            var existingBinding = keyBinding.KeyCombination.Equals(new KeyCombination(InputKey.None))
+            List<RealmKeyBinding> bindings = GetAllSectionBindings();
+            RealmKeyBinding? existingBinding = keyBinding.KeyCombination.Equals(new KeyCombination(InputKey.None))
                 ? null
                 : bindings.FirstOrDefault(other => other.ID != keyBinding.ID && other.KeyCombination.Equals(keyBinding.KeyCombination));
 
             if (existingBinding == null)
             {
                 realm.WriteAsync(r => r.Find<RealmKeyBinding>(keyBinding.ID)!.KeyCombinationString = keyBinding.KeyCombination.ToString());
-                BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(BindingConflictResolved: false, advanceToNextBinding));
+                BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: false, advanceToNextBinding));
                 return;
             }
 
@@ -530,7 +528,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public Popover GetPopover() => new KeyBindingConflictPopover
         {
             ConflictInfo = { BindTarget = keyBindingConflictInfo },
-            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(BindingConflictResolved: true, CanAdvanceToNextBinding: false))
+            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: true, canAdvanceToNextBinding: false))
         };
 
         private void showBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
@@ -542,9 +540,48 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// Contains information about the key binding conflict to be resolved.
         /// </summary>
-        public record KeyBindingConflictInfo(ConflictingKeyBinding Existing, ConflictingKeyBinding New);
+        public class KeyBindingConflictInfo
+        {
+            public ConflictingKeyBinding Existing { get; }
+            public ConflictingKeyBinding New { get; }
 
-        public record ConflictingKeyBinding(Guid ID, object Action, KeyCombination CombinationWhenChosen, KeyCombination CombinationWhenNotChosen);
+            /// <summary>
+            /// Contains information about the key binding conflict to be resolved.
+            /// </summary>
+            public KeyBindingConflictInfo(ConflictingKeyBinding existingBinding, ConflictingKeyBinding newBinding)
+            {
+                Existing = existingBinding;
+                New = newBinding;
+            }
+        }
+
+        public class ConflictingKeyBinding
+        {
+            public Guid ID { get; }
+            public object Action { get; }
+            public KeyCombination CombinationWhenChosen { get; }
+            public KeyCombination CombinationWhenNotChosen { get; }
+
+            public ConflictingKeyBinding(Guid id, object action, KeyCombination combinationWhenChosen, KeyCombination combinationWhenNotChosen)
+            {
+                ID = id;
+                Action = action;
+                CombinationWhenChosen = combinationWhenChosen;
+                CombinationWhenNotChosen = combinationWhenNotChosen;
+            }
+        }
+
+        public class KeyBindingUpdatedEventArgs
+        {
+            public bool BindingConflictResolved { get; }
+            public bool CanAdvanceToNextBinding { get; }
+
+            public KeyBindingUpdatedEventArgs(bool bindingConflictResolved, bool canAdvanceToNextBinding)
+            {
+                BindingConflictResolved = bindingConflictResolved;
+                CanAdvanceToNextBinding = canAdvanceToNextBinding;
+            }
+        }
 
         #endregion
 

From 9b0c4acdefdcd47c0e98f55aa18d5a00bf272cb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 18:29:06 +0900
Subject: [PATCH 1825/2100] Split `KeyBindingRow` out into partial pieces

---
 .../Input/KeyBindingRow.ConflictResolution.cs |  75 +++++
 .../Sections/Input/KeyBindingRow.KeyButton.cs | 168 +++++++++++
 .../Settings/Sections/Input/KeyBindingRow.cs  | 278 +++---------------
 3 files changed, 276 insertions(+), 245 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
new file mode 100644
index 0000000000..8afa43b1ff
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
@@ -0,0 +1,75 @@
+// Copyright (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.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Bindings;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public partial class KeyBindingRow : IHasPopover
+    {
+        private readonly Bindable<KeyBindingConflictInfo> keyBindingConflictInfo = new Bindable<KeyBindingConflictInfo>();
+
+        public Popover GetPopover() => new KeyBindingConflictPopover
+        {
+            ConflictInfo = { BindTarget = keyBindingConflictInfo },
+            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: true, canAdvanceToNextBinding: false))
+        };
+
+        private void showBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
+        {
+            keyBindingConflictInfo.Value = conflictInfo;
+            this.ShowPopover();
+        }
+
+        /// <summary>
+        /// Contains information about the key binding conflict to be resolved.
+        /// </summary>
+        public class KeyBindingConflictInfo
+        {
+            public ConflictingKeyBinding Existing { get; }
+            public ConflictingKeyBinding New { get; }
+
+            /// <summary>
+            /// Contains information about the key binding conflict to be resolved.
+            /// </summary>
+            public KeyBindingConflictInfo(ConflictingKeyBinding existingBinding, ConflictingKeyBinding newBinding)
+            {
+                Existing = existingBinding;
+                New = newBinding;
+            }
+        }
+
+        public class ConflictingKeyBinding
+        {
+            public Guid ID { get; }
+            public object Action { get; }
+            public KeyCombination CombinationWhenChosen { get; }
+            public KeyCombination CombinationWhenNotChosen { get; }
+
+            public ConflictingKeyBinding(Guid id, object action, KeyCombination combinationWhenChosen, KeyCombination combinationWhenNotChosen)
+            {
+                ID = id;
+                Action = action;
+                CombinationWhenChosen = combinationWhenChosen;
+                CombinationWhenNotChosen = combinationWhenNotChosen;
+            }
+        }
+
+        public class KeyBindingUpdatedEventArgs
+        {
+            public bool BindingConflictResolved { get; }
+            public bool CanAdvanceToNextBinding { get; }
+
+            public KeyBindingUpdatedEventArgs(bool bindingConflictResolved, bool canAdvanceToNextBinding)
+            {
+                BindingConflictResolved = bindingConflictResolved;
+                CanAdvanceToNextBinding = canAdvanceToNextBinding;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs
new file mode 100644
index 0000000000..cf26300fb6
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs
@@ -0,0 +1,168 @@
+// Copyright (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.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Input;
+using osu.Game.Input.Bindings;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public partial class KeyBindingRow
+    {
+        public partial class KeyButton : Container
+        {
+            public Bindable<RealmKeyBinding> KeyBinding { get; } = new Bindable<RealmKeyBinding>();
+
+            private readonly Box box;
+            public readonly OsuSpriteText Text;
+
+            [Resolved]
+            private OverlayColourProvider colourProvider { get; set; } = null!;
+
+            [Resolved]
+            private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
+
+            private bool isBinding;
+
+            public bool IsBinding
+            {
+                get => isBinding;
+                set
+                {
+                    if (value == isBinding) return;
+
+                    isBinding = value;
+
+                    updateHoverState();
+                }
+            }
+
+            public KeyButton()
+            {
+                Margin = new MarginPadding(padding);
+
+                Masking = true;
+                CornerRadius = padding;
+
+                Height = height;
+                AutoSizeAxes = Axes.X;
+
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        AlwaysPresent = true,
+                        Width = 80,
+                        Height = height,
+                    },
+                    box = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    Text = new OsuSpriteText
+                    {
+                        Font = OsuFont.Numeric.With(size: 10),
+                        Margin = new MarginPadding(5),
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                    new HoverSounds()
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                KeyBinding.BindValueChanged(_ =>
+                {
+                    if (KeyBinding.Value.IsManaged)
+                        throw new ArgumentException("Key binding should not be attached as we make temporary changes", nameof(KeyBinding));
+
+                    updateKeyCombinationText();
+                });
+                keyCombinationProvider.KeymapChanged += updateKeyCombinationText;
+                updateKeyCombinationText();
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                updateHoverState();
+                FinishTransforms(true);
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateHoverState();
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateHoverState();
+                base.OnHoverLost(e);
+            }
+
+            private void updateHoverState()
+            {
+                if (isBinding)
+                {
+                    box.FadeColour(colourProvider.Light2, transition_time, Easing.OutQuint);
+                    Text.FadeColour(Color4.Black, transition_time, Easing.OutQuint);
+                }
+                else
+                {
+                    box.FadeColour(IsHovered ? colourProvider.Light4 : colourProvider.Background6, transition_time, Easing.OutQuint);
+                    Text.FadeColour(IsHovered ? Color4.Black : Color4.White, transition_time, Easing.OutQuint);
+                }
+            }
+
+            /// <summary>
+            /// Update from a key combination, only allowing a single non-modifier key to be specified.
+            /// </summary>
+            /// <param name="fullState">A <see cref="KeyCombination"/> generated from the full input state.</param>
+            /// <param name="triggerKey">The key which triggered this update, and should be used as the binding.</param>
+            public void UpdateKeyCombination(KeyCombination fullState, InputKey triggerKey) =>
+                UpdateKeyCombination(new KeyCombination(fullState.Keys.Where(KeyCombination.IsModifierKey).Append(triggerKey)));
+
+            public void UpdateKeyCombination(KeyCombination newCombination)
+            {
+                if (KeyBinding.Value.RulesetName != null && !RealmKeyBindingStore.CheckValidForGameplay(newCombination))
+                    return;
+
+                KeyBinding.Value.KeyCombination = newCombination;
+                updateKeyCombinationText();
+            }
+
+            private void updateKeyCombinationText()
+            {
+                Scheduler.AddOnce(updateText);
+
+                void updateText() => Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.Value.KeyCombination);
+            }
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+
+                if (keyCombinationProvider.IsNotNull())
+                    keyCombinationProvider.KeymapChanged -= updateKeyCombinationText;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index c7791f4412..7a5a269eb3 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -9,33 +9,27 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Database;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
 using osuTK;
-using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
-    public partial class KeyBindingRow : Container, IFilterable, IHasPopover
+    public partial class KeyBindingRow : Container, IFilterable
     {
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
@@ -210,18 +204,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
         }
 
-        private void updateButtons()
-        {
-            if (buttons.Count > KeyBindings.Count)
-                buttons.RemoveRange(buttons.Skip(KeyBindings.Count).ToArray(), true);
-
-            while (buttons.Count < KeyBindings.Count)
-                buttons.Add(new KeyButton());
-
-            foreach (var (button, binding) in buttons.Zip(KeyBindings))
-                button.KeyBinding.Value = binding;
-        }
-
         public void RestoreDefaults()
         {
             int i = 0;
@@ -251,8 +233,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             base.OnHoverLost(e);
         }
 
-        private bool isModifier(Key k) => k < Key.F1;
-
         protected override bool OnClick(ClickEvent e) => true;
 
         protected override bool OnMouseDown(MouseDownEvent e)
@@ -325,6 +305,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!isModifier(e.Key)) finalise();
 
             return true;
+
+            bool isModifier(Key k) => k < Key.F1;
         }
 
         protected override void OnKeyUp(KeyUpEvent e)
@@ -434,6 +416,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             finalise();
         }
 
+        private void updateButtons()
+        {
+            if (buttons.Count > KeyBindings.Count)
+                buttons.RemoveRange(buttons.Skip(KeyBindings.Count).ToArray(), true);
+
+            while (buttons.Count < KeyBindings.Count)
+                buttons.Add(new KeyButton());
+
+            foreach (var (button, binding) in buttons.Zip(KeyBindings))
+                button.KeyBinding.Value = binding;
+        }
+
         private void clear()
         {
             if (bindTarget == null)
@@ -466,6 +460,24 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             cancelAndClearButtons.BypassAutoSizeAxes |= Axes.Y;
         }
 
+        protected override void OnFocus(FocusEvent e)
+        {
+            content.AutoSizeDuration = 500;
+            content.AutoSizeEasing = Easing.OutQuint;
+
+            cancelAndClearButtons.FadeIn(300, Easing.OutQuint);
+            cancelAndClearButtons.BypassAutoSizeAxes &= ~Axes.Y;
+
+            updateBindTarget();
+            base.OnFocus(e);
+        }
+
+        protected override void OnFocusLost(FocusLostEvent e)
+        {
+            finalise(false);
+            base.OnFocusLost(e);
+        }
+
         private void tryPersistKeyBinding(RealmKeyBinding keyBinding, bool advanceToNextBinding)
         {
             List<RealmKeyBinding> bindings = GetAllSectionBindings();
@@ -488,24 +500,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     new ConflictingKeyBinding(keyBindingBeforeUpdate.ID, Action, keyBinding.KeyCombination, keyBindingBeforeUpdate.KeyCombination)));
         }
 
-        protected override void OnFocus(FocusEvent e)
-        {
-            content.AutoSizeDuration = 500;
-            content.AutoSizeEasing = Easing.OutQuint;
-
-            cancelAndClearButtons.FadeIn(300, Easing.OutQuint);
-            cancelAndClearButtons.BypassAutoSizeAxes &= ~Axes.Y;
-
-            updateBindTarget();
-            base.OnFocus(e);
-        }
-
-        protected override void OnFocusLost(FocusLostEvent e)
-        {
-            finalise(false);
-            base.OnFocusLost(e);
-        }
-
         /// <summary>
         /// Updates the bind target to the currently hovered key button or the first if clicked anywhere else.
         /// </summary>
@@ -521,70 +515,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             isDefault.Value = KeyBindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
         }
 
-        #region Handling conflicts
-
-        private readonly Bindable<KeyBindingConflictInfo> keyBindingConflictInfo = new Bindable<KeyBindingConflictInfo>();
-
-        public Popover GetPopover() => new KeyBindingConflictPopover
-        {
-            ConflictInfo = { BindTarget = keyBindingConflictInfo },
-            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: true, canAdvanceToNextBinding: false))
-        };
-
-        private void showBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
-        {
-            keyBindingConflictInfo.Value = conflictInfo;
-            this.ShowPopover();
-        }
-
-        /// <summary>
-        /// Contains information about the key binding conflict to be resolved.
-        /// </summary>
-        public class KeyBindingConflictInfo
-        {
-            public ConflictingKeyBinding Existing { get; }
-            public ConflictingKeyBinding New { get; }
-
-            /// <summary>
-            /// Contains information about the key binding conflict to be resolved.
-            /// </summary>
-            public KeyBindingConflictInfo(ConflictingKeyBinding existingBinding, ConflictingKeyBinding newBinding)
-            {
-                Existing = existingBinding;
-                New = newBinding;
-            }
-        }
-
-        public class ConflictingKeyBinding
-        {
-            public Guid ID { get; }
-            public object Action { get; }
-            public KeyCombination CombinationWhenChosen { get; }
-            public KeyCombination CombinationWhenNotChosen { get; }
-
-            public ConflictingKeyBinding(Guid id, object action, KeyCombination combinationWhenChosen, KeyCombination combinationWhenNotChosen)
-            {
-                ID = id;
-                Action = action;
-                CombinationWhenChosen = combinationWhenChosen;
-                CombinationWhenNotChosen = combinationWhenNotChosen;
-            }
-        }
-
-        public class KeyBindingUpdatedEventArgs
-        {
-            public bool BindingConflictResolved { get; }
-            public bool CanAdvanceToNextBinding { get; }
-
-            public KeyBindingUpdatedEventArgs(bool bindingConflictResolved, bool canAdvanceToNextBinding)
-            {
-                BindingConflictResolved = bindingConflictResolved;
-                CanAdvanceToNextBinding = canAdvanceToNextBinding;
-            }
-        }
-
-        #endregion
-
         private partial class CancelButton : RoundedButton
         {
             public CancelButton()
@@ -602,147 +532,5 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Size = new Vector2(80, 20);
             }
         }
-
-        public partial class KeyButton : Container
-        {
-            public Bindable<RealmKeyBinding> KeyBinding { get; } = new Bindable<RealmKeyBinding>();
-
-            private readonly Box box;
-            public readonly OsuSpriteText Text;
-
-            [Resolved]
-            private OverlayColourProvider colourProvider { get; set; } = null!;
-
-            [Resolved]
-            private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
-
-            private bool isBinding;
-
-            public bool IsBinding
-            {
-                get => isBinding;
-                set
-                {
-                    if (value == isBinding) return;
-
-                    isBinding = value;
-
-                    updateHoverState();
-                }
-            }
-
-            public KeyButton()
-            {
-                Margin = new MarginPadding(padding);
-
-                Masking = true;
-                CornerRadius = padding;
-
-                Height = height;
-                AutoSizeAxes = Axes.X;
-
-                Children = new Drawable[]
-                {
-                    new Container
-                    {
-                        AlwaysPresent = true,
-                        Width = 80,
-                        Height = height,
-                    },
-                    box = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    Text = new OsuSpriteText
-                    {
-                        Font = OsuFont.Numeric.With(size: 10),
-                        Margin = new MarginPadding(5),
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    },
-                    new HoverSounds()
-                };
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                KeyBinding.BindValueChanged(_ =>
-                {
-                    if (KeyBinding.Value.IsManaged)
-                        throw new ArgumentException("Key binding should not be attached as we make temporary changes", nameof(KeyBinding));
-
-                    updateKeyCombinationText();
-                });
-                keyCombinationProvider.KeymapChanged += updateKeyCombinationText;
-                updateKeyCombinationText();
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                updateHoverState();
-                FinishTransforms(true);
-            }
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                updateHoverState();
-                return base.OnHover(e);
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                updateHoverState();
-                base.OnHoverLost(e);
-            }
-
-            private void updateHoverState()
-            {
-                if (isBinding)
-                {
-                    box.FadeColour(colourProvider.Light2, transition_time, Easing.OutQuint);
-                    Text.FadeColour(Color4.Black, transition_time, Easing.OutQuint);
-                }
-                else
-                {
-                    box.FadeColour(IsHovered ? colourProvider.Light4 : colourProvider.Background6, transition_time, Easing.OutQuint);
-                    Text.FadeColour(IsHovered ? Color4.Black : Color4.White, transition_time, Easing.OutQuint);
-                }
-            }
-
-            /// <summary>
-            /// Update from a key combination, only allowing a single non-modifier key to be specified.
-            /// </summary>
-            /// <param name="fullState">A <see cref="KeyCombination"/> generated from the full input state.</param>
-            /// <param name="triggerKey">The key which triggered this update, and should be used as the binding.</param>
-            public void UpdateKeyCombination(KeyCombination fullState, InputKey triggerKey) =>
-                UpdateKeyCombination(new KeyCombination(fullState.Keys.Where(KeyCombination.IsModifierKey).Append(triggerKey)));
-
-            public void UpdateKeyCombination(KeyCombination newCombination)
-            {
-                if (KeyBinding.Value.RulesetName != null && !RealmKeyBindingStore.CheckValidForGameplay(newCombination))
-                    return;
-
-                KeyBinding.Value.KeyCombination = newCombination;
-                updateKeyCombinationText();
-            }
-
-            private void updateKeyCombinationText()
-            {
-                Scheduler.AddOnce(updateText);
-
-                void updateText() => Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.Value.KeyCombination);
-            }
-
-            protected override void Dispose(bool isDisposing)
-            {
-                base.Dispose(isDisposing);
-
-                if (keyCombinationProvider.IsNotNull())
-                    keyCombinationProvider.KeymapChanged -= updateKeyCombinationText;
-            }
-        }
     }
 }

From 17b6ebbfbff78622bb3a5933910d2e73ddadeec7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 18:38:49 +0900
Subject: [PATCH 1826/2100] Avoid using a bindable in
 `KeyBindingConflictPopover` where data is never mutated

---
 .../TestSceneKeyBindingConflictPopover.cs     | 15 ++++----
 .../Input/KeyBindingConflictPopover.cs        | 35 ++++++++++---------
 .../Input/KeyBindingRow.ConflictResolution.cs | 17 +++++----
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
index da5a9dd513..03f74fa35c 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
@@ -52,15 +52,12 @@ namespace osu.Game.Tests.Visual.Settings
                 Action = this.ShowPopover;
             }
 
-            public Popover GetPopover() => new KeyBindingConflictPopover
-            {
-                ConflictInfo =
-                {
-                    Value = new KeyBindingRow.KeyBindingConflictInfo(
-                        new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.LeftButton, KeyCombination.FromKey(Key.X), new KeyCombination(InputKey.None)),
-                        new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.RightButton, KeyCombination.FromKey(Key.Z), KeyCombination.FromKey(Key.X)))
-                }
-            };
+            public Popover GetPopover() => new KeyBindingConflictPopover(
+                new KeyBindingRow.KeyBindingConflictInfo(
+                    new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.LeftButton, KeyCombination.FromKey(Key.X), new KeyCombination(InputKey.None)),
+                    new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.RightButton, KeyCombination.FromKey(Key.Z), KeyCombination.FromKey(Key.X))
+                )
+            );
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index a0f6192587..610325e412 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -18,15 +18,13 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Input.Bindings;
-using osuTK;
 using osu.Game.Localisation;
+using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public partial class KeyBindingConflictPopover : OsuPopover
     {
-        public Bindable<KeyBindingRow.KeyBindingConflictInfo> ConflictInfo { get; } = new Bindable<KeyBindingRow.KeyBindingConflictInfo>();
-
         public Action? BindingConflictResolved { get; init; }
 
         private ConflictingKeyBindingPreview newPreview = null!;
@@ -40,10 +38,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
-        [BackgroundDependencyLoader]
-        private void load() => recreateDisplay();
+        private readonly KeyBindingRow.KeyBindingConflictInfo conflictInfo;
 
-        private void recreateDisplay()
+        public KeyBindingConflictPopover(KeyBindingRow.KeyBindingConflictInfo conflictInfo)
+        {
+            this.conflictInfo = conflictInfo;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
             Child = new FillFlowContainer
             {
@@ -61,13 +64,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         Margin = new MarginPadding { Bottom = 10 }
                     },
                     existingPreview = new ConflictingKeyBindingPreview(
-                        ConflictInfo.Value.Existing.Action,
-                        ConflictInfo.Value.Existing.CombinationWhenChosen,
-                        ConflictInfo.Value.Existing.CombinationWhenNotChosen),
+                        conflictInfo.Existing.Action,
+                        conflictInfo.Existing.CombinationWhenChosen,
+                        conflictInfo.Existing.CombinationWhenNotChosen),
                     newPreview = new ConflictingKeyBindingPreview(
-                        ConflictInfo.Value.New.Action,
-                        ConflictInfo.Value.New.CombinationWhenChosen,
-                        ConflictInfo.Value.New.CombinationWhenNotChosen),
+                        conflictInfo.New.Action,
+                        conflictInfo.New.CombinationWhenChosen,
+                        conflictInfo.New.CombinationWhenNotChosen),
                     new Container
                     {
                         RelativeSizeAxes = Axes.X,
@@ -107,11 +110,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             // the temporary visual changes will be reverted by calling `Hide()` / `BindingConflictResolved`.
             realm.Write(r =>
             {
-                var existingBinding = r.Find<RealmKeyBinding>(ConflictInfo.Value.Existing.ID);
-                existingBinding!.KeyCombinationString = ConflictInfo.Value.Existing.CombinationWhenNotChosen.ToString();
+                var existingBinding = r.Find<RealmKeyBinding>(conflictInfo.Existing.ID);
+                existingBinding!.KeyCombinationString = conflictInfo.Existing.CombinationWhenNotChosen.ToString();
 
-                var newBinding = r.Find<RealmKeyBinding>(ConflictInfo.Value.New.ID);
-                newBinding!.KeyCombinationString = ConflictInfo.Value.Existing.CombinationWhenChosen.ToString();
+                var newBinding = r.Find<RealmKeyBinding>(conflictInfo.New.ID);
+                newBinding!.KeyCombinationString = conflictInfo.Existing.CombinationWhenChosen.ToString();
             });
 
             Hide();
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
index 8afa43b1ff..b5d482b6b4 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Bindables;
+using System.Diagnostics;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
@@ -12,17 +12,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public partial class KeyBindingRow : IHasPopover
     {
-        private readonly Bindable<KeyBindingConflictInfo> keyBindingConflictInfo = new Bindable<KeyBindingConflictInfo>();
+        private KeyBindingConflictInfo? pendingKeyBindingConflict;
 
-        public Popover GetPopover() => new KeyBindingConflictPopover
+        public Popover GetPopover()
         {
-            ConflictInfo = { BindTarget = keyBindingConflictInfo },
-            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: true, canAdvanceToNextBinding: false))
-        };
+            Debug.Assert(pendingKeyBindingConflict != null);
+            return new KeyBindingConflictPopover(pendingKeyBindingConflict)
+            {
+                BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: true, canAdvanceToNextBinding: false))
+            };
+        }
 
         private void showBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
         {
-            keyBindingConflictInfo.Value = conflictInfo;
+            pendingKeyBindingConflict = conflictInfo;
             this.ShowPopover();
         }
 

From ea766b792d886907dbc9862a45556530bc93629a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 11:58:55 +0200
Subject: [PATCH 1827/2100] Update localisation keys to match localisable
 member names

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

diff --git a/osu.Game/Localisation/InputSettingsStrings.cs b/osu.Game/Localisation/InputSettingsStrings.cs
index a13a9dc498..fcfe48bedb 100644
--- a/osu.Game/Localisation/InputSettingsStrings.cs
+++ b/osu.Game/Localisation/InputSettingsStrings.cs
@@ -72,17 +72,17 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "Keep existing"
         /// </summary>
-        public static LocalisableString KeepExistingBinding => new TranslatableString(getKey(@"keep_existing"), @"Keep existing");
+        public static LocalisableString KeepExistingBinding => new TranslatableString(getKey(@"keep_existing_binding"), @"Keep existing");
 
         /// <summary>
         /// "Apply new"
         /// </summary>
-        public static LocalisableString ApplyNewBinding => new TranslatableString(getKey(@"apply_new"), @"Apply new");
+        public static LocalisableString ApplyNewBinding => new TranslatableString(getKey(@"apply_new_binding"), @"Apply new");
 
         /// <summary>
         /// "(none)"
         /// </summary>
-        public static LocalisableString ActionHasNoKeyBinding => new TranslatableString(getKey(@"none"), @"(none)");
+        public static LocalisableString ActionHasNoKeyBinding => new TranslatableString(getKey(@"action_has_no_key_binding"), @"(none)");
 
         private static string getKey(string key) => $"{prefix}:{key}";
     }

From a1c68b66f212c9cfb178bc0b57281a6912f7b430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 12:06:25 +0200
Subject: [PATCH 1828/2100] Rename `KeyBindingRow` parts to appease
 CodeFileSanity

---
 ....ConflictResolution.cs => KeyBindingRow_ConflictResolution.cs} | 0
 .../{KeyBindingRow.KeyButton.cs => KeyBindingRow_KeyButton.cs}    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Overlays/Settings/Sections/Input/{KeyBindingRow.ConflictResolution.cs => KeyBindingRow_ConflictResolution.cs} (100%)
 rename osu.Game/Overlays/Settings/Sections/Input/{KeyBindingRow.KeyButton.cs => KeyBindingRow_KeyButton.cs} (100%)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_ConflictResolution.cs
similarity index 100%
rename from osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
rename to osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_ConflictResolution.cs
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs
similarity index 100%
rename from osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs
rename to osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs

From a88779e5880f9a02b442ace50faf23c9a6bd4491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 13:10:04 +0200
Subject: [PATCH 1829/2100] Use dimmed placeholder text instead of empty box on
 cleared bindings

---
 .../Sections/Input/KeyBindingRow_KeyButton.cs   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs
index cf26300fb6..53d0f50605 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs
@@ -12,11 +12,13 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
+using osu.Game.Localisation;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
@@ -153,7 +155,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 Scheduler.AddOnce(updateText);
 
-                void updateText() => Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.Value.KeyCombination);
+                void updateText()
+                {
+                    LocalisableString keyCombinationString = keyCombinationProvider.GetReadableString(KeyBinding.Value.KeyCombination);
+                    float alpha = 1;
+
+                    if (LocalisableString.IsNullOrEmpty(keyCombinationString))
+                    {
+                        keyCombinationString = InputSettingsStrings.ActionHasNoKeyBinding;
+                        alpha = 0.4f;
+                    }
+
+                    Text.Text = keyCombinationString;
+                    Text.Alpha = alpha;
+                }
             }
 
             protected override void Dispose(bool isDisposing)

From af89d69fc4d405a6d02d6fb442c9d57e8f5045d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 13:16:24 +0200
Subject: [PATCH 1830/2100] Fix dangerous buttons using different shades of
 pink

---
 osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs   | 2 +-
 osu.Game/Graphics/OsuColour.cs                                  | 2 ++
 osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs       | 2 +-
 osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs              | 2 +-
 osu.Game/Overlays/Settings/DangerousSettingsButton.cs           | 2 +-
 .../Settings/Sections/Input/KeyBindingConflictPopover.cs        | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 9dd028fa79..aa3718150c 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Tournament.Screens.Editors
                         new TourneyButton
                         {
                             RelativeSizeAxes = Axes.X,
-                            BackgroundColour = colours.Pink3,
+                            BackgroundColour = colours.DangerousButtonColour,
                             Text = "Clear all",
                             Action = () =>
                             {
diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index d0e07a9e66..75d313d98c 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -397,5 +397,7 @@ namespace osu.Game.Graphics
 
         public Color4 SpotlightColour => Green2;
         public Color4 FeaturedArtistColour => Blue2;
+
+        public Color4 DangerousButtonColour => Pink3;
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs b/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs
index b237dd9b71..39ef7924b9 100644
--- a/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs
+++ b/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            BackgroundColour = colours.PinkDark;
+            BackgroundColour = colours.DangerousButtonColour;
         }
     }
 }
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs b/osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs
index 95af8ec0f3..31a56c9748 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Overlays.FirstRunSetup
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
-                                BackgroundColour = colours.Pink3,
+                                BackgroundColour = colours.DangerousButtonColour,
                                 Text = FirstRunSetupOverlayStrings.ClassicDefaults,
                                 RelativeSizeAxes = Axes.X,
                                 Action = applyClassic
diff --git a/osu.Game/Overlays/Settings/DangerousSettingsButton.cs b/osu.Game/Overlays/Settings/DangerousSettingsButton.cs
index 42b042ae75..9a9d40cada 100644
--- a/osu.Game/Overlays/Settings/DangerousSettingsButton.cs
+++ b/osu.Game/Overlays/Settings/DangerousSettingsButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Settings
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            BackgroundColour = colours.Pink3;
+            BackgroundColour = colours.DangerousButtonColour;
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 610325e412..15061857e1 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             applyNewButton = new HoverableRoundedButton
                             {
                                 Text = InputSettingsStrings.ApplyNewBinding,
-                                BackgroundColour = colours.Pink3,
+                                BackgroundColour = colours.DangerousButtonColour,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreRight,

From d656306692f34dda17b163712b931828d276253a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 14:05:43 +0200
Subject: [PATCH 1831/2100] Remove approach rate adjustment from
 `TaikoModHardRock`

Approach rate does nothing in taiko.
---
 osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
index 37a630c8ad..ba41175461 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.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.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 
@@ -24,9 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
             base.ApplyToDifficulty(difficulty);
-
             difficulty.SliderMultiplier *= slider_multiplier;
-            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ADJUST_RATIO, 10.0f);
         }
     }
 }

From d97b618d024ce01d17ec1f5121c2811ad7bb3c43 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 13 Oct 2023 21:06:50 +0900
Subject: [PATCH 1832/2100] Use new `generic-error` sample in appropriate
 places

---
 .../Settings/Sections/Input/KeyBindingConflictPopover.cs        | 2 ++
 osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 610325e412..357ffac458 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private readonly KeyBindingRow.KeyBindingConflictInfo conflictInfo;
 
+        protected override string PopInSampleName => @"UI/generic-error";
+
         public KeyBindingConflictPopover(KeyBindingRow.KeyBindingConflictInfo conflictInfo)
         {
             this.conflictInfo = conflictInfo;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
index 5cf2f91ff4..66bbf92e58 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
                     }
                 };
 
-                sampleJoinFail = audio.Samples.Get(@"UI/password-fail");
+                sampleJoinFail = audio.Samples.Get(@"UI/generic-error");
 
                 joinButton.Action = performJoin;
             }

From 9b474b656d40f3b452d5c981ee78461ac2f83cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 15:03:41 +0200
Subject: [PATCH 1833/2100] Fix key binding panel test failures from
 introducing placeholder text

Whoops.
---
 .../Visual/Settings/TestSceneKeyBindingPanel.cs     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index fcbb16bef6..1c4e89e1a2 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -11,6 +11,7 @@ using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.Settings.Sections.Input;
@@ -157,7 +158,9 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("first binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text.ToString()));
+            AddAssert("first binding cleared",
+                () => multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text,
+                () => Is.EqualTo(InputSettingsStrings.ActionHasNoKeyBinding));
 
             AddStep("click second binding", () =>
             {
@@ -169,7 +172,9 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("second binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text.ToString()));
+            AddAssert("second binding cleared",
+                () => multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text,
+                () => Is.EqualTo(InputSettingsStrings.ActionHasNoKeyBinding));
 
             void clickClearButton()
             {
@@ -327,7 +332,7 @@ namespace osu.Game.Tests.Visual.Settings
             KeyBindingConflictPopover popover = null;
             AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
             AddStep("click second button", () => popover.ChildrenOfType<RoundedButton>().ElementAt(1).TriggerClick());
-            checkBinding("Left (centre)", string.Empty);
+            checkBinding("Left (centre)", InputSettingsStrings.ActionHasNoKeyBinding.ToString());
             checkBinding("Left (rim)", "M1");
         }
 
@@ -360,7 +365,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
             AddStep("click second button", () => popover.ChildrenOfType<RoundedButton>().ElementAt(1).TriggerClick());
             checkBinding("Left (centre)", "M1");
-            checkBinding("Left (rim)", string.Empty);
+            checkBinding("Left (rim)", InputSettingsStrings.ActionHasNoKeyBinding.ToString());
         }
 
         [Test]

From d4627a240261add2217d10c136935b4142433de9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 14 Oct 2023 03:48:59 +0900
Subject: [PATCH 1834/2100] 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 f0a4b38c03..c289ae89ee 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1014.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <PackageReference Include="SharpCompress" Version="0.34.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 48832c64acedcc144bba60fd8487c9703766c0a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 13:09:22 +0900
Subject: [PATCH 1835/2100] Fix health bar animating when it shouldn't be

It wasn't correctly checking the current underlying health, which could
be zero in usages of `AccumulatingHealthProcessor`, for instance.

Closes #25046.
---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 2f96233939..fdbce15b40 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.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.Extensions.ObjectExtensions;
@@ -78,22 +79,25 @@ namespace osu.Game.Screens.Play.HUD
             if (PlayInitialIncreaseAnimation)
                 startInitialAnimation();
             else
-                Current.Value = 1;
+                Current.Value = health.Value;
         }
 
         private void startInitialAnimation()
         {
+            if (Current.Value >= health.Value)
+                return;
+
             // TODO: this should run in gameplay time, including showing a larger increase when skipping.
             // TODO: it should also start increasing relative to the first hitobject.
             const double increase_delay = 150;
 
             initialIncrease = Scheduler.AddDelayed(() =>
             {
-                double newValue = Current.Value + 0.05f;
+                double newValue = Math.Min(Current.Value + 0.05f, health.Value);
                 this.TransformBindableTo(Current, newValue, increase_delay);
                 Scheduler.AddOnce(Flash);
 
-                if (newValue >= 1)
+                if (newValue >= health.Value)
                     finishInitialAnimation();
             }, increase_delay, true);
         }

From ddbda69751c8bb0c4674e35ee6cee86cdbdbb2aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 13:14:58 +0900
Subject: [PATCH 1836/2100] Remove nullability of `bonusNote`

---
 .../Objects/Drawables/DrawableNote.cs                  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index eaeac33a11..99bd66a147 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using System.Diagnostics;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -41,7 +40,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private Drawable headPiece;
 
-        [CanBeNull]
         private DrawablePerfectBonusNote bonusNote;
 
         public DrawableNote()
@@ -96,7 +94,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
                 {
-                    bonusNote!.TriggerResult(false);
+                    bonusNote.TriggerResult(false);
                     ApplyResult(r => r.Type = r.Judgement.MinResult);
                 }
 
@@ -107,7 +105,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (result == HitResult.None)
                 return;
 
-            bonusNote!.TriggerResult(result == HitResult.Perfect);
+            bonusNote.TriggerResult(result == HitResult.Perfect);
             ApplyResult(r => r.Type = MutateResultApplication(result));
         }
 
@@ -140,9 +138,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected override void ClearNestedHitObjects()
         {
-            if (bonusNote != null)
-                RemoveInternal(bonusNote, false);
-            bonusNote = null;
+            RemoveInternal(bonusNote, false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)

From e85c0397223c162720004bcb66c249cfbaf0b1d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 13:31:14 +0900
Subject: [PATCH 1837/2100] Adjust method flow to hopefully be more legible

---
 .../Objects/Drawables/DrawableHoldNoteTail.cs            | 2 +-
 .../Objects/Drawables/DrawableNote.cs                    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index a183231310..79002b3819 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // Factor in the release lenience
             base.CheckForResult(userTriggered, timeOffset / TailNote.RELEASE_WINDOW_LENIENCE);
 
-        protected override HitResult MutateResultApplication(HitResult result)
+        protected override HitResult GetCappedResult(HitResult result)
         {
             // If the head wasn't hit or the hold note was broken, cap the max score to Meh.
             bool hasComboBreak = !HoldNote.Head.IsHit || HoldNote.Body.HasHoldBreak;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 99bd66a147..c7eabaf616 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -105,11 +105,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (result == HitResult.None)
                 return;
 
+            result = GetCappedResult(result);
+
             bonusNote.TriggerResult(result == HitResult.Perfect);
-            ApplyResult(r => r.Type = MutateResultApplication(result));
+            ApplyResult(r => r.Type = result);
         }
 
-        protected virtual HitResult MutateResultApplication(HitResult result) => result;
+        /// <summary>
+        /// Some objects in mania may want to limit the max result.
+        /// </summary>
+        protected virtual HitResult GetCappedResult(HitResult result) => result;
 
         public virtual bool OnPressed(KeyBindingPressEvent<ManiaAction> e)
         {

From 7c49843411c750565a3ab80f64b9dbd7233484ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 14:01:47 +0900
Subject: [PATCH 1838/2100] Fix various tests

---
 .../Mods/TestSceneManiaModDoubleTime.cs       | 39 +++++++++++--------
 .../TestSceneHoldNoteInput.cs                 | 18 ++++-----
 .../TestSceneMaximumScore.cs                  |  4 +-
 .../Rulesets/Scoring/ScoreProcessorTest.cs    |  4 +-
 4 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index 00b79529a9..9f2530eb31 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -17,12 +17,14 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
     {
         private const double offset = 18;
 
+        protected override bool AllowFail => true;
+
         protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
 
         [Test]
         public void TestHitWindowWithoutDoubleTime() => CreateModTest(new ModTestData
         {
-            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value != 1,
+            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value == 1_000_000,
             Autoplay = false,
             Beatmap = new Beatmap
             {
@@ -40,24 +42,29 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         });
 
         [Test]
-        public void TestHitWindowWithDoubleTime() => CreateModTest(new ModTestData
+        public void TestHitWindowWithDoubleTime()
         {
-            Mod = new ManiaModDoubleTime(),
-            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1,
-            Autoplay = false,
-            Beatmap = new Beatmap
+            var doubleTime = new ManiaModDoubleTime();
+
+            CreateModTest(new ModTestData
             {
-                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
-                Difficulty = { OverallDifficulty = 10 },
-                HitObjects = new List<HitObject>
+                Mod = doubleTime,
+                PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value / doubleTime.ScoreMultiplier == 100010,
+                Autoplay = false,
+                Beatmap = new Beatmap
                 {
-                    new Note { StartTime = 1000 }
+                    BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+                    Difficulty = { OverallDifficulty = 10 },
+                    HitObjects = new List<HitObject>
+                    {
+                        new Note { StartTime = 1000 }
+                    },
                 },
-            },
-            ReplayFrames = new List<ReplayFrame>
-            {
-                new ManiaReplayFrame(1000 + offset, ManiaAction.Key1)
-            }
-        });
+                ReplayFrames = new List<ReplayFrame>
+                {
+                    new ManiaReplayFrame(1000 + offset, ManiaAction.Key1)
+                }
+            });
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 93128c512f..ccd5e0600d 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -200,10 +200,12 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertComboAtJudgement(0, 1);
+            // judgement combo offset by perfect bonus judgement. see logic in DrawableNote.CheckForResult.
+            assertComboAtJudgement(1, 1);
             assertTailJudgement(HitResult.Meh);
-            assertComboAtJudgement(1, 0);
-            assertComboAtJudgement(2, 1);
+            assertComboAtJudgement(2, 0);
+            // judgement combo offset by perfect bonus judgement. see logic in DrawableNote.CheckForResult.
+            assertComboAtJudgement(4, 1);
         }
 
         /// <summary>
@@ -392,13 +394,11 @@ namespace osu.Game.Rulesets.Mania.Tests
                         Duration = time_tail - time_head,
                         Column = 0,
                     },
+                    // Next note within tail lenience
+                    (ManiaHitObject)(note = new Note
                     {
-                        // Next note within tail lenience
-                        note = new Note
-                        {
-                            StartTime = time_tail + 50
-                        }
-                    }
+                        StartTime = time_tail + 50
+                    })
                 },
                 BeatmapInfo =
                 {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
index 3d0abaceb5..3a74f87f1a 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             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));
+            AddAssert("score is correct", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_030));
         }
 
         [Test]
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             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));
+            AddAssert("base score is 1 million", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_040));
         }
 
         private void performTest(List<ManiaHitObject> hitObjects, List<ReplayFrame> frames)
diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 92e94bd02d..cba90b2ebe 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [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.Good, HitResult.Perfect, 317_626)]
         [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)]
@@ -86,7 +86,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
         [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 7_975)]
         [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 15_949)]
-        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 30_398)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 31_928)]
         [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 49_546)]
         [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 49_546)]
         [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]

From 14fedffcc1c0d753a395b16a5521286c826ebb37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 14:53:36 +0900
Subject: [PATCH 1839/2100] Fix `MissForcefully` not considering the bonus
 object

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index c7eabaf616..27039d2f37 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -111,6 +111,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             ApplyResult(r => r.Type = result);
         }
 
+        public override void MissForcefully()
+        {
+            bonusNote.TriggerResult(false);
+            base.MissForcefully();
+        }
+
         /// <summary>
         /// Some objects in mania may want to limit the max result.
         /// </summary>

From 43f619f92a7761c95d9b4632373eb2b9ed0996a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 14:57:55 +0900
Subject: [PATCH 1840/2100] Add `DisplayResult` flag and remove unnecessary
 `AlwaysPresent`

---
 .../Objects/Drawables/DrawablePerfectBonusNote.cs              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
index 9f51f9c5b3..1761f675f5 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
@@ -5,10 +5,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
     public partial class DrawablePerfectBonusNote : DrawableManiaHitObject<PerfectBonusNote>
     {
+        public override bool DisplayResult => false;
+
         public DrawablePerfectBonusNote()
             : this(null!)
         {
-            AlwaysPresent = true;
         }
 
         public DrawablePerfectBonusNote(PerfectBonusNote hitObject)

From 1a957364aeb9aefa9c0ce5a08e1de5961e55db8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 14:58:49 +0900
Subject: [PATCH 1841/2100] Add empty hit windows on `PefectBonusNote`

---
 osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
index b601a0614b..e98b2ff1c1 100644
--- a/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
@@ -10,6 +10,7 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class PerfectBonusNote : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new PerfectBonusNoteJudgement();
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
         public class PerfectBonusNoteJudgement : ManiaJudgement
         {

From 3f09ed396f511bc45e4dfbe0eb1d205ae0e58a52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 15:11:33 +0900
Subject: [PATCH 1842/2100] Fix legacy skin body piece dimming when it
 shouldn't

---
 .../Skinning/Legacy/LegacyBodyPiece.cs            | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index 660f72e565..5c353887c3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -123,9 +123,18 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
         private void applyCustomUpdateState(DrawableHitObject hitObject, ArmedState state)
         {
-            // ensure that the hold note is also faded out when the head/tail/any tick is missed.
-            if (state == ArmedState.Miss)
-                missFadeTime.Value ??= hitObject.HitStateUpdateTime;
+            switch (hitObject)
+            {
+                // Ensure that the hold note is also faded out when the head/tail/any tick is missed.
+                // Importantly, we filter out unrelated objects like DrawablePerfectBonusNote.
+                case DrawableHoldNoteTail:
+                case DrawableHoldNoteHead:
+                case DrawableHoldNoteBody:
+                    if (state == ArmedState.Miss)
+                        missFadeTime.Value ??= hitObject.HitStateUpdateTime;
+
+                    break;
+            }
         }
 
         private void onIsHittingChanged(ValueChangedEvent<bool> isHitting)

From 4f1546c4743fea3a9ee89dded4086d710fd50557 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 15:14:26 +0900
Subject: [PATCH 1843/2100] Rename `PerfectBonusNote` to `NotePerfectBonus`

---
 .../Objects/Drawables/DrawableNote.cs          | 18 +++++++++---------
 ...onusNote.cs => DrawableNotePerfectBonus.cs} |  6 +++---
 osu.Game.Rulesets.Mania/Objects/Note.cs        |  2 +-
 ...PerfectBonusNote.cs => NotePerfectBonus.cs} |  6 +++---
 .../Skinning/Legacy/LegacyBodyPiece.cs         |  2 +-
 osu.Game.Rulesets.Mania/UI/Column.cs           |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)
 rename osu.Game.Rulesets.Mania/Objects/Drawables/{DrawablePerfectBonusNote.cs => DrawableNotePerfectBonus.cs} (76%)
 rename osu.Game.Rulesets.Mania/Objects/{PerfectBonusNote.cs => NotePerfectBonus.cs} (70%)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 27039d2f37..c70dfcb761 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private Drawable headPiece;
 
-        private DrawablePerfectBonusNote bonusNote;
+        private DrawableNotePerfectBonus perfectBonus;
 
         public DrawableNote()
             : this(null)
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
                 {
-                    bonusNote.TriggerResult(false);
+                    perfectBonus.TriggerResult(false);
                     ApplyResult(r => r.Type = r.Judgement.MinResult);
                 }
 
@@ -107,13 +107,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             result = GetCappedResult(result);
 
-            bonusNote.TriggerResult(result == HitResult.Perfect);
+            perfectBonus.TriggerResult(result == HitResult.Perfect);
             ApplyResult(r => r.Type = result);
         }
 
         public override void MissForcefully()
         {
-            bonusNote.TriggerResult(false);
+            perfectBonus.TriggerResult(false);
             base.MissForcefully();
         }
 
@@ -141,23 +141,23 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             switch (hitObject)
             {
-                case DrawablePerfectBonusNote bonus:
-                    AddInternal(bonusNote = bonus);
+                case DrawableNotePerfectBonus bonus:
+                    AddInternal(perfectBonus = bonus);
                     break;
             }
         }
 
         protected override void ClearNestedHitObjects()
         {
-            RemoveInternal(bonusNote, false);
+            RemoveInternal(perfectBonus, false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
         {
             switch (hitObject)
             {
-                case PerfectBonusNote bonus:
-                    return new DrawablePerfectBonusNote(bonus);
+                case NotePerfectBonus bonus:
+                    return new DrawableNotePerfectBonus(bonus);
             }
 
             return base.CreateNestedHitObject(hitObject);
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNotePerfectBonus.cs
similarity index 76%
rename from osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
rename to osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNotePerfectBonus.cs
index 1761f675f5..70ddb60296 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNotePerfectBonus.cs
@@ -3,16 +3,16 @@
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
-    public partial class DrawablePerfectBonusNote : DrawableManiaHitObject<PerfectBonusNote>
+    public partial class DrawableNotePerfectBonus : DrawableManiaHitObject<NotePerfectBonus>
     {
         public override bool DisplayResult => false;
 
-        public DrawablePerfectBonusNote()
+        public DrawableNotePerfectBonus()
             : this(null!)
         {
         }
 
-        public DrawablePerfectBonusNote(PerfectBonusNote hitObject)
+        public DrawableNotePerfectBonus(NotePerfectBonus hitObject)
             : base(hitObject)
         {
         }
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 955d3e9c7d..5914132624 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Objects
         {
             base.CreateNestedHitObjects(cancellationToken);
 
-            AddNested(new PerfectBonusNote { StartTime = StartTime });
+            AddNested(new NotePerfectBonus { StartTime = StartTime });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/NotePerfectBonus.cs
similarity index 70%
rename from osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
rename to osu.Game.Rulesets.Mania/Objects/NotePerfectBonus.cs
index e98b2ff1c1..def4c01268 100644
--- a/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/NotePerfectBonus.cs
@@ -7,12 +7,12 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects
 {
-    public class PerfectBonusNote : ManiaHitObject
+    public class NotePerfectBonus : ManiaHitObject
     {
-        public override Judgement CreateJudgement() => new PerfectBonusNoteJudgement();
+        public override Judgement CreateJudgement() => new NotePerfectBonusJudgement();
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
-        public class PerfectBonusNoteJudgement : ManiaJudgement
+        public class NotePerfectBonusJudgement : ManiaJudgement
         {
             public override HitResult MaxResult => HitResult.SmallBonus;
         }
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index 5c353887c3..f27b3bdd5c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             switch (hitObject)
             {
                 // Ensure that the hold note is also faded out when the head/tail/any tick is missed.
-                // Importantly, we filter out unrelated objects like DrawablePerfectBonusNote.
+                // Importantly, we filter out unrelated objects like DrawableNotePerfectBonus.
                 case DrawableHoldNoteTail:
                 case DrawableHoldNoteHead:
                 case DrawableHoldNoteBody:
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 68d1e929be..9489281176 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Mania.UI
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
             RegisterPool<Note, DrawableNote>(10, 50);
-            RegisterPool<PerfectBonusNote, DrawablePerfectBonusNote>(10, 50);
+            RegisterPool<NotePerfectBonus, DrawableNotePerfectBonus>(10, 50);
             RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);

From d9d062915722a7fafe2c8d987067032157c21439 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 15:16:10 +0900
Subject: [PATCH 1844/2100] Fix code quality inspection (weird one)

---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index ccd5e0600d..044ce37832 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -382,7 +382,8 @@ namespace osu.Game.Rulesets.Mania.Tests
         [Test]
         public void TestPressAndReleaseJustAfterTailWithNearbyNote()
         {
-            Note note;
+            // Next note within tail lenience
+            Note note = new Note { StartTime = time_tail + 50 };
 
             var beatmap = new Beatmap<ManiaHitObject>
             {
@@ -394,11 +395,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                         Duration = time_tail - time_head,
                         Column = 0,
                     },
-                    // Next note within tail lenience
-                    (ManiaHitObject)(note = new Note
-                    {
-                        StartTime = time_tail + 50
-                    })
+                    note
                 },
                 BeatmapInfo =
                 {

From 36112302d671bae3df0477346caec9960ddde936 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 15:51:18 +0900
Subject: [PATCH 1845/2100] Remove drag handles from manage collections dialog
 for now

The realm implementation doesn't support this.
---
 osu.Game/Collections/DrawableCollectionListItem.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 4131148f3f..596bb5d673 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -36,7 +36,13 @@ namespace osu.Game.Collections
         public DrawableCollectionListItem(Live<BeatmapCollection> item, bool isCreated)
             : base(item)
         {
-            ShowDragHandle.Value = item.IsManaged;
+            // For now we don't support rearranging and always use alphabetical sort.
+            // Change this to:
+            //
+            // ShowDragHandle.Value = item.IsManaged;
+            //
+            // if we want to support user sorting (but changes will need to be made to realm to persist).
+            ShowDragHandle.Value = false;
         }
 
         protected override Drawable CreateContent() => new ItemContent(Model);

From db00b794a24bc21c1e637027d9c2c0ecd1fe057c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 08:52:32 +0200
Subject: [PATCH 1846/2100] Fix test failure due to missing zero (and FP
 shenanigans)

---
 .../Mods/TestSceneManiaModDoubleTime.cs                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index 9f2530eb31..f1a432cc06 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Mod = doubleTime,
-                PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value / doubleTime.ScoreMultiplier == 100010,
+                PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value == (long)(1000010 * doubleTime.ScoreMultiplier),
                 Autoplay = false,
                 Beatmap = new Beatmap
                 {

From b9a84127ac876c9f153f16f2cfe06da2cde3ff89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 08:57:35 +0200
Subject: [PATCH 1847/2100] Remove mention of "any tick"

They're very dead now.
---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index f27b3bdd5c..66e67136df 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         {
             switch (hitObject)
             {
-                // Ensure that the hold note is also faded out when the head/tail/any tick is missed.
+                // Ensure that the hold note is also faded out when the head/tail/body is missed.
                 // Importantly, we filter out unrelated objects like DrawableNotePerfectBonus.
                 case DrawableHoldNoteTail:
                 case DrawableHoldNoteHead:

From 7139592e431ee6da7a6fa48c47f43fd6cf316d15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 15:53:40 +0900
Subject: [PATCH 1848/2100] Fix collections not being sorted correctly in
 context menus

---
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs    | 6 +++++-
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs     | 6 +++++-
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs  | 7 ++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 9e07279be2..8f405399a7 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -500,7 +500,11 @@ namespace osu.Game.Screens.OnlinePlay
                 {
                     if (beatmaps.QueryBeatmap(b => b.OnlineID == beatmap.OnlineID) is BeatmapInfo local && !local.BeatmapSet.AsNonNull().DeletePending)
                     {
-                        var collectionItems = realm.Realm.All<BeatmapCollection>().AsEnumerable().Select(c => new CollectionToggleMenuItem(c.ToLive(realm), beatmap)).Cast<OsuMenuItem>().ToList();
+                        var collectionItems = realm.Realm.All<BeatmapCollection>()
+                                                   .OrderBy(c => c.Name)
+                                                   .AsEnumerable()
+                                                   .Select(c => new CollectionToggleMenuItem(c.ToLive(realm), beatmap)).Cast<OsuMenuItem>().ToList();
+
                         if (manageCollectionsDialog != null)
                             collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index f08d14720b..3dfd801f02 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -233,7 +233,11 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmapInfo.OnlineID > 0 && beatmapOverlay != null)
                     items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmapInfo.OnlineID)));
 
-                var collectionItems = realm.Realm.All<BeatmapCollection>().AsEnumerable().Select(c => new CollectionToggleMenuItem(c.ToLive(realm), beatmapInfo)).Cast<OsuMenuItem>().ToList();
+                var collectionItems = realm.Realm.All<BeatmapCollection>()
+                                           .OrderBy(c => c.Name)
+                                           .AsEnumerable()
+                                           .Select(c => new CollectionToggleMenuItem(c.ToLive(realm), beatmapInfo)).Cast<OsuMenuItem>().ToList();
+
                 if (manageCollectionsDialog != null)
                     collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 4234184ad1..dd711b2513 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -225,7 +225,12 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmapSet.OnlineID > 0 && viewDetails != null)
                     items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => viewDetails(beatmapSet.OnlineID)));
 
-                var collectionItems = realm.Realm.All<BeatmapCollection>().AsEnumerable().Select(createCollectionMenuItem).ToList();
+                var collectionItems = realm.Realm.All<BeatmapCollection>()
+                                           .OrderBy(c => c.Name)
+                                           .AsEnumerable()
+                                           .Select(createCollectionMenuItem)
+                                           .ToList();
+
                 if (manageCollectionsDialog != null)
                     collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
 

From 624c05e0ff3b783ceb626e8461ce3e2d3c1e1ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 09:04:53 +0200
Subject: [PATCH 1849/2100] Rename test step

---
 osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
index 3a74f87f1a..edf866952b 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("all objects perfectly judged",
                 () => judgementResults.Select(result => result.Type),
                 () => Is.EquivalentTo(judgementResults.Select(result => result.Judgement.MaxResult)));
-            AddAssert("base score is 1 million", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_040));
+            AddAssert("score is correct", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_040));
         }
 
         private void performTest(List<ManiaHitObject> hitObjects, List<ReplayFrame> frames)

From c48142816c63d0d2d27f920f573435b47198b1d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 09:06:34 +0200
Subject: [PATCH 1850/2100] Reformat long lines

---
 .../Mods/TestSceneManiaModDoubleTime.cs                   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index f1a432cc06..c717f03f51 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -24,7 +24,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         [Test]
         public void TestHitWindowWithoutDoubleTime() => CreateModTest(new ModTestData
         {
-            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value == 1_000_000,
+            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0
+                                  && Player.ScoreProcessor.Accuracy.Value == 1
+                                  && Player.ScoreProcessor.TotalScore.Value == 1_000_000,
             Autoplay = false,
             Beatmap = new Beatmap
             {
@@ -49,7 +51,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Mod = doubleTime,
-                PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value == (long)(1000010 * doubleTime.ScoreMultiplier),
+                PassCondition = () => Player.ScoreProcessor.JudgedHits > 0
+                                      && Player.ScoreProcessor.Accuracy.Value == 1
+                                      && Player.ScoreProcessor.TotalScore.Value == (long)(1_000_010 * doubleTime.ScoreMultiplier),
                 Autoplay = false,
                 Beatmap = new Beatmap
                 {

From 84be714d6bd100e69e464dafda6c471aa8e292e8 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 30 Sep 2023 02:19:11 +0900
Subject: [PATCH 1851/2100] Fix large instantaneous delta on first frame

Happens when the first update frame comes in before any mouse input.
---
 .../Default/SpinnerRotationTracker.cs         | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 719cf57d98..41d6e689b1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -22,11 +22,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private readonly DrawableSpinner drawableSpinner;
 
-        private Vector2 mousePosition;
+        private Vector2? mousePosition;
+        private float? lastAngle;
 
-        private float lastAngle;
         private float currentRotation;
-
         private bool rotationTransferred;
 
         [Resolved(canBeNull: true)]
@@ -63,17 +62,19 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         protected override void Update()
         {
             base.Update();
-            float thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
 
-            float delta = thisAngle - lastAngle;
+            if (mousePosition is Vector2 pos)
+            {
+                float thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(pos.X - DrawSize.X / 2, pos.Y - DrawSize.Y / 2));
+                float delta = lastAngle == null ? 0 : thisAngle - lastAngle.Value;
 
-            if (Tracking)
-                AddRotation(delta);
+                if (Tracking)
+                    AddRotation(delta);
 
-            lastAngle = thisAngle;
+                lastAngle = thisAngle;
+            }
 
             IsSpinning.Value = isSpinnableTime && Math.Abs(currentRotation - Rotation) > 10f;
-
             Rotation = (float)Interpolation.Damp(Rotation, currentRotation, 0.99, Math.Abs(Time.Elapsed));
         }
 
@@ -116,8 +117,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         {
             Tracking = false;
             IsSpinning.Value = false;
-            mousePosition = default;
-            lastAngle = currentRotation = Rotation = 0;
+            mousePosition = null;
+            lastAngle = null;
+            currentRotation = 0;
+            Rotation = 0;
             rotationTransferred = false;
         }
 

From c1a817fec607aa2577fab9ebf7223b352020d33e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 Sep 2023 07:47:07 +0200
Subject: [PATCH 1852/2100] Add `LegacyOnlineID` with backwards migration

---
 osu.Game/Database/RealmAccess.cs | 21 ++++++++++++++++++++-
 osu.Game/Scoring/ScoreInfo.cs    | 16 ++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index cd97bb6430..12d1753b9b 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -84,8 +84,9 @@ namespace osu.Game.Database
         /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
         /// 33   2023-08-16    Reset default chat toggle key binding to avoid conflict with newly added leaderboard toggle key binding.
         /// 34   2023-08-21    Add BackgroundReprocessingFailed flag to ScoreInfo to track upgrade failures.
+        /// 35   2023-09-01    Add LegacyOnlineID to ScoreInfo. Move osu_scores_*_high IDs stored in OnlineID to LegacyOnlineID. Reset anomalous OnlineIDs.
         /// </summary>
-        private const int schema_version = 34;
+        private const int schema_version = 35;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -1031,6 +1032,24 @@ namespace osu.Game.Database
 
                     break;
                 }
+
+                case 35:
+                {
+                    foreach (var score in migration.NewRealm.All<ScoreInfo>())
+                    {
+                        if (score.OnlineID > 0)
+                        {
+                            score.LegacyOnlineID = score.OnlineID;
+                            score.OnlineID = -1;
+                        }
+                        else
+                        {
+                            score.LegacyOnlineID = score.OnlineID = -1;
+                        }
+                    }
+
+                    break;
+                }
             }
 
             Logger.Log($"Migration completed in {stopwatch.ElapsedMilliseconds}ms");
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 8531408555..992271d072 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -100,9 +100,25 @@ namespace osu.Game.Scoring
 
         public double? PP { get; set; }
 
+        /// <summary>
+        /// The online ID of this score.
+        /// </summary>
+        /// <remarks>
+        /// In the osu-web database, this ID (if present) comes from the new <c>solo_scores</c> table.
+        /// </remarks>
         [Indexed]
         public long OnlineID { get; set; } = -1;
 
+        /// <summary>
+        /// The legacy online ID of this score.
+        /// </summary>
+        /// <remarks>
+        /// In the osu-web database, this ID (if present) comes from the legacy <c>osu_scores_*_high</c> tables.
+        /// This ID is also stored to replays set on osu!stable.
+        /// </remarks>
+        [Indexed]
+        public long LegacyOnlineID { get; set; } = -1;
+
         [MapTo("User")]
         public RealmUser RealmUser { get; set; } = null!;
 

From bfcb4f4f2d940835eb8e9f42eb620184d4ed877c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 Sep 2023 08:04:35 +0200
Subject: [PATCH 1853/2100] Add failing test for legacy online ID decoding

---
 .../Beatmaps/Formats/LegacyScoreDecoderTest.cs    |  14 ++++++++++++++
 .../taiko-replay-with-legacy-online-id.osr        | Bin 0 -> 238 bytes
 2 files changed, 14 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/Replays/taiko-replay-with-legacy-online-id.osr

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
index 93cda34ef7..c7fd3ba098 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
@@ -87,6 +87,20 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestDecodeLegacyOnlineID()
+        {
+            var decoder = new TestLegacyScoreDecoder();
+
+            using (var resourceStream = TestResources.OpenResource("Replays/taiko-replay-with-legacy-online-id.osr"))
+            {
+                var score = decoder.Parse(resourceStream);
+
+                Assert.That(score.ScoreInfo.OnlineID, Is.EqualTo(-1));
+                Assert.That(score.ScoreInfo.LegacyOnlineID, Is.EqualTo(255));
+            }
+        }
+
         [TestCase(3, true)]
         [TestCase(6, false)]
         [TestCase(LegacyBeatmapDecoder.LATEST_VERSION, false)]
diff --git a/osu.Game.Tests/Resources/Replays/taiko-replay-with-legacy-online-id.osr b/osu.Game.Tests/Resources/Replays/taiko-replay-with-legacy-online-id.osr
new file mode 100644
index 0000000000000000000000000000000000000000..85ad28c7ca3f9e32146cfff8994cb9fbcf584a6e
GIT binary patch
literal 238
zcmZSN=rUpCRxmU*PqQ>jN;EJ_HcqxoN;FS4NKLXxNl8jJvox|WwB+W>P0h|uOvx`U
zRpeGMNi{Y$H#9XgPc=7Av^2LcO*A!6v@}XiG&3+yPE9gmVE_RpF!@23fdRzlU|`@D
zG%_?ct})OvHr6pUG%%?#)JZt7C`od{EsiLlidY5)1qLgKE(Qj%9;dkG`r7Op-o=T*
z*CL8GF^jI?N!zpE@#WrB&!a^VpByr7JWzVO{9Crhvo#`$>L1#cZ&WQ%Oui9fe{Qpf
Zr?FkmyS<TzQ&=CTIWYVOyM%#(3jlWxMX3M)

literal 0
HcmV?d00001


From fa519984dfdbb5cff3425f170ba7e8698d5fd318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 Sep 2023 08:10:26 +0200
Subject: [PATCH 1854/2100] Move legacy online ID encode/decode to legacy
 property

---
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 4 ++--
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 8c00110909..1441a14aa0 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -101,9 +101,9 @@ namespace osu.Game.Scoring.Legacy
                 byte[] compressedReplay = sr.ReadByteArray();
 
                 if (version >= 20140721)
-                    scoreInfo.OnlineID = sr.ReadInt64();
+                    scoreInfo.LegacyOnlineID = sr.ReadInt64();
                 else if (version >= 20121008)
-                    scoreInfo.OnlineID = sr.ReadInt32();
+                    scoreInfo.LegacyOnlineID = sr.ReadInt32();
 
                 byte[] compressedScoreInfo = null;
 
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index a95964ac52..872f09dda6 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Scoring.Legacy
                 sw.Write(getHpGraphFormatted());
                 sw.Write(score.ScoreInfo.Date.DateTime);
                 sw.WriteByteArray(createReplayData());
-                sw.Write((long)0);
+                sw.Write(score.ScoreInfo.LegacyOnlineID);
                 writeModSpecificData(score.ScoreInfo, sw);
                 sw.WriteByteArray(createScoreInfoData());
             }

From c53f4c144cc109d0b0f710adf39ea31be12a29fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 Sep 2023 08:23:29 +0200
Subject: [PATCH 1855/2100] Encode/decode new `OnlineID` into/from
 `LegacyReplaySoloScoreInfo`

---
 osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs | 8 ++++++++
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs        | 1 +
 2 files changed, 9 insertions(+)

diff --git a/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs b/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
index f2e8cf141b..d34edf7bdf 100644
--- a/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
+++ b/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
@@ -19,6 +19,13 @@ namespace osu.Game.Scoring.Legacy
     [JsonObject(MemberSerialization.OptIn)]
     public class LegacyReplaySoloScoreInfo
     {
+        /// <remarks>
+        /// The value of this property should correspond to <see cref="ScoreInfo.OnlineID"/>
+        /// (i.e. come from the `solo_scores` ID scheme).
+        /// </remarks>
+        [JsonProperty("online_id")]
+        public long OnlineID { get; set; } = -1;
+
         [JsonProperty("mods")]
         public APIMod[] Mods { get; set; } = Array.Empty<APIMod>();
 
@@ -30,6 +37,7 @@ namespace osu.Game.Scoring.Legacy
 
         public static LegacyReplaySoloScoreInfo FromScore(ScoreInfo score) => new LegacyReplaySoloScoreInfo
         {
+            OnlineID = score.OnlineID,
             Mods = score.APIMods,
             Statistics = score.Statistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
             MaximumStatistics = score.MaximumStatistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 1441a14aa0..c5e6e3bcce 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -121,6 +121,7 @@ namespace osu.Game.Scoring.Legacy
 
                         Debug.Assert(readScore != null);
 
+                        score.ScoreInfo.OnlineID = readScore.OnlineID;
                         score.ScoreInfo.Statistics = readScore.Statistics;
                         score.ScoreInfo.MaximumStatistics = readScore.MaximumStatistics;
                         score.ScoreInfo.Mods = readScore.Mods.Select(m => m.ToMod(currentRuleset)).ToArray();

From b144cfd55c1a5546a42223d3e2de44aecc47c56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Sep 2023 12:21:23 +0200
Subject: [PATCH 1856/2100] Add `LegacyOnlineID` handling to places that
 definitely need it

Mostly places that can interact with imported replays.

There are other places that use the online ID as a sort tiebreaker, or
to check presence of a score on results screens, but they should
probably still continue to only use `OnlineID`, since all scores with a
legacy online ID should have an online ID, but the converse is not
generally true.
---
 osu.Game/Extensions/ModelExtensions.cs  | 20 ++++++++++++++++++--
 osu.Game/Online/ScoreDownloadTracker.cs |  4 +++-
 osu.Game/OsuGame.cs                     |  3 +++
 osu.Game/Scoring/IScoreInfo.cs          |  2 ++
 osu.Game/Scoring/ScoreManager.cs        |  6 +++++-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Extensions/ModelExtensions.cs b/osu.Game/Extensions/ModelExtensions.cs
index efb3c4d633..eef9b63b62 100644
--- a/osu.Game/Extensions/ModelExtensions.cs
+++ b/osu.Game/Extensions/ModelExtensions.cs
@@ -114,8 +114,24 @@ namespace osu.Game.Extensions
         /// </summary>
         /// <param name="instance">The instance to compare.</param>
         /// <param name="other">The other instance to compare against.</param>
-        /// <returns>Whether online IDs match. If either instance is missing an online ID, this will return false.</returns>
-        public static bool MatchesOnlineID(this IScoreInfo? instance, IScoreInfo? other) => matchesOnlineID(instance, other);
+        /// <returns>
+        /// Whether online IDs match.
+        /// Both <see cref="IHasOnlineID{T}.OnlineID"/> and <see cref="IScoreInfo.LegacyOnlineID"/> are checked, in that order.
+        /// If either instance is missing an online ID, this will return false.
+        /// </returns>
+        public static bool MatchesOnlineID(this IScoreInfo? instance, IScoreInfo? other)
+        {
+            if (matchesOnlineID(instance, other))
+                return true;
+
+            if (instance == null || other == null)
+                return false;
+
+            if (instance.LegacyOnlineID < 0 || other.LegacyOnlineID < 0)
+                return false;
+
+            return instance.LegacyOnlineID.Equals(other.LegacyOnlineID);
+        }
 
         private static bool matchesOnlineID(this IHasOnlineID<long>? instance, IHasOnlineID<long>? other)
         {
diff --git a/osu.Game/Online/ScoreDownloadTracker.cs b/osu.Game/Online/ScoreDownloadTracker.cs
index de42292372..dfdac24d19 100644
--- a/osu.Game/Online/ScoreDownloadTracker.cs
+++ b/osu.Game/Online/ScoreDownloadTracker.cs
@@ -39,7 +39,8 @@ namespace osu.Game.Online
             var scoreInfo = new ScoreInfo
             {
                 ID = TrackedItem.ID,
-                OnlineID = TrackedItem.OnlineID
+                OnlineID = TrackedItem.OnlineID,
+                LegacyOnlineID = TrackedItem.LegacyOnlineID
             };
 
             Downloader.DownloadBegan += downloadBegan;
@@ -47,6 +48,7 @@ namespace osu.Game.Online
 
             realmSubscription = realm.RegisterForNotifications(r => r.All<ScoreInfo>().Where(s =>
                 ((s.OnlineID > 0 && s.OnlineID == TrackedItem.OnlineID)
+                 || (s.LegacyOnlineID > 0 && s.LegacyOnlineID == TrackedItem.LegacyOnlineID)
                  || (!string.IsNullOrEmpty(s.Hash) && s.Hash == TrackedItem.Hash))
                 && !s.DeletePending), (items, _) =>
             {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 885077a8e8..2f11964f6a 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -678,6 +678,9 @@ namespace osu.Game
             if (score.OnlineID > 0)
                 databasedScoreInfo = ScoreManager.Query(s => s.OnlineID == score.OnlineID);
 
+            if (score.LegacyOnlineID > 0)
+                databasedScoreInfo ??= ScoreManager.Query(s => s.LegacyOnlineID == score.LegacyOnlineID);
+
             if (score is ScoreInfo scoreInfo)
                 databasedScoreInfo ??= ScoreManager.Query(s => s.Hash == scoreInfo.Hash);
 
diff --git a/osu.Game/Scoring/IScoreInfo.cs b/osu.Game/Scoring/IScoreInfo.cs
index d17558f800..4083d57fa0 100644
--- a/osu.Game/Scoring/IScoreInfo.cs
+++ b/osu.Game/Scoring/IScoreInfo.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Scoring
 
         bool HasReplay { get; }
 
+        long LegacyOnlineID { get; }
+
         DateTimeOffset Date { get; }
 
         double? PP { get; }
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 31b5bd8365..02d9e0a280 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -150,7 +150,11 @@ namespace osu.Game.Scoring
 
         public Task Import(ImportTask[] imports, ImportParameters parameters = default) => scoreImporter.Import(imports, parameters);
 
-        public override bool IsAvailableLocally(ScoreInfo model) => Realm.Run(realm => realm.All<ScoreInfo>().Any(s => s.OnlineID == model.OnlineID));
+        public override bool IsAvailableLocally(ScoreInfo model)
+            => Realm.Run(realm => realm.All<ScoreInfo>()
+                                       // this basically inlines `ModelExtension.MatchesOnlineID(IScoreInfo, IScoreInfo)`,
+                                       // because that method can't be used here, as realm can't translate it to its query language.
+                                       .Any(s => s.OnlineID == model.OnlineID || s.LegacyOnlineID == model.LegacyOnlineID));
 
         public IEnumerable<string> HandledExtensions => scoreImporter.HandledExtensions;
 

From d5a733d244ba5d5915f3b6370c7dfebb383fc600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 12:32:28 +0200
Subject: [PATCH 1857/2100] Use solo score ID as `OnlineID` when converting
 from `MultiplayerScore`

---
 .../Playlists/TestScenePlaylistsResultsScreen.cs    | 13 ++++++++++---
 osu.Game/Online/Rooms/MultiplayerScore.cs           |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index cb422d8c06..3f230099da 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -245,6 +245,7 @@ namespace osu.Game.Tests.Visual.Playlists
             var multiplayerUserScore = new MultiplayerScore
             {
                 ID = highestScoreId,
+                SoloScoreID = (ulong?)highestScoreId,
                 Accuracy = userScore.Accuracy,
                 Passed = userScore.Passed,
                 Rank = userScore.Rank,
@@ -262,9 +263,11 @@ namespace osu.Game.Tests.Visual.Playlists
 
             for (int i = 1; i <= scores_per_result; i++)
             {
+                int nextLowest = getNextLowestScoreId();
                 multiplayerUserScore.ScoresAround.Lower.Scores.Add(new MultiplayerScore
                 {
-                    ID = getNextLowestScoreId(),
+                    ID = nextLowest,
+                    SoloScoreID = (ulong?)nextLowest,
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -277,9 +280,11 @@ namespace osu.Game.Tests.Visual.Playlists
                     },
                 });
 
+                int nextHighest = getNextHighestScoreId();
                 multiplayerUserScore.ScoresAround.Higher.Scores.Add(new MultiplayerScore
                 {
-                    ID = getNextHighestScoreId(),
+                    ID = nextHighest,
+                    SoloScoreID = (ulong?)nextHighest,
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -309,9 +314,11 @@ namespace osu.Game.Tests.Visual.Playlists
 
             for (int i = 1; i <= scores_per_result; i++)
             {
+                int id = sort == "score_asc" ? getNextHighestScoreId() : getNextLowestScoreId();
                 result.Scores.Add(new MultiplayerScore
                 {
-                    ID = sort == "score_asc" ? getNextHighestScoreId() : getNextLowestScoreId(),
+                    ID = id,
+                    SoloScoreID = (ulong?)id,
                     Accuracy = 1,
                     Passed = true,
                     Rank = ScoreRank.X,
diff --git a/osu.Game/Online/Rooms/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
index d5e0c7a970..21aa8df54b 100644
--- a/osu.Game/Online/Rooms/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Online.Rooms
 
             var scoreInfo = new ScoreInfo
             {
-                OnlineID = ID,
+                OnlineID = (long?)SoloScoreID ?? -1,
                 TotalScore = TotalScore,
                 MaxCombo = MaxCombo,
                 BeatmapInfo = beatmap,

From c4af8591a5952fc760ec967b37153178017d7e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 09:39:10 +0200
Subject: [PATCH 1858/2100] Preserve `OnlineID` when importing scores

Previously, for lazer scores, the ID returned from `osu-web` was
discarded and replaced with -1, due to the fact that the appropriate
structures for unification with stable, as well as unification across
solo and multiplayer, were not in place yet.

Now we're at the point where scores from all the aforementioned sources
receive a `solo_scores` DB row, and as such, we can start treating
`solo_scores`-scheme IDs as canonical "online IDs" for a score.
---
 osu.Game/Screens/Play/Player.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 97bfa35d49..845615742d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1166,13 +1166,6 @@ namespace osu.Game.Screens.Play
             // the import process will re-attach managed beatmap/rulesets to this score. we don't want this for now, so create a temporary copy to import.
             var importableScore = score.ScoreInfo.DeepClone();
 
-            // For the time being, online ID responses are not really useful for anything.
-            // In addition, the IDs provided via new (lazer) endpoints are based on a different autoincrement from legacy (stable) scores.
-            //
-            // Until we better define the server-side logic behind this, let's not store the online ID to avoid potential unique constraint
-            // conflicts across various systems (ie. solo and multiplayer).
-            importableScore.OnlineID = -1;
-
             var imported = scoreManager.Import(importableScore, replayReader);
 
             imported.PerformRead(s =>

From fb2293821ab009304c11be3d4d352ee8aa92debe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 11:26:51 +0200
Subject: [PATCH 1859/2100] Allow watching replay from multi/playlist results
 screens

---
 osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs      | 2 +-
 osu.Game/Online/Rooms/MultiplayerScore.cs                    | 5 ++++-
 osu.Game/Scoring/ScoreInfo.cs                                | 5 ++++-
 .../OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs       | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index 15f4bace96..783522220b 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Online.API.Requests.Responses
                 Statistics = Statistics,
                 MaximumStatistics = MaximumStatistics,
                 Date = EndedAt,
-                Hash = HasReplay ? "online" : string.Empty, // TODO: temporary?
+                HasOnlineReplay = HasReplay,
                 Mods = mods,
                 PP = PP,
             };
diff --git a/osu.Game/Online/Rooms/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
index 21aa8df54b..e6307ab7f0 100644
--- a/osu.Game/Online/Rooms/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -58,6 +58,9 @@ namespace osu.Game.Online.Rooms
         [JsonProperty("position")]
         public int? Position { get; set; }
 
+        [JsonProperty("has_replay")]
+        public bool HasReplay { get; set; }
+
         /// <summary>
         /// Any scores in the room around this score.
         /// </summary>
@@ -84,7 +87,7 @@ namespace osu.Game.Online.Rooms
                 User = User,
                 Accuracy = Accuracy,
                 Date = EndedAt,
-                Hash = string.Empty, // todo: temporary?
+                HasOnlineReplay = HasReplay,
                 Rank = Rank,
                 Mods = Mods?.Select(m => m.ToMod(rulesetInstance)).ToArray() ?? Array.Empty<Mod>(),
                 Position = Position,
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 992271d072..6b03e876c4 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -94,7 +94,10 @@ namespace osu.Game.Scoring
 
         public double Accuracy { get; set; }
 
-        public bool HasReplay => !string.IsNullOrEmpty(Hash);
+        public bool HasReplay => !string.IsNullOrEmpty(Hash) || HasOnlineReplay;
+
+        [Ignored]
+        public bool HasOnlineReplay { get; set; }
 
         public DateTimeOffset Date { get; set; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
index 9708a94cd7..f665ed2d41 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public partial class MultiplayerResultsScreen : PlaylistsResultsScreen
     {
         public MultiplayerResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem)
-            : base(score, roomId, playlistItem, false, false)
+            : base(score, roomId, playlistItem, false)
         {
         }
     }

From 159b24acf767b07e1dc803d7875788bd8ebf8e72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 18:25:03 +0900
Subject: [PATCH 1860/2100] Rename `RateAdjustedRotation` to `TotalRotation`

---
 .../TestSceneSpinnerApplication.cs                   |  4 ++--
 .../TestSceneSpinnerRotation.cs                      | 12 ++++++------
 .../Judgements/OsuSpinnerJudgementResult.cs          |  2 +-
 .../Objects/Drawables/DrawableSpinner.cs             |  6 +++---
 .../Skinning/Argon/ArgonSpinnerDisc.cs               |  2 +-
 .../Skinning/Default/DefaultSpinnerDisc.cs           |  2 +-
 .../Skinning/Default/SpinnerRotationTracker.cs       |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
index 1ae17432be..dae81f4cff 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             AddStep("rotate some", () => dho.RotationTracker.AddRotation(180));
-            AddAssert("rotation is set", () => dho.Result.RateAdjustedRotation == 180);
+            AddAssert("rotation is set", () => dho.Result.TotalRotation == 180);
 
             AddStep("apply new spinner", () => dho.Apply(prepareObject(new Spinner
             {
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Duration = 1000,
             })));
 
-            AddAssert("rotation is reset", () => dho.Result.RateAdjustedRotation == 0);
+            AddAssert("rotation is reset", () => dho.Result.TotalRotation == 0);
         }
 
         private Spinner prepareObject(Spinner circle)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 116c974f32..8711aa9c09 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -63,11 +63,11 @@ namespace osu.Game.Rulesets.Osu.Tests
                 trackerRotationTolerance = Math.Abs(drawableSpinner.RotationTracker.Rotation * 0.1f);
             });
             AddAssert("is disc rotation not almost 0", () => drawableSpinner.RotationTracker.Rotation, () => Is.Not.EqualTo(0).Within(100));
-            AddAssert("is disc rotation absolute not almost 0", () => drawableSpinner.Result.RateAdjustedRotation, () => Is.Not.EqualTo(0).Within(100));
+            AddAssert("is disc rotation absolute not almost 0", () => drawableSpinner.Result.TotalRotation, () => Is.Not.EqualTo(0).Within(100));
 
             addSeekStep(0);
             AddAssert("is disc rotation almost 0", () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(0).Within(trackerRotationTolerance));
-            AddAssert("is disc rotation absolute almost 0", () => drawableSpinner.Result.RateAdjustedRotation, () => Is.EqualTo(0).Within(100));
+            AddAssert("is disc rotation absolute almost 0", () => drawableSpinner.Result.TotalRotation, () => Is.EqualTo(0).Within(100));
         }
 
         [Test]
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 finalTrackerRotation = drawableSpinner.RotationTracker.Rotation;
                 trackerRotationTolerance = Math.Abs(finalTrackerRotation * 0.05f);
             });
-            AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.Result.RateAdjustedRotation);
+            AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.Result.TotalRotation);
 
             addSeekStep(spinner_start_time + 2500);
             AddAssert("disc rotation rewound",
@@ -92,13 +92,13 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(finalTrackerRotation / 2).Within(trackerRotationTolerance));
             AddAssert("is cumulative rotation rewound",
                 // cumulative rotation is not damped, so we're treating it as the "ground truth" and allowing a comparatively smaller margin of error.
-                () => drawableSpinner.Result.RateAdjustedRotation, () => Is.EqualTo(finalCumulativeTrackerRotation / 2).Within(100));
+                () => drawableSpinner.Result.TotalRotation, () => Is.EqualTo(finalCumulativeTrackerRotation / 2).Within(100));
 
             addSeekStep(spinner_start_time + 5000);
             AddAssert("is disc rotation almost same",
                 () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(finalTrackerRotation).Within(trackerRotationTolerance));
             AddAssert("is cumulative rotation almost same",
-                () => drawableSpinner.Result.RateAdjustedRotation, () => Is.EqualTo(finalCumulativeTrackerRotation).Within(100));
+                () => drawableSpinner.Result.TotalRotation, () => Is.EqualTo(finalCumulativeTrackerRotation).Within(100));
         }
 
         [Test]
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
                 long totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.Result.RateAdjustedRotation / 360) * new SpinnerTick().CreateJudgement().MaxNumericResult;
+                return totalScore == (int)(drawableSpinner.Result.TotalRotation / 360) * new SpinnerTick().CreateJudgement().MaxNumericResult;
             });
 
             addSeekStep(0);
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
index 941cb667cf..c5e15d63ea 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Judgements
         /// If Double Time is active instead (with a speed multiplier of 1.5x),
         /// in the same scenario the property will return 720 * 1.5 = 1080.
         /// </example>
-        public float RateAdjustedRotation;
+        public float TotalRotation;
 
         /// <summary>
         /// Time instant at which the spin was started (the first user input which caused an increase in spin).
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 24446db92a..9fa180cf93 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     // these become implicitly hit.
                     return 1;
 
-                return Math.Clamp(Result.RateAdjustedRotation / 360 / HitObject.SpinsRequired, 0, 1);
+                return Math.Clamp(Result.TotalRotation / 360 / HitObject.SpinsRequired, 0, 1);
             }
         }
 
@@ -279,7 +279,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             // don't update after end time to avoid the rate display dropping during fade out.
             // this shouldn't be limited to StartTime as it causes weirdness with the underlying calculation, which is expecting updates during that period.
             if (Time.Current <= HitObject.EndTime)
-                spmCalculator.SetRotation(Result.RateAdjustedRotation);
+                spmCalculator.SetRotation(Result.TotalRotation);
 
             updateBonusScore();
         }
@@ -293,7 +293,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (ticks.Count == 0)
                 return;
 
-            int spins = (int)(Result.RateAdjustedRotation / 360);
+            int spins = (int)(Result.TotalRotation / 360);
 
             if (spins < completedFullSpins)
             {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
index bdc93eb63f..079758c21e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         {
             get
             {
-                int rotations = (int)(drawableSpinner.Result.RateAdjustedRotation / 360);
+                int rotations = (int)(drawableSpinner.Result.TotalRotation / 360);
 
                 if (wholeRotationCount == rotations) return false;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
index 75f3247448..b498975a83 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         {
             get
             {
-                int rotations = (int)(drawableSpinner.Result.RateAdjustedRotation / 360);
+                int rotations = (int)(drawableSpinner.Result.TotalRotation / 360);
 
                 if (wholeRotationCount == rotations) return false;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 41d6e689b1..77d410887c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             currentRotation += angle;
             // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
             // (see: ModTimeRamp)
-            drawableSpinner.Result.RateAdjustedRotation += (float)(Math.Abs(angle) * (gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate));
+            drawableSpinner.Result.TotalRotation += (float)(Math.Abs(angle) * (gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate));
         }
 
         private void resetState(DrawableHitObject obj)

From cfa4adb24d2ed5282ef0e4c8616e3ab9f70c0b43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 18:25:40 +0900
Subject: [PATCH 1861/2100] Add `SpinFramesGenerator` class to simplify
 creating spinner tests

---
 .../SpinFramesGenerator.cs                    | 111 ++++++++++++++++++
 .../TestSceneLegacyHitPolicy.cs               |  15 +--
 .../TestSceneSpinnerJudgement.cs              |  26 +---
 .../TestSceneStartTimeOrderedHitPolicy.cs     |  15 +--
 4 files changed, 130 insertions(+), 37 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
new file mode 100644
index 0000000000..43adfb7f1f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
@@ -0,0 +1,111 @@
+// Copyright (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.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class SpinFramesGenerator
+    {
+        /// <summary>
+        /// A small amount to spin beyond a given angle to mitigate floating-point precision errors.
+        /// </summary>
+        public const float SPIN_ERROR = MathF.PI / 8;
+
+        /// <summary>
+        /// The offset from the centre of the spinner at which to spin.
+        /// </summary>
+        private const float centre_spin_offset = 50;
+
+        private readonly double startTime;
+        private readonly float startAngle;
+        private readonly List<(float deltaAngle, double duration)> sequences = new List<(float deltaAngle, double duration)>();
+
+        /// <summary>
+        /// Creates a new <see cref="SpinFramesGenerator"/> that can be used to generate spinner spin frames.
+        /// </summary>
+        /// <param name="startTime">The time at which to start spinning.</param>
+        /// <param name="startAngle">The angle, in radians, at which to start spinning from. Defaults to the positive-y-axis.</param>
+        public SpinFramesGenerator(double startTime, float startAngle = -MathF.PI / 2f)
+        {
+            this.startTime = startTime;
+            this.startAngle = startAngle;
+        }
+
+        /// <summary>
+        /// Performs a single spin.
+        /// </summary>
+        /// <param name="delta">The amount, relative to a full circle, to spin.</param>
+        /// <param name="duration">The time to spend to perform the spin.</param>
+        /// <returns>This <see cref="SpinFramesGenerator"/>.</returns>
+        public SpinFramesGenerator Spin(float delta, double duration)
+        {
+            sequences.Add((delta * 2 * MathF.PI, duration));
+            return this;
+        }
+
+        /// <summary>
+        /// Constructs the replay frames.
+        /// </summary>
+        /// <returns>The replay frames.</returns>
+        public List<ReplayFrame> Build()
+        {
+            List<ReplayFrame> frames = new List<ReplayFrame>();
+
+            double lastTime = startTime;
+            float lastAngle = startAngle;
+            int lastDirection = 0;
+
+            for (int i = 0; i < sequences.Count; i++)
+            {
+                var seq = sequences[i];
+
+                int seqDirection = Math.Sign(seq.deltaAngle);
+                float seqError = SPIN_ERROR * seqDirection;
+
+                if (seqDirection == lastDirection)
+                {
+                    // Spinning in the same direction, but the error was already added in the last rotation.
+                    seqError = 0;
+                }
+                else if (lastDirection != 0)
+                {
+                    // Spinning in a different direction, we need to account for the error of the start angle, so double it.
+                    seqError *= 2;
+                }
+
+                double seqStartTime = lastTime;
+                double seqEndTime = lastTime + seq.duration;
+                float seqStartAngle = lastAngle;
+                float seqEndAngle = seqStartAngle + seq.deltaAngle + seqError;
+
+                // Intermediate spin frames.
+                for (; lastTime < seqEndTime; lastTime += 10)
+                    frames.Add(new OsuReplayFrame(lastTime, calcOffsetAt((lastTime - seqStartTime) / (seqEndTime - seqStartTime), seqStartAngle, seqEndAngle), OsuAction.LeftButton));
+
+                // Final frame at the end of the current spin.
+                frames.Add(new OsuReplayFrame(lastTime, calcOffsetAt(1, seqStartAngle, seqEndAngle), OsuAction.LeftButton));
+
+                lastTime = seqEndTime;
+                lastAngle = seqEndAngle;
+                lastDirection = seqDirection;
+            }
+
+            // Key release frame.
+            if (frames.Count > 0)
+                frames.Add(new OsuReplayFrame(frames[^1].Time, ((OsuReplayFrame)frames[^1]).Position));
+
+            return frames;
+        }
+
+        private static Vector2 calcOffsetAt(double p, float startAngle, float endAngle)
+        {
+            float angle = startAngle + (endAngle - startAngle) * (float)p;
+            return new Vector2(256, 192) + centre_spin_offset * new Vector2(MathF.Cos(angle), MathF.Sin(angle));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index a2ef72fe57..e0a618b187 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -356,15 +356,16 @@ namespace osu.Game.Rulesets.Osu.Tests
                 },
             };
 
-            performTest(hitObjects, new List<ReplayFrame>
+            List<ReplayFrame> frames = new List<ReplayFrame>
             {
                 new OsuReplayFrame { Time = time_spinner - 90, Position = positionCircle, Actions = { OsuAction.LeftButton } },
-                new OsuReplayFrame { Time = time_spinner + 10, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 20, Position = new Vector2(256, 172), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 30, Position = new Vector2(276, 192), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 40, Position = new Vector2(256, 212), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 50, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
-            });
+            };
+
+            frames.AddRange(new SpinFramesGenerator(time_spinner + 10)
+                            .Spin(1, 500)
+                            .Build());
+
+            performTest(hitObjects, frames);
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Meh);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
index c969cb11b4..6a50f08508 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.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 NUnit.Framework;
@@ -11,14 +10,12 @@ 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
 {
@@ -59,26 +56,9 @@ namespace osu.Game.Rulesets.Osu.Tests
             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 static List<ReplayFrame> generateReplay(int spins) => new SpinFramesGenerator(time_spinner_start)
+                                                                      .Spin(spins, time_spinner_end - time_spinner_start)
+                                                                      .Build();
 
         private void performTest(List<ReplayFrame> frames)
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index f0af3f0c39..19413a50a8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -284,15 +284,16 @@ namespace osu.Game.Rulesets.Osu.Tests
                 },
             };
 
-            performTest(hitObjects, new List<ReplayFrame>
+            List<ReplayFrame> frames = new List<ReplayFrame>
             {
                 new OsuReplayFrame { Time = time_spinner - 100, Position = positionCircle, Actions = { OsuAction.LeftButton } },
-                new OsuReplayFrame { Time = time_spinner + 10, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 20, Position = new Vector2(256, 172), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 30, Position = new Vector2(276, 192), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 40, Position = new Vector2(256, 212), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 50, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
-            });
+            };
+
+            frames.AddRange(new SpinFramesGenerator(time_spinner + 10)
+                            .Spin(1, 500)
+                            .Build());
+
+            performTest(hitObjects, frames);
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Great);

From 28ee99f132bf48a3368bcac3f51fc2721b079225 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 18:31:01 +0900
Subject: [PATCH 1862/2100] Add prospective test coverage of spinner input
 handling

---
 .../TestSceneSpinnerInput.cs                  | 290 ++++++++++++++++++
 1 file changed, 290 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
new file mode 100644
index 0000000000..d7151f9370
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -0,0 +1,290 @@
+// Copyright (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.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Storyboards;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public partial class TestSceneSpinnerInput : RateAdjustedBeatmapTestScene
+    {
+        private const int centre_x = 256;
+        private const int centre_y = 192;
+        private const double time_spinner_start = 1500;
+        private const double time_spinner_end = 8000;
+
+        private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
+
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
+        private ManualClock? manualClock;
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard? storyboard = null)
+        {
+            return manualClock == null
+                ? base.CreateWorkingBeatmap(beatmap, storyboard)
+                : new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(manualClock), Audio);
+        }
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            manualClock = null;
+        });
+
+        /// <summary>
+        /// While off-centre, vibrates backwards and forwards on the x-axis, from centre-50 to centre+50, every 50ms.
+        /// </summary>
+        [Test]
+        [Ignore("An upcoming implementation will fix this case")]
+        public void TestVibrateWithoutSpinningOffCentre()
+        {
+            List<ReplayFrame> frames = new List<ReplayFrame>();
+
+            const int vibrate_time = 50;
+            const float y_pos = centre_y - 50;
+
+            int direction = -1;
+
+            for (double i = time_spinner_start; i <= time_spinner_end; i += vibrate_time)
+            {
+                frames.Add(new OsuReplayFrame(i, new Vector2(centre_x + direction * 50, y_pos), OsuAction.LeftButton));
+                frames.Add(new OsuReplayFrame(i + vibrate_time, new Vector2(centre_x - direction * 50, y_pos), OsuAction.LeftButton));
+
+                direction *= -1;
+            }
+
+            performTest(frames);
+
+            assertTicksHit(0);
+            assertSpinnerHit(false);
+        }
+
+        /// <summary>
+        /// While centred on the slider, vibrates backwards and forwards on the x-axis, from centre-50 to centre+50, every 50ms.
+        /// </summary>
+        [Test]
+        [Ignore("An upcoming implementation will fix this case")]
+        public void TestVibrateWithoutSpinningOnCentre()
+        {
+            List<ReplayFrame> frames = new List<ReplayFrame>();
+
+            const int vibrate_time = 50;
+
+            int direction = -1;
+
+            for (double i = time_spinner_start; i <= time_spinner_end; i += vibrate_time)
+            {
+                frames.Add(new OsuReplayFrame(i, new Vector2(centre_x + direction * 50, centre_y), OsuAction.LeftButton));
+                frames.Add(new OsuReplayFrame(i + vibrate_time, new Vector2(centre_x - direction * 50, centre_y), OsuAction.LeftButton));
+
+                direction *= -1;
+            }
+
+            performTest(frames);
+
+            assertTicksHit(0);
+            assertSpinnerHit(false);
+        }
+
+        /// <summary>
+        /// Spins in a single direction.
+        /// </summary>
+        [TestCase(0.5f, 0)]
+        [TestCase(-0.5f, 0)]
+        [TestCase(1, 1)]
+        [TestCase(-1, 1)]
+        [TestCase(1.5f, 1)]
+        [TestCase(-1.5f, 1)]
+        [TestCase(2f, 2)]
+        [TestCase(-2f, 2)]
+        public void TestSpinSingleDirection(float amount, int expectedTicks)
+        {
+            performTest(new SpinFramesGenerator(time_spinner_start)
+                        .Spin(amount, 500)
+                        .Build());
+
+            assertTicksHit(expectedTicks);
+            assertSpinnerHit(false);
+        }
+
+        /// <summary>
+        /// Spin half-way clockwise then perform one full spin counter-clockwise.
+        /// No ticks should be hit since the total rotation is -0.5 (0.5 CW + 1 CCW = 0.5 CCW).
+        /// </summary>
+        [Test]
+        [Ignore("An upcoming implementation will fix this case")]
+        public void TestSpinHalfBothDirections()
+        {
+            performTest(new SpinFramesGenerator(time_spinner_start)
+                        .Spin(0.5f, 500) // Rotate to +0.5.
+                        .Spin(-1f, 500) // Rotate to -0.5
+                        .Build());
+
+            assertTicksHit(0);
+            assertSpinnerHit(false);
+        }
+
+        /// <summary>
+        /// Spin in one direction then spin in the other.
+        /// </summary>
+        [TestCase(0.5f, -1.5f, 1)]
+        [TestCase(-0.5f, 1.5f, 1)]
+        [TestCase(0.5f, -2.5f, 2)]
+        [TestCase(-0.5f, 2.5f, 2)]
+        [Ignore("An upcoming implementation will fix this case")]
+        public void TestSpinOneDirectionThenChangeDirection(float direction1, float direction2, int expectedTicks)
+        {
+            performTest(new SpinFramesGenerator(time_spinner_start)
+                        .Spin(direction1, 500)
+                        .Spin(direction2, 500)
+                        .Build());
+
+            assertTicksHit(expectedTicks);
+            assertSpinnerHit(false);
+        }
+
+        [Test]
+        [Ignore("An upcoming implementation will fix this case")]
+        public void TestRewind()
+        {
+            AddStep("set manual clock", () => manualClock = new ManualClock { Rate = 1 });
+
+            List<ReplayFrame> frames = new SpinFramesGenerator(time_spinner_start)
+                                       .Spin(1f, 500) // 2000ms -> 1 full CW spin
+                                       .Spin(-0.5f, 500) // 2500ms -> 0.5 CCW spins
+                                       .Spin(0.25f, 500) // 3000ms -> 0.25 CW spins
+                                       .Spin(1.25f, 500) // 3500ms -> 1 full CW spin
+                                       .Spin(0.5f, 500) // 4000ms -> 0.5 CW spins
+                                       .Build();
+
+            loadPlayer(frames);
+
+            GameplayClockContainer clock = null!;
+            DrawableRuleset drawableRuleset = null!;
+            AddStep("get gameplay objects", () =>
+            {
+                clock = currentPlayer.ChildrenOfType<GameplayClockContainer>().Single();
+                drawableRuleset = currentPlayer.ChildrenOfType<DrawableRuleset>().Single();
+            });
+
+            addSeekStep(frames.Last().Time);
+
+            DrawableSpinner drawableSpinner = null!;
+            AddUntilStep("get spinner", () => (drawableSpinner = currentPlayer.ChildrenOfType<DrawableSpinner>().Single()) != null);
+
+            assertTotalRotation(4000, 900);
+            assertTotalRotation(3750, 810);
+            assertTotalRotation(3500, 720);
+            assertTotalRotation(3250, 530);
+            assertTotalRotation(3000, 540);
+            assertTotalRotation(2750, 540);
+            assertTotalRotation(2500, 540);
+            assertTotalRotation(2250, 360);
+            assertTotalRotation(2000, 180);
+            assertTotalRotation(1500, 0);
+
+            void assertTotalRotation(double time, float expected)
+            {
+                addSeekStep(time);
+                AddAssert($"total rotation @ {time} is {expected}", () => drawableSpinner.Result.TotalRotation,
+                    () => Is.EqualTo(expected).Within(MathHelper.RadiansToDegrees(SpinFramesGenerator.SPIN_ERROR * 2)));
+            }
+
+            void addSeekStep(double time)
+            {
+                AddStep($"seek to {time}", () => clock.Seek(time));
+                AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time));
+            }
+        }
+
+        private void assertTicksHit(int count)
+        {
+            AddAssert($"{count} ticks hit", () => judgementResults.Where(r => r.HitObject is SpinnerTick).Count(r => r.IsHit), () => Is.EqualTo(count));
+        }
+
+        private void assertSpinnerHit(bool shouldBeHit)
+        {
+            AddAssert($"spinner is {(shouldBeHit ? "hit" : "missed")}", () => judgementResults.Single(r => r.HitObject is Spinner).IsHit, () => Is.EqualTo(shouldBeHit));
+        }
+
+        private void loadPlayer(List<ReplayFrame> frames)
+        {
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
+                {
+                    HitObjects =
+                    {
+                        new Spinner
+                        {
+                            StartTime = time_spinner_start,
+                            EndTime = time_spinner_end,
+                            Position = new Vector2(centre_x, centre_y)
+                        }
+                    },
+                    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.Clear();
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+        }
+
+        private void performTest(List<ReplayFrame> frames)
+        {
+            loadPlayer(frames);
+            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 04af46b8c72a03030aa61b69bc4a1ef72b8d9843 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 18:34:56 +0900
Subject: [PATCH 1863/2100] Change `SpinFramesGenerator` to take degrees as
 input

---
 .../SpinFramesGenerator.cs                    |  4 +-
 .../TestSceneLegacyHitPolicy.cs               |  2 +-
 .../TestSceneSpinnerInput.cs                  | 38 +++++++++----------
 .../TestSceneSpinnerJudgement.cs              |  2 +-
 .../TestSceneStartTimeOrderedHitPolicy.cs     |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
index 43adfb7f1f..dbdfa1f258 100644
--- a/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
+++ b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
@@ -39,12 +39,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// <summary>
         /// Performs a single spin.
         /// </summary>
-        /// <param name="delta">The amount, relative to a full circle, to spin.</param>
+        /// <param name="delta">The amount of degrees to spin.</param>
         /// <param name="duration">The time to spend to perform the spin.</param>
         /// <returns>This <see cref="SpinFramesGenerator"/>.</returns>
         public SpinFramesGenerator Spin(float delta, double duration)
         {
-            sequences.Add((delta * 2 * MathF.PI, duration));
+            sequences.Add((delta / 360 * 2 * MathF.PI, duration));
             return this;
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index e0a618b187..fa6aa580a3 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -362,7 +362,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             };
 
             frames.AddRange(new SpinFramesGenerator(time_spinner + 10)
-                            .Spin(1, 500)
+                            .Spin(360, 500)
                             .Build());
 
             performTest(hitObjects, frames);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index d7151f9370..c4bf0d4e2e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -107,14 +107,14 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// <summary>
         /// Spins in a single direction.
         /// </summary>
-        [TestCase(0.5f, 0)]
-        [TestCase(-0.5f, 0)]
-        [TestCase(1, 1)]
-        [TestCase(-1, 1)]
-        [TestCase(1.5f, 1)]
-        [TestCase(-1.5f, 1)]
-        [TestCase(2f, 2)]
-        [TestCase(-2f, 2)]
+        [TestCase(180, 0)]
+        [TestCase(-180, 0)]
+        [TestCase(360, 1)]
+        [TestCase(-360, 1)]
+        [TestCase(540, 1)]
+        [TestCase(-540, 1)]
+        [TestCase(720, 2)]
+        [TestCase(-720, 2)]
         public void TestSpinSingleDirection(float amount, int expectedTicks)
         {
             performTest(new SpinFramesGenerator(time_spinner_start)
@@ -134,8 +134,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestSpinHalfBothDirections()
         {
             performTest(new SpinFramesGenerator(time_spinner_start)
-                        .Spin(0.5f, 500) // Rotate to +0.5.
-                        .Spin(-1f, 500) // Rotate to -0.5
+                        .Spin(180, 500) // Rotate to +0.5.
+                        .Spin(-360, 500) // Rotate to -0.5
                         .Build());
 
             assertTicksHit(0);
@@ -145,10 +145,10 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// <summary>
         /// Spin in one direction then spin in the other.
         /// </summary>
-        [TestCase(0.5f, -1.5f, 1)]
-        [TestCase(-0.5f, 1.5f, 1)]
-        [TestCase(0.5f, -2.5f, 2)]
-        [TestCase(-0.5f, 2.5f, 2)]
+        [TestCase(180, -540, 1)]
+        [TestCase(-180, 540, 1)]
+        [TestCase(180, -900, 2)]
+        [TestCase(-180, 900, 2)]
         [Ignore("An upcoming implementation will fix this case")]
         public void TestSpinOneDirectionThenChangeDirection(float direction1, float direction2, int expectedTicks)
         {
@@ -168,11 +168,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("set manual clock", () => manualClock = new ManualClock { Rate = 1 });
 
             List<ReplayFrame> frames = new SpinFramesGenerator(time_spinner_start)
-                                       .Spin(1f, 500) // 2000ms -> 1 full CW spin
-                                       .Spin(-0.5f, 500) // 2500ms -> 0.5 CCW spins
-                                       .Spin(0.25f, 500) // 3000ms -> 0.25 CW spins
-                                       .Spin(1.25f, 500) // 3500ms -> 1 full CW spin
-                                       .Spin(0.5f, 500) // 4000ms -> 0.5 CW spins
+                                       .Spin(360, 500) // 2000ms -> 1 full CW spin
+                                       .Spin(-180, 500) // 2500ms -> 0.5 CCW spins
+                                       .Spin(90, 500) // 3000ms -> 0.25 CW spins
+                                       .Spin(450, 500) // 3500ms -> 1 full CW spin
+                                       .Spin(180, 500) // 4000ms -> 0.5 CW spins
                                        .Build();
 
             loadPlayer(frames);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
index 6a50f08508..8d8c2e9639 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         private static List<ReplayFrame> generateReplay(int spins) => new SpinFramesGenerator(time_spinner_start)
-                                                                      .Spin(spins, time_spinner_end - time_spinner_start)
+                                                                      .Spin(spins * 360, time_spinner_end - time_spinner_start)
                                                                       .Build();
 
         private void performTest(List<ReplayFrame> frames)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index 19413a50a8..3475680c71 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -290,7 +290,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             };
 
             frames.AddRange(new SpinFramesGenerator(time_spinner + 10)
-                            .Spin(1, 500)
+                            .Spin(360, 500)
                             .Build());
 
             performTest(hitObjects, frames);

From e2192806e456a90f252f7265fff941b1cabf4f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 12:00:33 +0200
Subject: [PATCH 1864/2100] Use `ID` rather than `SoloScoreID`

The latter is apparently not going to be a thing anymore.
---
 .../Visual/Playlists/TestScenePlaylistsResultsScreen.cs       | 4 ----
 osu.Game/Online/Rooms/MultiplayerScore.cs                     | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 3f230099da..4d82631fc9 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -245,7 +245,6 @@ namespace osu.Game.Tests.Visual.Playlists
             var multiplayerUserScore = new MultiplayerScore
             {
                 ID = highestScoreId,
-                SoloScoreID = (ulong?)highestScoreId,
                 Accuracy = userScore.Accuracy,
                 Passed = userScore.Passed,
                 Rank = userScore.Rank,
@@ -267,7 +266,6 @@ namespace osu.Game.Tests.Visual.Playlists
                 multiplayerUserScore.ScoresAround.Lower.Scores.Add(new MultiplayerScore
                 {
                     ID = nextLowest,
-                    SoloScoreID = (ulong?)nextLowest,
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -284,7 +282,6 @@ namespace osu.Game.Tests.Visual.Playlists
                 multiplayerUserScore.ScoresAround.Higher.Scores.Add(new MultiplayerScore
                 {
                     ID = nextHighest,
-                    SoloScoreID = (ulong?)nextHighest,
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -318,7 +315,6 @@ namespace osu.Game.Tests.Visual.Playlists
                 result.Scores.Add(new MultiplayerScore
                 {
                     ID = id,
-                    SoloScoreID = (ulong?)id,
                     Accuracy = 1,
                     Passed = true,
                     Rank = ScoreRank.X,
diff --git a/osu.Game/Online/Rooms/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
index e6307ab7f0..f1b9584d57 100644
--- a/osu.Game/Online/Rooms/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Online.Rooms
 
             var scoreInfo = new ScoreInfo
             {
-                OnlineID = (long?)SoloScoreID ?? -1,
+                OnlineID = ID,
                 TotalScore = TotalScore,
                 MaxCombo = MaxCombo,
                 BeatmapInfo = beatmap,

From 10bab614412a17752af5ae50bfba5c65ecf6538a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 19:23:35 +0900
Subject: [PATCH 1865/2100] Tidy up `lastAngle` usage and add assertion of
 maximum delta

---
 .../Default/SpinnerRotationTracker.cs         | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 77d410887c..174ba1c402 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
@@ -68,6 +69,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 float thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(pos.X - DrawSize.X / 2, pos.Y - DrawSize.Y / 2));
                 float delta = lastAngle == null ? 0 : thisAngle - lastAngle.Value;
 
+                // Normalise the delta to -180 .. 180
+                if (delta > 180) delta -= 360;
+                if (delta < -180) delta += 360;
+
                 if (Tracking)
                     AddRotation(delta);
 
@@ -84,8 +89,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         /// <remarks>
         /// Will be a no-op if not a valid time to spin.
         /// </remarks>
-        /// <param name="angle">The delta angle.</param>
-        public void AddRotation(float angle)
+        /// <param name="delta">The delta angle.</param>
+        public void AddRotation(float delta)
         {
             if (!isSpinnableTime)
                 return;
@@ -96,21 +101,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 rotationTransferred = true;
             }
 
-            if (angle > 180)
-            {
-                lastAngle += 360;
-                angle -= 360;
-            }
-            else if (-angle > 180)
-            {
-                lastAngle -= 360;
-                angle += 360;
-            }
+            currentRotation += delta;
+
+            double rate = gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate;
+
+            Debug.Assert(Math.Abs(delta) <= 180);
 
-            currentRotation += angle;
             // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
             // (see: ModTimeRamp)
-            drawableSpinner.Result.TotalRotation += (float)(Math.Abs(angle) * (gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate));
+            drawableSpinner.Result.TotalRotation += (float)(Math.Abs(delta) * rate);
         }
 
         private void resetState(DrawableHitObject obj)

From 0bb95cfa88fb798f07ad7a35aca0ef61f755790d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 19:34:55 +0900
Subject: [PATCH 1866/2100] Fix incorrect initial rotation transfer value

Should have been removed as part of https://github.com/ppy/osu/pull/24360.
---
 .../Skinning/Default/SpinnerRotationTracker.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 174ba1c402..69c2bf3dd0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
             if (!rotationTransferred)
             {
-                currentRotation = Rotation * 2;
+                currentRotation = Rotation;
                 rotationTransferred = true;
             }
 

From f2436a5ecb96b7e4aa9a38d76caacc5e4687d879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 12:36:58 +0200
Subject: [PATCH 1867/2100] Remove no longer used scoring difficulty attributes

---
 .../Rulesets/Difficulty/DifficultyAttributes.cs | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index 6043731e6e..9690924b1c 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -6,7 +6,6 @@ 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
 {
@@ -45,22 +44,6 @@ namespace osu.Game.Rulesets.Difficulty
         [JsonProperty("max_combo", Order = -2)]
         public int MaxCombo { get; set; }
 
-        /// <summary>
-        /// The accuracy portion of the legacy (ScoreV1) total score.
-        /// </summary>
-        public int LegacyAccuracyScore { get; set; }
-
-        /// <summary>
-        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
-        /// </summary>
-        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>
-        public double LegacyBonusScoreRatio { get; set; }
-
         /// <summary>
         /// Creates new <see cref="DifficultyAttributes"/>.
         /// </summary>

From 937694cd14802201f1dead09df55f4d32ac49120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 13:35:24 +0200
Subject: [PATCH 1868/2100] Fix conversion test failures

---
 .../OsuBeatmapConversionTest.cs               | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index 11e69dc133..ea07b69e78 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects;
@@ -33,8 +34,13 @@ namespace osu.Game.Rulesets.Osu.Tests
             switch (hitObject)
             {
                 case Slider slider:
+                    var objects = new List<ConvertValue>();
+
                     foreach (var nested in slider.NestedHitObjects)
-                        yield return createConvertValue((OsuHitObject)nested);
+                        objects.Add(createConvertValue((OsuHitObject)nested, slider));
+
+                    foreach (var obj in objects.OrderBy(cv => cv.StartTime))
+                        yield return obj;
 
                     break;
 
@@ -44,13 +50,25 @@ namespace osu.Game.Rulesets.Osu.Tests
                     break;
             }
 
-            static ConvertValue createConvertValue(OsuHitObject obj) => new ConvertValue
+            static ConvertValue createConvertValue(OsuHitObject obj, OsuHitObject? parent = null)
             {
-                StartTime = obj.StartTime,
-                EndTime = obj.GetEndTime(),
-                X = obj.StackedPosition.X,
-                Y = obj.StackedPosition.Y
-            };
+                double startTime = obj.StartTime;
+                double endTime = obj.GetEndTime();
+
+                if (obj is SliderTailCircle && parent is Slider slider)
+                {
+                    startTime = Math.Max(startTime + SliderEventGenerator.TAIL_LENIENCY, slider.StartTime + slider.Duration / 2);
+                    endTime = Math.Max(endTime + SliderEventGenerator.TAIL_LENIENCY, slider.StartTime + slider.Duration / 2);
+                }
+
+                return new ConvertValue
+                {
+                    StartTime = startTime,
+                    EndTime = endTime,
+                    X = obj.StackedPosition.X,
+                    Y = obj.StackedPosition.Y
+                };
+            }
         }
 
         protected override Ruleset CreateRuleset() => new OsuRuleset();

From b3d60c6d4fd037e28bc36b5c284aff974458e382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 13:40:45 +0200
Subject: [PATCH 1869/2100] Add inline commentary about workarounds in beatmap
 conversion test

---
 .../OsuBeatmapConversionTest.cs                      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index ea07b69e78..3e0a86d39c 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -39,6 +39,14 @@ namespace osu.Game.Rulesets.Osu.Tests
                     foreach (var nested in slider.NestedHitObjects)
                         objects.Add(createConvertValue((OsuHitObject)nested, slider));
 
+                    // stable does slider tail leniency by offsetting the last tick 36ms back.
+                    // based on player feedback, we're doing this a little different in lazer,
+                    // and the lazer method does not require offsetting the last tick
+                    // (see `DrawableSliderTail.CheckForResult()`).
+                    // however, in conversion tests, just so the output matches, we're bringing
+                    // the 36ms offset back locally.
+                    // in particular, on some sliders, this may rearrange nested objects,
+                    // so we sort them again by start time to prevent test failures.
                     foreach (var obj in objects.OrderBy(cv => cv.StartTime))
                         yield return obj;
 
@@ -55,6 +63,10 @@ namespace osu.Game.Rulesets.Osu.Tests
                 double startTime = obj.StartTime;
                 double endTime = obj.GetEndTime();
 
+                // as stated in the inline comment above, this is locally bringing back
+                // the stable treatment of the "legacy last tick" just to make sure
+                // that the conversion output matches.
+                // compare: `SliderEventGenerator.Generate()`, and the calculation of `legacyLastTickTime`.
                 if (obj is SliderTailCircle && parent is Slider slider)
                 {
                     startTime = Math.Max(startTime + SliderEventGenerator.TAIL_LENIENCY, slider.StartTime + slider.Duration / 2);

From 3065c9f23dfa7f9018320392e03a29ea25dee28b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 16 Oct 2023 22:49:41 +0900
Subject: [PATCH 1870/2100] Fix potential frame misordering in generator

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

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
index dbdfa1f258..e6dc72033a 100644
--- a/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
+++ b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     frames.Add(new OsuReplayFrame(lastTime, calcOffsetAt((lastTime - seqStartTime) / (seqEndTime - seqStartTime), seqStartAngle, seqEndAngle), OsuAction.LeftButton));
 
                 // Final frame at the end of the current spin.
-                frames.Add(new OsuReplayFrame(lastTime, calcOffsetAt(1, seqStartAngle, seqEndAngle), OsuAction.LeftButton));
+                frames.Add(new OsuReplayFrame(seqEndTime, calcOffsetAt(1, seqStartAngle, seqEndAngle), OsuAction.LeftButton));
 
                 lastTime = seqEndTime;
                 lastAngle = seqEndAngle;

From 79273b88f68c138b4bd8d9ab1cb47dca1cffcac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 20:42:42 +0200
Subject: [PATCH 1871/2100] Add stub of method to deduplicate bindings (and
 failing test)

---
 .../Input/RealmKeyBindingStoreTest.cs         | 90 +++++++++++++++++++
 osu.Game/Input/RealmKeyBindingStore.cs        | 11 +++
 2 files changed, 101 insertions(+)
 create mode 100644 osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs

diff --git a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
new file mode 100644
index 0000000000..0e8e73b8b4
--- /dev/null
+++ b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
@@ -0,0 +1,90 @@
+// Copyright (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 NUnit.Framework;
+using osu.Framework.Input.Bindings;
+using osu.Game.Input;
+using osu.Game.Input.Bindings;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Input
+{
+    [TestFixture]
+    public class RealmKeyBindingStoreTest
+    {
+        [Test]
+        public void TestBindingsWithoutDuplicatesAreNotModified()
+        {
+            var bindings = new List<RealmKeyBinding>
+            {
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromKey(Key.Escape)),
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromMouseButton(MouseButton.Button1)),
+                new RealmKeyBinding(GlobalAction.MusicPrev, KeyCombination.FromKey(Key.F1)),
+                new RealmKeyBinding(GlobalAction.MusicNext, KeyCombination.FromKey(Key.F5))
+            };
+
+            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(anyCleared, Is.False);
+
+                Assert.That(bindings[0].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[0].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.Escape)));
+
+                Assert.That(bindings[1].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[1].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.ExtraMouseButton1)));
+
+                Assert.That(bindings[2].Action, Is.EqualTo((int)GlobalAction.MusicPrev));
+                Assert.That(bindings[2].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.F1)));
+
+                Assert.That(bindings[3].Action, Is.EqualTo((int)GlobalAction.MusicNext));
+                Assert.That(bindings[3].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.F5)));
+            });
+        }
+
+        [Test]
+        public void TestDuplicateBindingsAreCleared()
+        {
+            var bindings = new List<RealmKeyBinding>
+            {
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromKey(Key.Escape)),
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromMouseButton(MouseButton.Button1)),
+                new RealmKeyBinding(GlobalAction.MusicPrev, KeyCombination.FromKey(Key.F1)),
+                new RealmKeyBinding(GlobalAction.IncreaseVolume, KeyCombination.FromKey(Key.Escape)),
+                new RealmKeyBinding(GlobalAction.MusicNext, KeyCombination.FromKey(Key.F5)),
+                new RealmKeyBinding(GlobalAction.ExportReplay, KeyCombination.FromKey(Key.F1)),
+                new RealmKeyBinding(GlobalAction.TakeScreenshot, KeyCombination.FromKey(Key.PrintScreen)),
+            };
+
+            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(anyCleared, Is.True);
+
+                Assert.That(bindings[0].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[0].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.None)));
+
+                Assert.That(bindings[1].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[1].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.ExtraMouseButton1)));
+
+                Assert.That(bindings[2].Action, Is.EqualTo((int)GlobalAction.MusicPrev));
+                Assert.That(bindings[2].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.None)));
+
+                Assert.That(bindings[3].Action, Is.EqualTo((int)GlobalAction.IncreaseVolume));
+                Assert.That(bindings[3].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.None)));
+
+                Assert.That(bindings[4].Action, Is.EqualTo((int)GlobalAction.MusicNext));
+                Assert.That(bindings[4].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.F5)));
+
+                Assert.That(bindings[5].Action, Is.EqualTo((int)GlobalAction.ExportReplay));
+                Assert.That(bindings[5].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.None)));
+
+                Assert.That(bindings[6].Action, Is.EqualTo((int)GlobalAction.TakeScreenshot));
+                Assert.That(bindings[6].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.PrintScreen)));
+            });
+        }
+    }
+}
diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index 10ad731037..6affdab277 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -130,5 +130,16 @@ namespace osu.Game.Input
 
             return true;
         }
+
+        /// <summary>
+        /// Clears all <see cref="RealmKeyBinding.KeyCombination"/>s from the provided <paramref name="keyBindings"/>
+        /// which are assigned to more than one binding.
+        /// </summary>
+        /// <param name="keyBindings">The <see cref="RealmKeyBinding"/>s to de-duplicate.</param>
+        /// <returns>Whether any bindings have been cleared.</returns>
+        public static bool ClearDuplicateBindings(IQueryable<RealmKeyBinding> keyBindings)
+        {
+            return false;
+        }
     }
 }

From 90c44cee5475ebfc4702e9c1cf64040aa1d4fe22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 20:46:20 +0200
Subject: [PATCH 1872/2100] Implement method to deduplicate keybindings

---
 .../Input/RealmKeyBindingStoreTest.cs           |  5 +++--
 osu.Game/Input/RealmKeyBindingStore.cs          | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
index 0e8e73b8b4..fb1e27d9a9 100644
--- a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
+++ b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.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 NUnit.Framework;
 using osu.Framework.Input.Bindings;
 using osu.Game.Input;
@@ -24,7 +25,7 @@ namespace osu.Game.Tests.Input
                 new RealmKeyBinding(GlobalAction.MusicNext, KeyCombination.FromKey(Key.F5))
             };
 
-            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
+            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings.AsQueryable());
 
             Assert.Multiple(() =>
             {
@@ -58,7 +59,7 @@ namespace osu.Game.Tests.Input
                 new RealmKeyBinding(GlobalAction.TakeScreenshot, KeyCombination.FromKey(Key.PrintScreen)),
             };
 
-            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
+            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings.AsQueryable());
 
             Assert.Multiple(() =>
             {
diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index 6affdab277..ceef751605 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -139,7 +139,22 @@ namespace osu.Game.Input
         /// <returns>Whether any bindings have been cleared.</returns>
         public static bool ClearDuplicateBindings(IQueryable<RealmKeyBinding> keyBindings)
         {
-            return false;
+            bool anyRemoved = false;
+
+            var lookup = keyBindings.ToLookup(kb => kb.KeyCombination);
+
+            foreach (var group in lookup)
+            {
+                if (group.Count() <= 1)
+                    continue;
+
+                foreach (var binding in group)
+                    binding.KeyCombination = new KeyCombination(InputKey.None);
+
+                anyRemoved = true;
+            }
+
+            return anyRemoved;
         }
     }
 }

From 639c96e60c6bc4590e65f0775d392788bf176d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 21:02:24 +0200
Subject: [PATCH 1873/2100] Prevent ruleset input managers from reading
 duplicate bindings

---
 osu.Game/Input/RealmKeyBindingStore.cs      | 2 +-
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index ceef751605..b09e29f48e 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Input
         /// </summary>
         /// <param name="keyBindings">The <see cref="RealmKeyBinding"/>s to de-duplicate.</param>
         /// <returns>Whether any bindings have been cleared.</returns>
-        public static bool ClearDuplicateBindings(IQueryable<RealmKeyBinding> keyBindings)
+        public static bool ClearDuplicateBindings(IQueryable<IKeyBinding> keyBindings)
         {
             bool anyRemoved = false;
 
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 26b9d06f73..7f081b6e8a 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -218,6 +218,7 @@ namespace osu.Game.Rulesets.UI
                 base.ReloadMappings(realmKeyBindings);
 
                 KeyBindings = KeyBindings.Where(b => RealmKeyBindingStore.CheckValidForGameplay(b.KeyCombination)).ToList();
+                RealmKeyBindingStore.ClearDuplicateBindings(KeyBindings.AsQueryable());
             }
         }
     }

From 9c6166ec3dcf9eb805ac0d38b63592f562d0e801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 21:26:46 +0200
Subject: [PATCH 1874/2100] Add migration to remove duplicate bindings

---
 .../Input/RealmKeyBindingStoreTest.cs         |  9 +++---
 osu.Game/Database/RealmAccess.cs              | 31 ++++++++++++++++++-
 osu.Game/Input/RealmKeyBindingStore.cs        | 10 +++---
 osu.Game/Rulesets/UI/RulesetInputManager.cs   |  2 +-
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
index fb1e27d9a9..a0c1b20cd7 100644
--- a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
+++ b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.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 NUnit.Framework;
 using osu.Framework.Input.Bindings;
 using osu.Game.Input;
@@ -25,11 +24,11 @@ namespace osu.Game.Tests.Input
                 new RealmKeyBinding(GlobalAction.MusicNext, KeyCombination.FromKey(Key.F5))
             };
 
-            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings.AsQueryable());
+            int countCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
 
             Assert.Multiple(() =>
             {
-                Assert.That(anyCleared, Is.False);
+                Assert.That(countCleared, Is.Zero);
 
                 Assert.That(bindings[0].Action, Is.EqualTo((int)GlobalAction.Back));
                 Assert.That(bindings[0].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.Escape)));
@@ -59,11 +58,11 @@ namespace osu.Game.Tests.Input
                 new RealmKeyBinding(GlobalAction.TakeScreenshot, KeyCombination.FromKey(Key.PrintScreen)),
             };
 
-            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings.AsQueryable());
+            int countCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
 
             Assert.Multiple(() =>
             {
-                Assert.That(anyCleared, Is.True);
+                Assert.That(countCleared, Is.EqualTo(4));
 
                 Assert.That(bindings[0].Action, Is.EqualTo((int)GlobalAction.Back));
                 Assert.That(bindings[0].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.None)));
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index cd97bb6430..7d4d63a20e 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -25,6 +25,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
+using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Models;
 using osu.Game.Online.API;
@@ -84,8 +85,9 @@ namespace osu.Game.Database
         /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
         /// 33   2023-08-16    Reset default chat toggle key binding to avoid conflict with newly added leaderboard toggle key binding.
         /// 34   2023-08-21    Add BackgroundReprocessingFailed flag to ScoreInfo to track upgrade failures.
+        /// 35   2023-10-16    Clear key combinations of keybindings that are assigned to more than one action in a given settings section.
         /// </summary>
-        private const int schema_version = 34;
+        private const int schema_version = 35;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -1031,6 +1033,33 @@ namespace osu.Game.Database
 
                     break;
                 }
+
+                case 35:
+                {
+                    int countCleared = 0;
+
+                    var globalBindings = migration.NewRealm.All<RealmKeyBinding>().Where(kb => kb.RulesetName == null).ToList();
+
+                    foreach (var category in Enum.GetValues<GlobalActionCategory>())
+                    {
+                        var categoryActions = GlobalActionContainer.GetGlobalActionsFor(category).Cast<int>().ToHashSet();
+                        var categoryBindings = globalBindings.Where(kb => categoryActions.Contains(kb.ActionInt));
+                        countCleared += RealmKeyBindingStore.ClearDuplicateBindings(categoryBindings);
+                    }
+
+                    var rulesetBindings = migration.NewRealm.All<RealmKeyBinding>().Where(kb => kb.RulesetName != null).ToList();
+
+                    foreach (var variantGroup in rulesetBindings.GroupBy(kb => (kb.RulesetName, kb.Variant)))
+                        countCleared += RealmKeyBindingStore.ClearDuplicateBindings(variantGroup);
+
+                    if (countCleared > 0)
+                    {
+                        Logger.Log($"{countCleared} of your keybinding(s) have been cleared due to being bound to multiple actions. "
+                                   + "Please choose new unique ones in the settings panel.", level: LogLevel.Important);
+                    }
+
+                    break;
+                }
             }
 
             Logger.Log($"Migration completed in {stopwatch.ElapsedMilliseconds}ms");
diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index b09e29f48e..0c48a4c16c 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -136,10 +136,10 @@ namespace osu.Game.Input
         /// which are assigned to more than one binding.
         /// </summary>
         /// <param name="keyBindings">The <see cref="RealmKeyBinding"/>s to de-duplicate.</param>
-        /// <returns>Whether any bindings have been cleared.</returns>
-        public static bool ClearDuplicateBindings(IQueryable<IKeyBinding> keyBindings)
+        /// <returns>Number of bindings cleared.</returns>
+        public static int ClearDuplicateBindings(IEnumerable<IKeyBinding> keyBindings)
         {
-            bool anyRemoved = false;
+            int countRemoved = 0;
 
             var lookup = keyBindings.ToLookup(kb => kb.KeyCombination);
 
@@ -151,10 +151,10 @@ namespace osu.Game.Input
                 foreach (var binding in group)
                     binding.KeyCombination = new KeyCombination(InputKey.None);
 
-                anyRemoved = true;
+                countRemoved += group.Count();
             }
 
-            return anyRemoved;
+            return countRemoved;
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 7f081b6e8a..39b83ecca1 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Rulesets.UI
                 base.ReloadMappings(realmKeyBindings);
 
                 KeyBindings = KeyBindings.Where(b => RealmKeyBindingStore.CheckValidForGameplay(b.KeyCombination)).ToList();
-                RealmKeyBindingStore.ClearDuplicateBindings(KeyBindings.AsQueryable());
+                RealmKeyBindingStore.ClearDuplicateBindings(KeyBindings);
             }
         }
     }

From 3aae07d1caa8242efd4a0318c6e705ebfc5c99ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 21:28:11 +0200
Subject: [PATCH 1875/2100] Add failing case for two bindings of single action
 bound to same key

---
 .../Input/RealmKeyBindingStoreTest.cs         | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
index a0c1b20cd7..ce31a9ea9d 100644
--- a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
+++ b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
@@ -86,5 +86,32 @@ namespace osu.Game.Tests.Input
                 Assert.That(bindings[6].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.PrintScreen)));
             });
         }
+
+        [Test]
+        public void TestDuplicateBindingsAllowedIfBoundToSameAction()
+        {
+            var bindings = new List<RealmKeyBinding>
+            {
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromKey(Key.Escape)),
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromKey(Key.Escape)),
+                new RealmKeyBinding(GlobalAction.MusicPrev, KeyCombination.FromKey(Key.F1)),
+            };
+
+            int countCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(countCleared, Is.EqualTo(0));
+
+                Assert.That(bindings[0].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[0].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.Escape)));
+
+                Assert.That(bindings[1].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[1].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.Escape)));
+
+                Assert.That(bindings[2].Action, Is.EqualTo((int)GlobalAction.MusicPrev));
+                Assert.That(bindings[2].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.F1)));
+            });
+        }
     }
 }

From 828cedea33d85879afd07c7906439284a78cc654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 21:29:42 +0200
Subject: [PATCH 1876/2100] Fix bindings being cleared if multiple bindings for
 same action have the same combination

This actually seems to be the case in catch (dash is bound to shift
twice). This is annoying but harmless, so let's work around it for now
to avoid ruining users' configs.
---
 osu.Game/Input/RealmKeyBindingStore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index 0c48a4c16c..48ace58235 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Input
 
             foreach (var group in lookup)
             {
-                if (group.Count() <= 1)
+                if (group.Select(kb => kb.Action).Distinct().Count() <= 1)
                     continue;
 
                 foreach (var binding in group)

From 165cd07428bf14430847bde593a4c73ec88af16d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 16:01:00 +0900
Subject: [PATCH 1877/2100] Persist the state of "show speed changes" between
 editor sessions

Addresses https://github.com/ppy/osu/discussions/25149.
---
 osu.Game/Configuration/OsuConfigManager.cs        |  2 ++
 .../Rulesets/Edit/ScrollingHitObjectComposer.cs   | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index db71ff4e84..5d2d782063 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -184,6 +184,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.EditorShowHitMarkers, true);
             SetDefault(OsuSetting.EditorAutoSeekOnPlacement, true);
             SetDefault(OsuSetting.EditorLimitedDistanceSnap, false);
+            SetDefault(OsuSetting.EditorShowSpeedChanges, false);
 
             SetDefault(OsuSetting.LastProcessedMetadataId, -1);
 
@@ -407,5 +408,6 @@ namespace osu.Game.Configuration
         EditorLimitedDistanceSnap,
         ReplaySettingsOverlay,
         AutomaticallyDownloadMissingBeatmaps,
+        EditorShowSpeedChanges
     }
 }
diff --git a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
index 75305a0c20..cb92ebbd15 100644
--- a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -18,6 +19,7 @@ namespace osu.Game.Rulesets.Edit
         where TObject : HitObject
     {
         private readonly Bindable<TernaryState> showSpeedChanges = new Bindable<TernaryState>();
+        private Bindable<bool> configShowSpeedChanges = null!;
 
         protected ScrollingHitObjectComposer(Ruleset ruleset)
             : base(ruleset)
@@ -25,7 +27,7 @@ namespace osu.Game.Rulesets.Edit
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuConfigManager config)
         {
             if (DrawableRuleset is ISupportConstantAlgorithmToggle toggleRuleset)
             {
@@ -44,7 +46,16 @@ namespace osu.Game.Rulesets.Edit
                     },
                 });
 
-                showSpeedChanges.BindValueChanged(state => toggleRuleset.ShowSpeedChanges.Value = state.NewValue == TernaryState.True, true);
+                configShowSpeedChanges = config.GetBindable<bool>(OsuSetting.EditorShowSpeedChanges);
+                configShowSpeedChanges.BindValueChanged(enabled => showSpeedChanges.Value = enabled.NewValue ? TernaryState.True : TernaryState.False, true);
+
+                showSpeedChanges.BindValueChanged(state =>
+                {
+                    bool enabled = state.NewValue == TernaryState.True;
+
+                    toggleRuleset.ShowSpeedChanges.Value = enabled;
+                    configShowSpeedChanges.Value = enabled;
+                }, true);
             }
         }
     }

From 79a4b985fed630c092f60ba7af2146d71687e94a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 09:30:44 +0200
Subject: [PATCH 1878/2100] Use left mouse as alternative default binding for
 catch dash

This mirrors stable. Although the way stable does this is pretty dodgy,
see:
	https://github.com/peppy/osu-stable-reference/blob/master/osu!/GameModes/Play/Rulesets/Fruits/RulesetFruits.cs#L274-L275
---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index efd4b46782..9ceb78893e 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Catch
             new KeyBinding(InputKey.X, CatchAction.MoveRight),
             new KeyBinding(InputKey.Right, CatchAction.MoveRight),
             new KeyBinding(InputKey.Shift, CatchAction.Dash),
-            new KeyBinding(InputKey.Shift, CatchAction.Dash),
+            new KeyBinding(InputKey.MouseLeft, CatchAction.Dash),
         };
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)

From d26d4b8b79dcfcce739dd0723c1cf7fb3f959dd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 16:42:22 +0900
Subject: [PATCH 1879/2100] Cache `IScrollingInfo` at a `HitObjectComposer`
 level automatically

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs   | 9 +--------
 osu.Game/Rulesets/Edit/HitObjectComposer.cs              | 3 +++
 .../Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs    | 2 +-
 .../Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs   | 2 ++
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 8e61baca81..7a0ec70611 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -57,16 +57,9 @@ namespace osu.Game.Rulesets.Mania.Edit
         protected override Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpacePosition) =>
             Playfield.GetColumnByPosition(screenSpacePosition);
 
-        protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
-        {
+        protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
             drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods);
 
-            // This is the earliest we can cache the scrolling info to ourselves, before masks are added to the hierarchy and inject it
-            dependencies.CacheAs(drawableRuleset.ScrollingInfo);
-
-            return drawableRuleset;
-        }
-
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new ManiaBlueprintContainer(this);
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index f9a6b5083e..e1ae4b0199 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -119,6 +119,9 @@ namespace osu.Game.Rulesets.Edit
                 return;
             }
 
+            if (DrawableRuleset is IDrawableScrollingRuleset scrollingRuleset)
+                dependencies.CacheAs(scrollingRuleset.ScrollingInfo);
+
             dependencies.CacheAs(Playfield);
 
             InternalChildren = new Drawable[]
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index 6abfc6ee49..d23658ac33 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// </summary>
         protected readonly SortedList<MultiplierControlPoint> ControlPoints = new SortedList<MultiplierControlPoint>(Comparer<MultiplierControlPoint>.Default);
 
-        protected IScrollingInfo ScrollingInfo => scrollingInfo;
+        public IScrollingInfo ScrollingInfo => scrollingInfo;
 
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly LocalScrollingInfo scrollingInfo;
diff --git a/osu.Game/Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs
index f3a3bb18bd..b348a22009 100644
--- a/osu.Game/Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs
@@ -11,5 +11,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
     public interface IDrawableScrollingRuleset
     {
         ScrollVisualisationMethod VisualisationMethod { get; }
+
+        IScrollingInfo ScrollingInfo { get; }
     }
 }

From 1b9acdf55c5cbeff194c4c80a3a26402ea64ab9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 16:42:36 +0900
Subject: [PATCH 1880/2100] Abstract out common implementation of
 `BeatSnapGrid`

---
 .../Edit/CatchBeatSnapGrid.cs                 | 173 +--------------
 .../Edit/ManiaBeatSnapGrid.cs                 | 197 +----------------
 .../Edit/Compose/Components/BeatSnapGrid.cs   | 203 ++++++++++++++++++
 3 files changed, 216 insertions(+), 357 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs b/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
index 6862696b3a..40bd08455f 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
@@ -1,180 +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 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.Framework.Graphics.Containers;
 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;
+using osu.Game.Screens.Edit.Compose.Components;
 
 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
+    public partial class CatchBeatSnapGrid : BeatSnapGrid
     {
-        private const double visible_range = 750;
-
-        /// <summary>
-        /// The range of time values of the current selection.
-        /// </summary>
-        public (double start, double end)? SelectionTimeRange
+        protected override IEnumerable<Container> GetTargetContainers(HitObjectComposer composer) => new[]
         {
-            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(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;
-            }
-        }
+            ((CatchPlayfield)composer.Playfield).UnderlayElements
+        };
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 4d45e16588..61c730912f 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -1,206 +1,23 @@
 // Copyright (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.Caching;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Pooling;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.UI;
-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;
+using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    /// <summary>
-    /// A grid which displays coloured beat divisor lines in proximity to the selection or placement cursor.
-    /// </summary>
-    public partial class ManiaBeatSnapGrid : CompositeComponent
+    public partial class ManiaBeatSnapGrid : BeatSnapGrid
     {
-        private const double visible_range = 750;
-
-        /// <summary>
-        /// The range of time values of the current selection.
-        /// </summary>
-        public (double start, double end)? SelectionTimeRange
+        protected override IEnumerable<Container> GetTargetContainers(HitObjectComposer composer)
         {
-            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 List<ScrollingHitObjectContainer> grids = new List<ScrollingHitObjectContainer>();
-
-        private readonly DrawablePool<DrawableGridLine> linesPool = new DrawablePool<DrawableGridLine>(50);
-
-        private readonly Cached lineCache = new Cached();
-
-        private (double start, double end)? selectionTimeRange;
-
-        [BackgroundDependencyLoader]
-        private void load(HitObjectComposer composer)
-        {
-            AddInternal(linesPool);
-
-            foreach (var stage in ((ManiaPlayfield)composer.Playfield).Stages)
-            {
-                foreach (var column in stage.Columns)
-                {
-                    var lineContainer = new ScrollingHitObjectContainer();
-
-                    grids.Add(lineContainer);
-                    column.UnderlayElements.Add(lineContainer);
-                }
-            }
-
-            beatDivisor.BindValueChanged(_ => createLines(), true);
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (!lineCache.IsValid)
-            {
-                lineCache.Validate();
-                createLines();
-            }
-        }
-
-        private void createLines()
-        {
-            foreach (var grid in grids)
-                grid.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(beat, beatDivisor.Value), colours);
-
-                foreach (var grid in grids)
-                {
-                    var line = linesPool.Get();
-
-                    line.Apply(new HitObject
-                    {
-                        StartTime = time
-                    });
-
-                    line.Colour = colour;
-
-                    grid.Add(line);
-                }
-
-                beat++;
-                time += timingPoint.BeatLength / beatDivisor.Value;
-            }
-
-            foreach (var grid in grids)
-            {
-                // required to update ScrollingHitObjectContainer's cache.
-                grid.UpdateSubTree();
-
-                foreach (var line in grid.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
-        {
-            [Resolved]
-            private IScrollingInfo scrollingInfo { get; set; } = null!;
-
-            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
-            public DrawableGridLine()
-                : base(new HitObject())
-            {
-                RelativeSizeAxes = Axes.X;
-                Height = 2;
-
-                AddInternal(new Box { RelativeSizeAxes = Axes.Both });
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                direction.BindTo(scrollingInfo.Direction);
-                direction.BindValueChanged(onDirectionChanged, true);
-            }
-
-            private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
-            {
-                Origin = Anchor = direction.NewValue == ScrollingDirection.Up
-                    ? Anchor.TopLeft
-                    : Anchor.BottomLeft;
-            }
-
-            protected override void UpdateInitialTransforms()
-            {
-                // don't perform any fading – we are handling that ourselves.
-                LifetimeEnd = HitObject.StartTime + visible_range;
-            }
+            return ((ManiaPlayfield)composer.Playfield)
+                   .Stages
+                   .SelectMany(stage => stage.Columns)
+                   .Select(column => column.UnderlayElements);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
new file mode 100644
index 0000000000..c7adaa5649
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
@@ -0,0 +1,203 @@
+// Copyright (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.Caching;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// A grid which displays coloured beat divisor lines in proximity to the selection or placement cursor.
+    /// </summary>
+    public abstract partial class BeatSnapGrid : CompositeComponent
+    {
+        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 List<ScrollingHitObjectContainer> grids = new List<ScrollingHitObjectContainer>();
+
+        private readonly DrawablePool<DrawableGridLine> linesPool = new DrawablePool<DrawableGridLine>(50);
+
+        private readonly Cached lineCache = new Cached();
+
+        private (double start, double end)? selectionTimeRange;
+
+        [BackgroundDependencyLoader]
+        private void load(HitObjectComposer composer)
+        {
+            AddInternal(linesPool);
+
+            foreach (var target in GetTargetContainers(composer))
+            {
+                var lineContainer = new ScrollingHitObjectContainer();
+
+                grids.Add(lineContainer);
+                target.Add(lineContainer);
+            }
+
+            beatDivisor.BindValueChanged(_ => createLines(), true);
+        }
+
+        protected abstract IEnumerable<Container> GetTargetContainers(HitObjectComposer composer);
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!lineCache.IsValid)
+            {
+                lineCache.Validate();
+                createLines();
+            }
+        }
+
+        private void createLines()
+        {
+            foreach (var grid in grids)
+                grid.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(beat, beatDivisor.Value), colours);
+
+                foreach (var grid in grids)
+                {
+                    var line = linesPool.Get();
+
+                    line.Apply(new HitObject
+                    {
+                        StartTime = time
+                    });
+
+                    line.Colour = colour;
+
+                    grid.Add(line);
+                }
+
+                beat++;
+                time += timingPoint.BeatLength / beatDivisor.Value;
+            }
+
+            foreach (var grid in grids)
+            {
+                // required to update ScrollingHitObjectContainer's cache.
+                grid.UpdateSubTree();
+
+                foreach (var line in grid.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
+        {
+            [Resolved]
+            private IScrollingInfo scrollingInfo { get; set; } = null!;
+
+            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+            public DrawableGridLine()
+                : base(new HitObject())
+            {
+                RelativeSizeAxes = Axes.X;
+                Height = 2;
+
+                AddInternal(new Box { RelativeSizeAxes = Axes.Both });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                direction.BindTo(scrollingInfo.Direction);
+                direction.BindValueChanged(onDirectionChanged, true);
+            }
+
+            private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+            {
+                Origin = Anchor = direction.NewValue == ScrollingDirection.Up
+                    ? Anchor.TopLeft
+                    : Anchor.BottomLeft;
+            }
+
+            protected override void UpdateInitialTransforms()
+            {
+                // don't perform any fading – we are handling that ourselves.
+                LifetimeEnd = HitObject.StartTime + visible_range;
+            }
+        }
+    }
+}

From 4cfc95c673f2fe407f04c3884b083a7ab311795e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 09:43:17 +0200
Subject: [PATCH 1881/2100] Add backwards migration of catch dash binding

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

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 7d4d63a20e..89bc631cfd 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -35,6 +35,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Skinning;
+using osuTK.Input;
 using Realms;
 using Realms.Exceptions;
 
@@ -1036,6 +1037,20 @@ namespace osu.Game.Database
 
                 case 35:
                 {
+                    // catch used `Shift` twice as a default key combination for dash, which generally was bothersome and causes issues elsewhere.
+                    // the duplicate binding logic below had to account for it, it could also break keybinding conflict resolution on revert-to-default.
+                    // as such, detect this situation and fix it before proceeding further.
+                    var catchDashBindings = migration.NewRealm.All<RealmKeyBinding>()
+                                                     .Where(kb => kb.RulesetName == @"fruits" && kb.ActionInt == 2)
+                                                     .ToList();
+
+                    if (catchDashBindings.All(kb => kb.KeyCombination.Equals(new KeyCombination(InputKey.Shift))))
+                    {
+                        Debug.Assert(catchDashBindings.Count == 2);
+                        catchDashBindings.Last().KeyCombination = KeyCombination.FromMouseButton(MouseButton.Left);
+                    }
+
+                    // with the catch case dealt with, de-duplicate the remaining bindings.
                     int countCleared = 0;
 
                     var globalBindings = migration.NewRealm.All<RealmKeyBinding>().Where(kb => kb.RulesetName == null).ToList();

From 2a89a257909712e79fff9578bfc5821016dacf66 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 16:54:59 +0900
Subject: [PATCH 1882/2100] Add beat snap grid to osu!taiko editor

Addresses https://github.com/ppy/osu/discussions/25150.
---
 .../Edit/TaikoBeatSnapGrid.cs                 | 19 ++++++++
 .../Edit/TaikoHitObjectComposer.cs            | 43 +++++++++++++++++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 11 ++++-
 .../Edit/Compose/Components/BeatSnapGrid.cs   | 16 +++++--
 4 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/TaikoBeatSnapGrid.cs

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBeatSnapGrid.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBeatSnapGrid.cs
new file mode 100644
index 0000000000..1b6794974f
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBeatSnapGrid.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.Collections.Generic;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Screens.Edit.Compose.Components;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public partial class TaikoBeatSnapGrid : BeatSnapGrid
+    {
+        protected override IEnumerable<Container> GetTargetContainers(HitObjectComposer composer) => new[]
+        {
+            ((TaikoPlayfield)composer.Playfield).UnderlayElements
+        };
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index 5ae4757b8f..177f548238 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -2,10 +2,14 @@
 // 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.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -16,6 +20,9 @@ namespace osu.Game.Rulesets.Taiko.Edit
     {
         protected override bool ApplyHorizontalCentering => false;
 
+        private TaikoBeatSnapGrid beatSnapGrid = null!;
+        private InputManager inputManager = null!;
+
         public TaikoHitObjectComposer(TaikoRuleset ruleset)
             : base(ruleset)
         {
@@ -33,5 +40,41 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new TaikoBlueprintContainer(this);
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(beatSnapGrid = new TaikoBeatSnapGrid());
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            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;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 23ffac1f63..31f8171290 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Rulesets.Taiko.UI
         /// </summary>
         public Bindable<bool> ClassicHitTargetPosition = new BindableBool();
 
+        public Container UnderlayElements { get; private set; } = null!;
+
         private Container<HitExplosion> hitExplosionContainer;
         private Container<KiaiHitExplosion> kiaiExplosionContainer;
         private JudgementContainer<DrawableTaikoJudgement> judgementContainer;
@@ -130,7 +132,14 @@ namespace osu.Game.Rulesets.Taiko.UI
                         {
                             Name = "Bar line content",
                             RelativeSizeAxes = Axes.Both,
-                            Child = barLinePlayfield = new BarLinePlayfield(),
+                            Children = new Drawable[]
+                            {
+                                UnderlayElements = new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                },
+                                barLinePlayfield = new BarLinePlayfield(),
+                            }
                         },
                         hitObjectContent = new Container
                         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
index c7adaa5649..766d5b5601 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
@@ -173,9 +173,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             public DrawableGridLine()
                 : base(new HitObject())
             {
-                RelativeSizeAxes = Axes.X;
-                Height = 2;
-
                 AddInternal(new Box { RelativeSizeAxes = Axes.Both });
             }
 
@@ -191,6 +188,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 Origin = Anchor = direction.NewValue == ScrollingDirection.Up
                     ? Anchor.TopLeft
                     : Anchor.BottomLeft;
+
+                bool isHorizontal = direction.NewValue == ScrollingDirection.Left || direction.NewValue == ScrollingDirection.Right;
+
+                if (isHorizontal)
+                {
+                    RelativeSizeAxes = Axes.Y;
+                    Width = 2;
+                }
+                else
+                {
+                    RelativeSizeAxes = Axes.X;
+                    Height = 2;
+                }
             }
 
             protected override void UpdateInitialTransforms()

From 4381169a3fdf582414f82c0c0d3af52d85404ae6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 17:09:42 +0900
Subject: [PATCH 1883/2100] Combine selection and input handling logic for beat
 snap grids across all rulesets

---
 .../Edit/CatchHitObjectComposer.cs            | 41 ++-------------
 .../Edit/ManiaHitObjectComposer.cs            | 42 +--------------
 .../Edit/TaikoHitObjectComposer.cs            | 43 +---------------
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 51 +++++++++++++++++--
 4 files changed, 53 insertions(+), 124 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index dc3a4416a5..80a9731cc4 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
@@ -32,10 +31,6 @@ namespace osu.Game.Rulesets.Catch.Edit
 
         private CatchDistanceSnapGrid distanceSnapGrid = null!;
 
-        private InputManager inputManager = null!;
-
-        private CatchBeatSnapGrid beatSnapGrid = null!;
-
         private readonly BindableDouble timeRangeMultiplier = new BindableDouble(1)
         {
             MinValue = 1,
@@ -68,38 +63,6 @@ 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()
-        {
-            base.LoadComplete();
-
-            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)
@@ -174,6 +137,8 @@ namespace osu.Game.Rulesets.Catch.Edit
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer() => new CatchBlueprintContainer(this);
 
+        protected override BeatSnapGrid CreateBeatSnapGrid() => new CatchBeatSnapGrid();
+
         private PalpableCatchHitObject? getLastSnappableHitObject(double time)
         {
             var hitObject = EditorBeatmap.HitObjects.OfType<CatchHitObject>().LastOrDefault(h => h.GetEndTime() < time && !(h is BananaShower));
@@ -214,7 +179,7 @@ namespace osu.Game.Rulesets.Catch.Edit
                             return null;
                     }
 
-                    double timeAtCursor = ((CatchPlayfield)Playfield).TimeAtScreenSpacePosition(inputManager.CurrentState.Mouse.Position);
+                    double timeAtCursor = ((CatchPlayfield)Playfield).TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
                     return getLastSnappableHitObject(timeAtCursor);
 
                 default:
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 7a0ec70611..91fe99f938 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -6,14 +6,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -24,27 +22,12 @@ namespace osu.Game.Rulesets.Mania.Edit
     public partial class ManiaHitObjectComposer : ScrollingHitObjectComposer<ManiaHitObject>
     {
         private DrawableManiaEditorRuleset drawableRuleset;
-        private ManiaBeatSnapGrid beatSnapGrid;
-        private InputManager inputManager;
 
         public ManiaHitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AddInternal(beatSnapGrid = new ManiaBeatSnapGrid());
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            inputManager = GetContainingInputManager();
-        }
-
         private DependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -63,35 +46,14 @@ namespace osu.Game.Rulesets.Mania.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new ManiaBlueprintContainer(this);
 
+        protected override BeatSnapGrid CreateBeatSnapGrid() => new ManiaBeatSnapGrid();
+
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
             new NoteCompositionTool(),
             new HoldNoteCompositionTool()
         };
 
-        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;
-            }
-        }
-
         public override string ConvertSelectionToString()
             => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime).Select(h => $"{h.StartTime}|{h.Column}"));
     }
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index 177f548238..6020f6e04c 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -2,14 +2,10 @@
 // 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.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -20,9 +16,6 @@ namespace osu.Game.Rulesets.Taiko.Edit
     {
         protected override bool ApplyHorizontalCentering => false;
 
-        private TaikoBeatSnapGrid beatSnapGrid = null!;
-        private InputManager inputManager = null!;
-
         public TaikoHitObjectComposer(TaikoRuleset ruleset)
             : base(ruleset)
         {
@@ -41,40 +34,6 @@ namespace osu.Game.Rulesets.Taiko.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new TaikoBlueprintContainer(this);
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AddInternal(beatSnapGrid = new TaikoBeatSnapGrid());
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            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 BeatSnapGrid CreateBeatSnapGrid() => new TaikoBeatSnapGrid();
     }
 }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e1ae4b0199..2a859dad0d 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
@@ -76,7 +77,7 @@ namespace osu.Game.Rulesets.Edit
 
         protected readonly Container LayerBelowRuleset = new Container { RelativeSizeAxes = Axes.Both };
 
-        private InputManager inputManager;
+        protected InputManager InputManager { get; private set; }
 
         private EditorRadioButtonCollection toolboxCollection;
 
@@ -89,6 +90,9 @@ namespace osu.Game.Rulesets.Edit
 
         protected DrawableRuleset<TObject> DrawableRuleset { get; private set; }
 
+        [CanBeNull]
+        private BeatSnapGrid beatSnapGrid;
+
         protected HitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
@@ -204,7 +208,9 @@ namespace osu.Game.Rulesets.Edit
                             },
                         }
                     }
-                }
+                },
+                // Must be constructed after drawable ruleset above.
+                (beatSnapGrid = CreateBeatSnapGrid()) ?? Empty(),
             };
 
             toolboxCollection.Items = CompositionTools
@@ -235,7 +241,7 @@ namespace osu.Game.Rulesets.Edit
         {
             base.LoadComplete();
 
-            inputManager = GetContainingInputManager();
+            InputManager = GetContainingInputManager();
 
             hasTiming = EditorBeatmap.HasTiming.GetBoundCopy();
             hasTiming.BindValueChanged(timing =>
@@ -269,11 +275,42 @@ namespace osu.Game.Rulesets.Edit
             }
         }
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            updateBeatSnapGrid();
+        }
+
+        private void updateBeatSnapGrid()
+        {
+            if (beatSnapGrid == null)
+                return;
+
+            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;
+            }
+        }
+
         public override Playfield Playfield => drawableRulesetWrapper.Playfield;
 
         public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
 
-        public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(inputManager.CurrentState.Mouse.Position);
+        public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(InputManager.CurrentState.Mouse.Position);
 
         /// <summary>
         /// Defines all available composition tools, listed on the left side of the editor screen as button controls.
@@ -299,6 +336,12 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         protected virtual ComposeBlueprintContainer CreateBlueprintContainer() => new ComposeBlueprintContainer(this);
 
+        /// <summary>
+        /// Construct an optional beat snap grid.
+        /// </summary>
+        [CanBeNull]
+        protected virtual BeatSnapGrid CreateBeatSnapGrid() => null;
+
         /// <summary>
         /// Construct a drawable ruleset for the provided ruleset.
         /// </summary>

From 7abd7fe658e51753a7ebc54f91d0ab042b5f7efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 10:26:02 +0200
Subject: [PATCH 1884/2100] Remove redundant explicit array type specification

---
 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 2a859dad0d..129ab6751e 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Edit
 
             dependencies.CacheAs(Playfield);
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 PlayfieldContentContainer = new Container
                 {

From 22c1a963e722d4ce62cb24df907974fc1284d42f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 10:27:16 +0200
Subject: [PATCH 1885/2100] Remove unused field

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 91fe99f938..61ddaffb25 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -28,11 +28,6 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
-        private DependencyContainer dependencies;
-
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-            => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-
         public new ManiaPlayfield Playfield => ((ManiaPlayfield)drawableRuleset.Playfield);
 
         public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;

From 2192c9f2c28e5a34cc753f62218a19026c21755c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 10:30:01 +0200
Subject: [PATCH 1886/2100] Remove unused using directive

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 61ddaffb25..b9db4168f4 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -5,7 +5,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;

From 5341a335a6165ceef4d91e910fa2ea5aecbfd025 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 17:40:44 +0900
Subject: [PATCH 1887/2100] Bypass `Parent` nullability checks for now

---
 .../TestSceneCatchSkinConfiguration.cs                    | 2 +-
 .../Edit/CatchEditorPlayfieldAdjustmentContainer.cs       | 2 +-
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs         | 4 ++--
 .../Edit/Blueprints/ManiaSelectionBlueprint.cs            | 2 +-
 osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs    | 2 +-
 .../Editor/TestScenePathControlPointVisualiser.cs         | 2 +-
 .../Editor/TestSceneSliderControlPointPiece.cs            | 6 +++---
 .../Editor/TestSceneSliderSelectionBlueprint.cs           | 2 +-
 .../Editor/TestSceneSliderSnapping.cs                     | 2 +-
 .../Editor/TestSceneSliderSplitting.cs                    | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs | 2 +-
 .../Sliders/Components/PathControlPointVisualiser.cs      | 8 ++++----
 osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs                | 6 +++---
 .../Objects/Drawables/DrawableOsuHitObject.cs             | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs   | 2 +-
 .../Skinning/Default/SpinnerRotationTracker.cs            | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs | 2 +-
 .../UI/OsuPlayfieldAdjustmentContainer.cs                 | 6 +++---
 .../Edit/Blueprints/TaikoSelectionBlueprint.cs            | 4 ++--
 .../Objects/Drawables/DrawableSwell.cs                    | 2 +-
 .../Skinning/Argon/ArgonElongatedCirclePiece.cs           | 2 +-
 .../Skinning/Default/ElongatedCirclePiece.cs              | 2 +-
 .../UI/TaikoPlayfieldAdjustmentContainer.cs               | 2 +-
 .../Visual/Editing/TestSceneZoomableScrollContainer.cs    | 2 +-
 .../Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs      | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs | 2 +-
 .../Visual/Gameplay/TestSceneSpectatorPlayback.cs         | 2 +-
 .../Visual/Online/TestSceneBeatmapListingOverlay.cs       | 2 +-
 .../Visual/Playlists/TestScenePlaylistsRoomCreation.cs    | 4 ++--
 osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs   | 8 ++++----
 .../UserInterface/TestSceneLogoTrackingContainer.cs       | 4 ++--
 .../Screens/Ladder/Components/ProgressionPath.cs          | 4 ++--
 osu.Game/Extensions/DrawableExtensions.cs                 | 2 +-
 osu.Game/Graphics/Containers/LogoTrackingContainer.cs     | 6 +++---
 .../Containers/UprightAspectMaintainingContainer.cs       | 2 +-
 osu.Game/Graphics/Containers/WaveContainer.cs             | 4 ++--
 osu.Game/Overlays/ChatOverlay.cs                          | 2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                | 2 +-
 osu.Game/Overlays/NowPlayingOverlay.cs                    | 2 +-
 .../Settings/Sections/Input/TabletAreaSelection.cs        | 2 +-
 osu.Game/Overlays/SkinEditor/SkinBlueprint.cs             | 2 +-
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs      | 4 ++--
 osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs      | 2 +-
 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs | 4 ++--
 osu.Game/Overlays/Wiki/WikiPanelContainer.cs              | 2 +-
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs  | 4 ++--
 .../OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs    | 6 +++---
 osu.Game/Screens/Ranking/ResultsScreen.cs                 | 2 +-
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs      | 2 +-
 osu.Game/Tests/Visual/OsuTestScene.cs                     | 6 +++---
 50 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
index 75ab4ad9d2..e2fc31d869 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         private float getCaughtObjectPosition(Fruit fruit)
         {
             var caughtObject = catcher.ChildrenOfType<CaughtObject>().Single(c => c.HitObject == fruit);
-            return caughtObject.Parent.ToSpaceOfOtherDrawable(caughtObject.Position, catcher).X;
+            return caughtObject.Parent!.ToSpaceOfOtherDrawable(caughtObject.Position, catcher).X;
         }
 
         private void catchFruit(Fruit fruit, float x)
diff --git a/osu.Game.Rulesets.Catch/Edit/CatchEditorPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Catch/Edit/CatchEditorPlayfieldAdjustmentContainer.cs
index 0271005dd1..36aee792a8 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchEditorPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchEditorPlayfieldAdjustmentContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.Edit
             {
                 base.Update();
 
-                Scale = new Vector2(Math.Min(Parent.ChildSize.X / CatchPlayfield.WIDTH, Parent.ChildSize.Y / CatchPlayfield.HEIGHT));
+                Scale = new Vector2(Math.Min(Parent!.ChildSize.X / CatchPlayfield.WIDTH, Parent!.ChildSize.Y / CatchPlayfield.HEIGHT));
                 Height = 1 / Scale.Y;
             }
         }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index cb275a9aa4..02ad1655b5 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -44,8 +44,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             if (Column != null)
             {
-                headPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.StartTime)).Y;
-                tailPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.EndTime)).Y;
+                headPiece.Y = Parent!.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.StartTime)).Y;
+                tailPiece.Y = Parent!.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.EndTime)).Y;
 
                 switch (scrollingInfo.Direction.Value)
                 {
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 4c356367d3..1ae65dd8c0 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             foreach (var child in InternalChildren)
                 child.Anchor = child.Origin = anchor;
 
-            Position = Parent.ToLocalSpace(HitObjectContainer.ScreenSpacePositionAtTime(HitObject.StartTime)) - AnchorPosition;
+            Position = Parent!.ToLocalSpace(HitObjectContainer.ScreenSpacePositionAtTime(HitObject.StartTime)) - AnchorPosition;
             Width = HitObjectContainer.DrawWidth;
         }
     }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
index 09abe8d7f4..bc76c5cfe9 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Mods
             foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
             {
                 HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
-                Container hocParent = (Container)hoc.Parent;
+                Container hocParent = (Container)hoc.Parent!;
 
                 hocParent.Remove(hoc, false);
                 hocParent.Add(new PlayfieldCoveringWrapper(hoc).With(c =>
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 0d6841017e..c267cd1f63 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep($"move mouse to control point {index}", () =>
             {
                 Vector2 position = slider.Path.ControlPoints[index].Position;
-                InputManager.MoveMouseTo(visualiser.Pieces[0].Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(visualiser.Pieces[0].Parent!.ToScreenSpace(position));
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index db9eea4127..408205d6b2 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep($"move mouse to {relativePosition}", () =>
             {
                 Vector2 position = slider.Position + relativePosition;
-                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(drawableObject.Parent!.ToScreenSpace(position));
             });
 
         [Test]
@@ -331,7 +331,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep($"move mouse to {relativePosition}", () =>
             {
                 Vector2 position = slider.Position + relativePosition;
-                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(drawableObject.Parent!.ToScreenSpace(position));
             });
         }
 
@@ -340,7 +340,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep($"move mouse to control point {index}", () =>
             {
                 Vector2 position = slider.Position + slider.Path.ControlPoints[index].Position;
-                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(drawableObject.Parent!.ToScreenSpace(position));
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index 8ed77d45d7..413a3c3dfd 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -187,7 +187,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep($"move mouse to control point {index}", () =>
             {
                 Vector2 position = slider.Position + slider.Path.ControlPoints[index].Position;
-                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(drawableObject.Parent!.ToScreenSpace(position));
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
index f262a4334a..0ae14bdde8 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
                 var firstPiece = this.ChildrenOfType<PathControlPointPiece<Slider>>().Single(piece => piece.ControlPoint == slider.Path.ControlPoints[0]);
                 var pos = slider.Path.PositionAt(0.25d) + slider.Position;
-                InputManager.MoveMouseTo(firstPiece.Parent.ToScreenSpace(pos));
+                InputManager.MoveMouseTo(firstPiece.Parent!.ToScreenSpace(pos));
             });
             AddStep("move slider end", () =>
             {
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index 7315344295..60264572ab 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 if (slider is null || visualiser is null) return;
 
                 Vector2 position = slider.Path.ControlPoints[index].Position + slider.Position;
-                InputManager.MoveMouseTo(visualiser.Pieces[0].Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(visualiser.Pieces[0].Parent!.ToScreenSpace(position));
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index 5da54f8fcf..874130233a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                         pool = pools[poolIndex];
 
                         // We need to make sure neither the pool nor the judgement get disposed when new content is set, and they both share the same parent.
-                        ((Container)pool.Parent).Clear(false);
+                        ((Container)pool.Parent!).Clear(false);
                     }
 
                     var container = new Container
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 c56ffcb140..f624ebc8b5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -288,10 +288,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (selectedControlPoints.Contains(hitObject.Path.ControlPoints[0]))
             {
                 // Special handling for selections containing head control point - the position of the hit object changes which means the snapped position and time have to be taken into account
-                Vector2 newHeadPosition = Parent.ToScreenSpace(e.MousePosition + (dragStartPositions[0] - dragStartPositions[draggedControlPointIndex]));
+                Vector2 newHeadPosition = Parent!.ToScreenSpace(e.MousePosition + (dragStartPositions[0] - dragStartPositions[draggedControlPointIndex]));
                 var result = snapProvider?.FindSnappedPositionAndTime(newHeadPosition);
 
-                Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? newHeadPosition) - hitObject.Position;
+                Vector2 movementDelta = Parent!.ToLocalSpace(result?.ScreenSpacePosition ?? newHeadPosition) - hitObject.Position;
 
                 hitObject.Position += movementDelta;
                 hitObject.StartTime = result?.Time ?? hitObject.StartTime;
@@ -309,9 +309,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
             {
-                var result = snapProvider?.FindSnappedPositionAndTime(Parent.ToScreenSpace(e.MousePosition), SnapType.GlobalGrids);
+                var result = snapProvider?.FindSnappedPositionAndTime(Parent!.ToScreenSpace(e.MousePosition), SnapType.GlobalGrids);
 
-                Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? Parent.ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - hitObject.Position;
+                Vector2 movementDelta = Parent!.ToLocalSpace(result?.ScreenSpacePosition ?? Parent!.ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - hitObject.Position;
 
                 for (int i = 0; i < controlPoints.Count; ++i)
                 {
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
index 2e2d320313..8b0adbe50f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
@@ -139,12 +139,12 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                 if (Precision.AlmostEquals(restrictTo.Rotation, 0))
                 {
-                    start = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopLeft).X;
-                    end = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopRight).X;
+                    start = Parent!.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopLeft).X;
+                    end = Parent!.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopRight).X;
                 }
                 else
                 {
-                    float center = restrictTo.ToSpaceOfOtherDrawable(restrictTo.OriginPosition, Parent).X;
+                    float center = restrictTo.ToSpaceOfOtherDrawable(restrictTo.OriginPosition, Parent!).X;
                     float halfDiagonal = (restrictTo.DrawSize / 2).LengthFast;
 
                     start = center - halfDiagonal;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index ed981d2d5d..bdd818cf18 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public void MissForcefully() => ApplyResult(r => r.Type = r.Judgement.MinResult);
 
-        private RectangleF parentScreenSpaceRectangle => ((DrawableOsuHitObject)ParentHitObject)?.parentScreenSpaceRectangle ?? Parent.ScreenSpaceDrawQuad.AABBFloat;
+        private RectangleF parentScreenSpaceRectangle => ((DrawableOsuHitObject)ParentHitObject)?.parentScreenSpaceRectangle ?? Parent!.ScreenSpaceDrawQuad.AABBFloat;
 
         /// <summary>
         /// Calculates the position of the given <paramref name="drawable"/> relative to the playfield area.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
index 461b4a3b45..325f0a22ad 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             base.Update();
 
             //undo rotation on layers which should not be rotated.
-            float appliedRotation = Parent.Rotation;
+            float appliedRotation = Parent!.Rotation;
 
             fill.Rotation = -appliedRotation;
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 69c2bf3dd0..c3c6629818 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            mousePosition = Parent.ToLocalSpace(e.ScreenSpaceMousePosition);
+            mousePosition = Parent!.ToLocalSpace(e.ScreenSpaceMousePosition);
             return base.OnMouseMove(e);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 5535903c73..593a0d18dd 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             base.UpdateAfterChildren();
 
             //undo rotation on layers which should not be rotated.
-            float appliedRotation = Parent.Rotation;
+            float appliedRotation = Parent!.Rotation;
 
             layerNd.Rotation = -appliedRotation;
             layerSpec.Rotation = -appliedRotation;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
index 2c3a77a6bc..b139296c61 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
@@ -60,12 +60,12 @@ namespace osu.Game.Rulesets.Osu.UI
                 // game_size = DrawSizePreservingFillContainer.TargetSize = new Vector2(1024, 768)
                 //
                 // Parent is a 4:3 aspect enforced, using height as the constricting dimension
-                // Parent.ChildSize.X = min(game_size.X, game_size.Y * (4 / 3)) * playfield_size_adjust
-                // Parent.ChildSize.X = 819.2
+                // Parent!.ChildSize.X = min(game_size.X, game_size.Y * (4 / 3)) * playfield_size_adjust
+                // Parent!.ChildSize.X = 819.2
                 //
                 // Scale = 819.2 / 512
                 // Scale = 1.6
-                Scale = new Vector2(Parent.ChildSize.X / OsuPlayfield.BASE_SIZE.X);
+                Scale = new Vector2(Parent!.ChildSize.X / OsuPlayfield.BASE_SIZE.X);
                 Position = new Vector2(0, (PlayfieldShift ? 8f : 0f) * Scale.X);
                 // Size = 0.625
                 Size = Vector2.Divide(Vector2.One, Scale);
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
index 93b7c7061b..2a824d1f68 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
@@ -30,8 +30,8 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
             var topLeft = new Vector2(float.MaxValue, float.MaxValue);
             var bottomRight = new Vector2(float.MinValue, float.MinValue);
 
-            topLeft = Vector2.ComponentMin(topLeft, Parent.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.TopLeft));
-            bottomRight = Vector2.ComponentMax(bottomRight, Parent.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.BottomRight));
+            topLeft = Vector2.ComponentMin(topLeft, Parent!.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.TopLeft));
+            bottomRight = Vector2.ComponentMax(bottomRight, Parent!.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.BottomRight));
 
             Size = bottomRight - topLeft;
             Position = topLeft;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index a8b48450e8..e4a083f218 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.Update();
 
-            Size = BaseSize * Parent.RelativeChildSize;
+            Size = BaseSize * Parent!.RelativeChildSize;
 
             // Make the swell stop at the hit target
             X = Math.Max(0, X);
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonElongatedCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonElongatedCirclePiece.cs
index 17386cc659..1ac2822a1b 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonElongatedCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonElongatedCirclePiece.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
         protected override void Update()
         {
             base.Update();
-            Width = Parent.DrawSize.X + DrawHeight;
+            Width = Parent!.DrawSize.X + DrawHeight;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
index 11d82a3714..c756b0fb66 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
         protected override void Update()
         {
             base.Update();
-            Width = Parent.DrawSize.X + DrawHeight;
+            Width = Parent!.DrawSize.X + DrawHeight;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
index 3587783104..54608b77de 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             // This is still a bit weird, because readability changes with window size, but it is what it is.
             if (LockPlayfieldAspectRange.Value)
             {
-                float currentAspect = Parent.ChildSize.X / Parent.ChildSize.Y;
+                float currentAspect = Parent!.ChildSize.X / Parent!.ChildSize.Y;
 
                 if (currentAspect > MAXIMUM_ASPECT)
                     height *= currentAspect / MAXIMUM_ASPECT;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
index a141e4d431..1c8a18e131 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestWidthUpdatesOnDrawSizeChanges()
         {
             AddStep("Shrink scroll container", () => scrollContainer.Width = 0.5f);
-            AddAssert("Scroll container width shrunk", () => scrollContainer.DrawWidth == scrollContainer.Parent.DrawWidth / 2);
+            AddAssert("Scroll container width shrunk", () => scrollContainer.DrawWidth == scrollContainer.Parent!.DrawWidth / 2);
             AddAssert("Inner container width matches scroll container", () => innerBox.DrawWidth == scrollContainer.DrawWidth);
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
index 18a180589b..a2ce62105e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             var expectedComponentsAdjustmentContainer = new DependencyProvidingContainer
             {
-                Position = actualComponentsContainer.Parent.ToSpaceOfOtherDrawable(actualComponentsContainer.DrawPosition, Content),
+                Position = actualComponentsContainer.Parent!.ToSpaceOfOtherDrawable(actualComponentsContainer.DrawPosition, Content),
                 Size = actualComponentsContainer.DrawSize,
                 Child = expectedComponentsContainer,
                 // proxy the same required dependencies that `actualComponentsContainer` is using.
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index 65b409a6f7..c51883b221 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public partial class TestInputConsumer : CompositeDrawable, IKeyBindingHandler<TestAction>
         {
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent.ReceivePositionalInputAt(screenSpacePos);
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent!.ReceivePositionalInputAt(screenSpacePos);
 
             private readonly Box box;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 794860b9ec..3a5b3864af 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -259,7 +259,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public partial class TestInputConsumer : CompositeDrawable, IKeyBindingHandler<TestAction>
         {
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent.ReceivePositionalInputAt(screenSpacePos);
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent!.ReceivePositionalInputAt(screenSpacePos);
 
             private readonly Box box;
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 5e49cb633e..8c32135cfd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Tests.Visual.Online
                 AddUntilStep("placeholder shown", () =>
                 {
                     var notFoundDrawable = overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault();
-                    return notFoundDrawable != null && notFoundDrawable.IsPresent && notFoundDrawable.Parent.DrawHeight > 0;
+                    return notFoundDrawable != null && notFoundDrawable.IsPresent && notFoundDrawable.Parent!.DrawHeight > 0;
                 });
         }
 
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs
index 6c732f4295..2f66309f04 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 });
             });
 
-            AddUntilStep("Progress details are hidden", () => match.ChildrenOfType<RoomLocalUserInfo>().FirstOrDefault()?.Parent.Alpha == 0);
+            AddUntilStep("Progress details are hidden", () => match.ChildrenOfType<RoomLocalUserInfo>().FirstOrDefault()?.Parent!.Alpha == 0);
 
             AddUntilStep("Leaderboard shows two aggregate scores", () => match.ChildrenOfType<MatchLeaderboardScore>().Count(s => s.ScoreText.Text != "0") == 2);
 
@@ -99,7 +99,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 });
             });
 
-            AddUntilStep("Progress details are visible", () => match.ChildrenOfType<RoomLocalUserInfo>().FirstOrDefault()?.Parent.Alpha == 1);
+            AddUntilStep("Progress details are visible", () => match.ChildrenOfType<RoomLocalUserInfo>().FirstOrDefault()?.Parent!.Alpha == 1);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
index ec0ad685c5..2926b11067 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
@@ -66,20 +66,20 @@ namespace osu.Game.Tests.Visual.Settings
             });
 
             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));
+            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(revertToDefaultButton.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(revertToDefaultButton.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(revertToDefaultButton.Parent.DrawHeight, control.DrawHeight, 1));
+            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent!.DrawHeight, control.DrawHeight, 1));
         }
 
         /// <summary>
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
index 5926f07a11..57ea4ee58e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
@@ -269,8 +269,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             if (!logoFacade.Transforms.Any() && !transferContainer.Transforms.Any())
             {
                 Random random = new Random();
-                trackingContainer.Delay(500).MoveTo(new Vector2(random.Next(0, (int)logo.Parent.DrawWidth), random.Next(0, (int)logo.Parent.DrawHeight)), 300);
-                transferContainer.Delay(500).MoveTo(new Vector2(random.Next(0, (int)logo.Parent.DrawWidth), random.Next(0, (int)logo.Parent.DrawHeight)), 300);
+                trackingContainer.Delay(500).MoveTo(new Vector2(random.Next(0, (int)logo.Parent!.DrawWidth), random.Next(0, (int)logo.Parent!.DrawHeight)), 300);
+                transferContainer.Delay(500).MoveTo(new Vector2(random.Next(0, (int)logo.Parent!.DrawWidth), random.Next(0, (int)logo.Parent!.DrawHeight)), 300);
             }
 
             if (randomPositions)
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs b/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
index eae11dd8f1..90efac30fd 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
@@ -61,8 +61,8 @@ 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();
+            Position = Parent!.ToLocalSpace(topLeft);
+            Vertices = points.Select(p => Parent!.ToLocalSpace(p) - Parent!.ToLocalSpace(topLeft)).ToList();
         }
     }
 }
diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 6553ad3886..99d748b267 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Extensions
         /// <param name="delta">A delta in screen-space coordinates.</param>
         /// <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);
+            drawable.Parent!.ToLocalSpace(drawable.Parent!.ToScreenSpace(Vector2.Zero) + delta);
 
         /// <summary>
         /// Some elements don't handle rewind correctly and fixing them is non-trivial.
diff --git a/osu.Game/Graphics/Containers/LogoTrackingContainer.cs b/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
index 984d60d35e..08eae25951 100644
--- a/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
+++ b/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
@@ -76,10 +76,10 @@ namespace osu.Game.Graphics.Containers
         /// <remarks>Will only be correct if the logo's <see cref="Drawable.RelativePositionAxes"/> are set to Axes.Both</remarks>
         protected Vector2 ComputeLogoTrackingPosition()
         {
-            var absolutePos = Logo.Parent.ToLocalSpace(LogoFacade.ScreenSpaceDrawQuad.Centre);
+            var absolutePos = Logo.Parent!.ToLocalSpace(LogoFacade.ScreenSpaceDrawQuad.Centre);
 
-            return new Vector2(absolutePos.X / Logo.Parent.RelativeToAbsoluteFactor.X,
-                absolutePos.Y / Logo.Parent.RelativeToAbsoluteFactor.Y);
+            return new Vector2(absolutePos.X / Logo.Parent!.RelativeToAbsoluteFactor.X,
+                absolutePos.Y / Logo.Parent!.RelativeToAbsoluteFactor.Y);
         }
 
         protected override void Update()
diff --git a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
index 38ab6deb97..f263ae36cb 100644
--- a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Graphics.Containers
         private void keepUprightAndUnstretched()
         {
             // Decomposes the inverse of the parent DrawInfo.Matrix into rotation, shear and scale.
-            var parentMatrix = Parent.DrawInfo.Matrix;
+            var parentMatrix = Parent!.DrawInfo.Matrix;
 
             // Remove Translation.>
             parentMatrix.M31 = 0.0f;
diff --git a/osu.Game/Graphics/Containers/WaveContainer.cs b/osu.Game/Graphics/Containers/WaveContainer.cs
index e84cb276a4..5abc66d2ac 100644
--- a/osu.Game/Graphics/Containers/WaveContainer.cs
+++ b/osu.Game/Graphics/Containers/WaveContainer.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Graphics.Containers
 
                 // We can not use RelativeSizeAxes for Height, because the height
                 // of our parent diminishes as the content moves up.
-                Height = Parent.Parent.DrawSize.Y * 1.5f;
+                Height = Parent!.Parent!.DrawSize.Y * 1.5f;
             }
 
             protected override void PopIn() => Schedule(() => this.MoveToY(FinalPosition, APPEAR_DURATION, easing_show));
@@ -188,7 +188,7 @@ namespace osu.Game.Graphics.Containers
                 double duration = IsLoaded ? DISAPPEAR_DURATION : 0;
 
                 // scheduling is required as parent may not be present at the time this is called.
-                Schedule(() => this.MoveToY(Parent.Parent.DrawSize.Y, duration, easing_hide));
+                Schedule(() => this.MoveToY(Parent!.Parent!.DrawSize.Y, duration, easing_hide));
             }
         }
     }
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index a47d10c565..724f77ad71 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -267,7 +267,7 @@ namespace osu.Game.Overlays
             if (!isDraggingTopBar)
                 return;
 
-            float targetChatHeight = dragStartChatHeight - (e.MousePosition.Y - e.MouseDownPosition.Y) / Parent.DrawSize.Y;
+            float targetChatHeight = dragStartChatHeight - (e.MousePosition.Y - e.MouseDownPosition.Y) / Parent!.DrawSize.Y;
             chatHeight.Value = targetChatHeight;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index e1a49f8636..f2b3264a84 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -604,7 +604,7 @@ namespace osu.Game.Overlays.Mods
                     if (columnNumber > 5 && !column.Active.Value) return;
 
                     // use X position of the column on screen as a basis for panning the sample
-                    float balance = column.Parent.BoundingBox.Centre.X / RelativeToAbsoluteFactor.X;
+                    float balance = column.Parent!.BoundingBox.Centre.X / RelativeToAbsoluteFactor.X;
 
                     // dip frequency and ramp volume of sample over the first 5 displayed columns
                     float progress = Math.Min(1, columnNumber / 5f);
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 6abde713b6..809c1af408 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Overlays
         {
             base.UpdateAfterChildren();
 
-            playlistContainer.Height = MathF.Min(Parent.DrawHeight - margin * 3 - player_height, PlaylistOverlay.PLAYLIST_HEIGHT);
+            playlistContainer.Height = MathF.Min(Parent!.DrawHeight - margin * 3 - player_height, PlaylistOverlay.PLAYLIST_HEIGHT);
 
             float height = player_height;
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 8b15bc8f72..686002fe71 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -241,7 +241,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         protected override void OnDrag(DragEvent e)
         {
             var newPos = Position + e.Delta;
-            this.MoveTo(Vector2.Clamp(newPos, Vector2.Zero, Parent.Size));
+            this.MoveTo(Vector2.Clamp(newPos, Vector2.Zero, Parent!.Size));
         }
 
         protected override void OnDragEnd(DragEndEvent e)
diff --git a/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs b/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
index c090878899..01cd3d97e0 100644
--- a/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Overlays.SkinEditor
             if (drawable.Parent == null)
                 return;
 
-            var newAnchor = drawable.Parent.ToSpaceOfOtherDrawable(drawable.AnchorPosition, this);
+            var newAnchor = drawable.Parent!.ToSpaceOfOtherDrawable(drawable.AnchorPosition, this);
             anchorPosition = tweenPosition(anchorPosition ?? newAnchor, newAnchor);
             anchorBox.Position = anchorPosition.Value;
 
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 94cf60a422..c4e2c4c6bd 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Overlays.SkinEditor
             {
                 var drawableItem = (Drawable)b.Item;
 
-                var flippedPosition = GeometryUtils.GetFlippedPosition(direction, flipOverOrigin ? drawableItem.Parent.ScreenSpaceDrawQuad : selectionQuad, b.ScreenSpaceSelectionPoint);
+                var flippedPosition = GeometryUtils.GetFlippedPosition(direction, flipOverOrigin ? drawableItem.Parent!.ScreenSpaceDrawQuad : selectionQuad, b.ScreenSpaceSelectionPoint);
 
                 updateDrawablePosition(drawableItem, flippedPosition);
 
@@ -242,7 +242,7 @@ namespace osu.Game.Overlays.SkinEditor
         private static void updateDrawablePosition(Drawable drawable, Vector2 screenSpacePosition)
         {
             drawable.Position =
-                drawable.Parent.ToLocalSpace(screenSpacePosition) - drawable.AnchorPosition;
+                drawable.Parent!.ToLocalSpace(screenSpacePosition) - drawable.AnchorPosition;
         }
 
         private void applyOrigins(Anchor origin)
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index 7d75acb9d1..88326d4048 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Overlays.Toolbar
 
             protected override bool OnClick(ClickEvent e)
             {
-                Parent.TriggerClick();
+                Parent!.TriggerClick();
                 return base.OnClick(e);
             }
         }
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
index bb7c232a13..cae2d0167a 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
@@ -81,10 +81,10 @@ namespace osu.Game.Overlays.Wiki.Markdown
                     {
                         base.Update();
 
-                        if (Width > Parent.DrawWidth)
+                        if (Width > Parent!.DrawWidth)
                         {
                             float ratio = Height / Width;
-                            Width = Parent.DrawWidth;
+                            Width = Parent!.DrawWidth;
                             Height = ratio * Width;
                         }
                     }
diff --git a/osu.Game/Overlays/Wiki/WikiPanelContainer.cs b/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
index ef31e9cfdd..c5b71cfeb6 100644
--- a/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
+++ b/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Wiki
         protected override void Update()
         {
             base.Update();
-            Height = Math.Max(panelContainer.Height, Parent.DrawHeight);
+            Height = Math.Max(panelContainer.Height, Parent!.DrawHeight);
         }
 
         private partial class WikiPanelMarkdownContainer : WikiMarkdownContainer
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 0c19f6c62e..72d96213ee 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -383,7 +383,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // 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)));
+            var parentQuad = Parent!.ScreenSpaceDrawQuad.AABBFloat.Shrink(ToLocalSpace(thisQuad.TopLeft + new Vector2(button_padding * 2)));
 
             float topExcess = thisQuad.TopLeft.Y - parentQuad.TopLeft.Y;
             float bottomExcess = parentQuad.BottomLeft.Y - thisQuad.BottomLeft.Y;
@@ -396,7 +396,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);
+                buttons.Y = Math.Min(0, ToLocalSpace(Parent!.ScreenSpaceDrawQuad.BottomLeft).Y - DrawHeight);
             }
             else if (topExcess > bottomExcess)
             {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index ffc2328dc0..bc31299615 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -95,11 +95,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             }
 
             private Vector2 getFinalPosition() =>
-                Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.Centre);
+                Parent!.ToLocalSpace(facade.ScreenSpaceDrawQuad.Centre);
 
             private Vector2 getFinalSize() =>
-                Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.BottomRight)
-                - Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.TopLeft);
+                Parent!.ToLocalSpace(facade.ScreenSpaceDrawQuad.BottomRight)
+                - Parent!.ToLocalSpace(facade.ScreenSpaceDrawQuad.TopLeft);
 
             protected override bool OnClick(ClickEvent e)
             {
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 03231f9329..e3d19725da 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -329,7 +329,7 @@ namespace osu.Game.Screens.Ranking
                 ScorePanelList.Attach(detachedPanel);
 
                 // Move into its original location in the attached container first, then to the final location.
-                float origLocation = detachedPanel.Parent.ToLocalSpace(screenSpacePos).X;
+                float origLocation = detachedPanel.Parent!.ToLocalSpace(screenSpacePos).X;
                 detachedPanel.MoveToX(origLocation)
                              .Then()
                              .MoveToX(0, 250, Easing.OutElasticQuarter);
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 6c14ec243b..fc5ef12fb8 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Storyboards.Drawables
 
         protected override Container<DrawableStoryboardLayer> Content { get; }
 
-        protected override Vector2 DrawScale => new Vector2(Parent.DrawHeight / 480);
+        protected override Vector2 DrawScale => new Vector2(Parent!.DrawHeight / 480);
 
         private bool passing = true;
 
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 096917cf4f..79df951396 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -169,15 +169,15 @@ namespace osu.Game.Tests.Visual
 
             ChangeBackgroundColour(ColourInfo.GradientVertical(colours.GreyCarmine, colours.GreyCarmineDarker));
 
-            var parentBeatmap = Parent.Dependencies.Get<Bindable<WorkingBeatmap>>();
+            var parentBeatmap = Parent!.Dependencies.Get<Bindable<WorkingBeatmap>>();
             parentBeatmap.Value = Beatmap.Value;
             Beatmap.BindTo(parentBeatmap);
 
-            var parentRuleset = Parent.Dependencies.Get<Bindable<RulesetInfo>>();
+            var parentRuleset = Parent!.Dependencies.Get<Bindable<RulesetInfo>>();
             parentRuleset.Value = Ruleset.Value;
             Ruleset.BindTo(parentRuleset);
 
-            var parentMods = Parent.Dependencies.Get<Bindable<IReadOnlyList<Mod>>>();
+            var parentMods = Parent!.Dependencies.Get<Bindable<IReadOnlyList<Mod>>>();
             parentMods.Value = SelectedMods.Value;
             SelectedMods.BindTo(parentMods);
         }

From e081fa48a21d2b89ab9d956e62495b95f4ea9c1f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 17:48:51 +0900
Subject: [PATCH 1888/2100] Fix various other inspections

---
 .../Editor/TestSceneObjectMerging.cs               |  6 +++---
 .../Editor/TestSceneSliderSplitting.cs             |  2 +-
 .../Editing/TestSceneEditorBeatmapCreation.cs      | 12 ++++++------
 osu.Game.Tournament/Components/DateTextBox.cs      |  2 +-
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs           | 14 ++++++++++----
 osu.Game/Beatmaps/WorkingBeatmapCache.cs           |  2 +-
 osu.Game/Graphics/Backgrounds/SkinBackground.cs    |  2 +-
 osu.Game/Graphics/Containers/SectionsContainer.cs  | 10 +++++-----
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs    |  2 +-
 osu.Game/IO/FileInfo.cs                            |  2 +-
 osu.Game/Online/API/Requests/Responses/APIUser.cs  |  2 +-
 osu.Game/Online/Placeholders/MessagePlaceholder.cs |  2 +-
 osu.Game/Overlays/FullscreenOverlay.cs             |  2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs  |  5 +++--
 .../Rulesets/UI/DrawableRulesetDependencies.cs     |  2 +-
 .../Screens/Backgrounds/BackgroundScreenCustom.cs  |  2 +-
 osu.Game/Screens/OsuScreen.cs                      |  4 ++--
 osu.Game/Screens/Play/SkipOverlay.cs               |  2 ++
 osu.Game/Screens/Select/SongSelect.cs              |  2 +-
 19 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
index b05c755bfd..8d8386cae1 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
 
             moveMouseToHitObject(1);
-            AddAssert("merge option available", () => selectionHandler.ContextMenuItems.Any(o => o.Text.Value == "Merge selection"));
+            AddAssert("merge option available", () => selectionHandler.ContextMenuItems?.Any(o => o.Text.Value == "Merge selection") == true);
 
             mergeSelection();
 
@@ -198,7 +198,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
 
             moveMouseToHitObject(1);
-            AddAssert("merge option not available", () => selectionHandler.ContextMenuItems.Length > 0 && selectionHandler.ContextMenuItems.All(o => o.Text.Value != "Merge selection"));
+            AddAssert("merge option not available", () => selectionHandler.ContextMenuItems?.Length > 0 && selectionHandler.ContextMenuItems.All(o => o.Text.Value != "Merge selection"));
             mergeSelection();
             AddAssert("circles not merged", () => circle1 is not null && circle2 is not null
                                                                       && EditorBeatmap.HitObjects.Contains(circle1) && EditorBeatmap.HitObjects.Contains(circle2));
@@ -222,7 +222,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
 
             moveMouseToHitObject(1);
-            AddAssert("merge option available", () => selectionHandler.ContextMenuItems.Any(o => o.Text.Value == "Merge selection"));
+            AddAssert("merge option available", () => selectionHandler.ContextMenuItems?.Any(o => o.Text.Value == "Merge selection") == true);
 
             mergeSelection();
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index 60264572ab..ad37258c9b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -241,7 +241,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
                 if (visualiser is null) return;
 
-                MenuItem? item = visualiser.ContextMenuItems.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
+                MenuItem? item = visualiser.ContextMenuItems?.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
 
                 item?.Action.Value?.Invoke();
             });
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index e6c3eea925..7a2ed23cae 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Tests.Visual.Editing
             if (sameRuleset)
             {
                 AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-                AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog.PerformOkAction());
+                AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
             }
 
             AddUntilStep("wait for created", () =>
@@ -269,7 +269,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
 
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation as a copy", () => DialogOverlay.CurrentDialog.Buttons.ElementAt(1).TriggerClick());
+            AddStep("confirm creation as a copy", () => DialogOverlay.CurrentDialog!.Buttons.ElementAt(1).TriggerClick());
 
             AddUntilStep("wait for created", () =>
             {
@@ -342,7 +342,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
 
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation as a copy", () => DialogOverlay.CurrentDialog.Buttons.ElementAt(1).TriggerClick());
+            AddStep("confirm creation as a copy", () => DialogOverlay.CurrentDialog!.Buttons.ElementAt(1).TriggerClick());
 
             AddUntilStep("wait for created", () =>
             {
@@ -380,7 +380,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("try to create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog.PerformOkAction());
+            AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
 
             AddUntilStep("wait for created", () =>
             {
@@ -415,7 +415,7 @@ namespace osu.Game.Tests.Visual.Editing
             if (sameRuleset)
             {
                 AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-                AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog.PerformOkAction());
+                AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
             }
 
             AddUntilStep("wait for created", () =>
@@ -476,7 +476,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("exit", () => Editor.Exit());
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is PromptForSaveDialog);
-            AddStep("attempt to save", () => DialogOverlay.CurrentDialog.PerformOkAction());
+            AddStep("attempt to save", () => DialogOverlay.CurrentDialog!.PerformOkAction());
             AddAssert("editor is still current", () => Editor.IsCurrentScreen());
         }
 
diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index 0993a4c05e..d87c091f77 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tournament.Components
         public new Bindable<DateTimeOffset>? Current
         {
             get => current;
-            set => current.Current = value;
+            set => current.Current = value!;
         }
 
         public DateTextBox()
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index e2e541811d..d254945a51 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -70,9 +70,9 @@ namespace osu.Game.Beatmaps
                 throw new NotImplementedException();
             }
 
-            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new DummyBeatmapConverter { Beatmap = beatmap };
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new DummyBeatmapConverter(beatmap);
 
-            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => null;
+            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => throw new NotImplementedException();
 
             public override string Description => "dummy";
 
@@ -80,9 +80,15 @@ namespace osu.Game.Beatmaps
 
             private class DummyBeatmapConverter : IBeatmapConverter
             {
-                public event Action<HitObject, IEnumerable<HitObject>> ObjectConverted;
+                public IBeatmap Beatmap { get; }
 
-                public IBeatmap Beatmap { get; set; }
+                public DummyBeatmapConverter(IBeatmap beatmap)
+                {
+                    Beatmap = beatmap;
+                }
+
+                [CanBeNull]
+                public event Action<HitObject, IEnumerable<HitObject>> ObjectConverted;
 
                 public bool CanConvert() => true;
 
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index 78eed626f2..2c500146c5 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Beatmaps
 
         public event Action<WorkingBeatmap> OnInvalidated;
 
-        public virtual WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo)
+        public virtual WorkingBeatmap GetWorkingBeatmap([CanBeNull] BeatmapInfo beatmapInfo)
         {
             if (beatmapInfo?.BeatmapSet == null)
                 return DefaultBeatmap;
diff --git a/osu.Game/Graphics/Backgrounds/SkinBackground.cs b/osu.Game/Graphics/Backgrounds/SkinBackground.cs
index 17af5e6991..23806ae1d4 100644
--- a/osu.Game/Graphics/Backgrounds/SkinBackground.cs
+++ b/osu.Game/Graphics/Backgrounds/SkinBackground.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Graphics.Backgrounds
             Sprite.Texture = skin.GetTexture("menu-background") ?? Sprite.Texture;
         }
 
-        public override bool Equals(Background other)
+        public override bool Equals(Background? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 27ff6b851d..9f41c4eff2 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -119,11 +119,11 @@ namespace osu.Game.Graphics.Containers
                 headerBackgroundContainer.Clear();
                 headerBackground = value;
 
-                if (value == null) return;
-
-                headerBackgroundContainer.Add(headerBackground);
-
-                lastKnownScroll = null;
+                if (headerBackground != null)
+                {
+                    headerBackgroundContainer.Add(headerBackground);
+                    lastKnownScroll = null;
+                }
             }
         }
 
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index e5f5f97eb7..191a7ca246 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Graphics.UserInterface
             if (!PlaySamplesOnAdjust)
                 return;
 
-            if (Clock == null || Clock.CurrentTime - lastSampleTime <= 30)
+            if (Clock.CurrentTime - lastSampleTime <= 30)
                 return;
 
             if (value.Equals(lastSampleValue))
diff --git a/osu.Game/IO/FileInfo.cs b/osu.Game/IO/FileInfo.cs
index 3d32e7fb6d..b8a7f363e0 100644
--- a/osu.Game/IO/FileInfo.cs
+++ b/osu.Game/IO/FileInfo.cs
@@ -13,7 +13,7 @@ namespace osu.Game.IO
 
         public bool IsManaged => ID > 0;
 
-        public string Hash { get; set; }
+        public string Hash { get; set; } = string.Empty;
 
         public int ReferenceCount { get; set; }
     }
diff --git a/osu.Game/Online/API/Requests/Responses/APIUser.cs b/osu.Game/Online/API/Requests/Responses/APIUser.cs
index e63395fe26..d9208d0662 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUser.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Online.API.Requests.Responses
         public DateTimeOffset JoinDate;
 
         [JsonProperty(@"username")]
-        public string Username { get; set; }
+        public string Username { get; set; } = string.Empty;
 
         [JsonProperty(@"previous_usernames")]
         public string[] PreviousUsernames;
diff --git a/osu.Game/Online/Placeholders/MessagePlaceholder.cs b/osu.Game/Online/Placeholders/MessagePlaceholder.cs
index bef889a576..b4a9c2086b 100644
--- a/osu.Game/Online/Placeholders/MessagePlaceholder.cs
+++ b/osu.Game/Online/Placeholders/MessagePlaceholder.cs
@@ -22,6 +22,6 @@ namespace osu.Game.Online.Placeholders
             AddText(this.message = message);
         }
 
-        public override bool Equals(Placeholder other) => (other as MessagePlaceholder)?.message == message;
+        public override bool Equals(Placeholder? other) => (other as MessagePlaceholder)?.message == message;
     }
 }
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 7ae5167081..6ee045c492 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays
     public abstract partial class FullscreenOverlay<T> : WaveOverlayContainer, INamedOverlayComponent
         where T : OverlayHeader
     {
-        public virtual string IconTexture => Header.Title.IconTexture ?? string.Empty;
+        public virtual string IconTexture => Header.Title.IconTexture;
         public virtual LocalisableString Title => Header.Title.Title;
         public virtual LocalisableString Description => Header.Title.Description;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index ab8fd2c662..683eefa8f4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -23,11 +23,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <summary>
         /// <see cref="ConvertSlider"/>s don't need a curve since they're converted to ruleset-specific hitobjects.
         /// </summary>
-        public SliderPath Path { get; set; }
+        public SliderPath Path { get; set; } = null!;
 
         public double Distance => Path.Distance;
 
-        public IList<IList<HitSampleInfo>> NodeSamples { get; set; }
+        public IList<IList<HitSampleInfo>> NodeSamples { get; set; } = null!;
+
         public int RepeatCount { get; set; }
 
         [JsonIgnore]
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index e34289c968..02c5bbb27e 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -186,7 +186,7 @@ namespace osu.Game.Rulesets.UI
                 this.fallback = fallback;
             }
 
-            public override Texture Get(string name, WrapMode wrapModeS, WrapMode wrapModeT)
+            public override Texture? Get(string name, WrapMode wrapModeS, WrapMode wrapModeT)
                 => primary.Get(name, wrapModeS, wrapModeT) ?? fallback.Get(name, wrapModeS, wrapModeT);
 
             protected override void Dispose(bool disposing)
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
index 14331c1978..3862e2a7e0 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Backgrounds
             AddInternal(new Background(textureName));
         }
 
-        public override bool Equals(BackgroundScreen other)
+        public override bool Equals(BackgroundScreen? other)
         {
             if (other is BackgroundScreenCustom backgroundScreenCustom)
                 return base.Equals(other) && textureName == backgroundScreenCustom.textureName;
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 2dc9d5d49d..490a1ae6b8 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -89,9 +89,9 @@ namespace osu.Game.Screens
 
         public virtual bool? AllowGlobalTrackControl => null;
 
-        public Bindable<WorkingBeatmap> Beatmap { get; private set; }
+        public Bindable<WorkingBeatmap> Beatmap { get; private set; } = null!;
 
-        public Bindable<RulesetInfo> Ruleset { get; private set; }
+        public Bindable<RulesetInfo> Ruleset { get; private set; } = null!;
 
         public Bindable<IReadOnlyList<Mod>> Mods { get; private set; }
 
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 7d69f0ca18..29b2e5229b 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -211,6 +212,7 @@ namespace osu.Game.Screens.Play
 
         public partial class FadeContainer : Container, IStateful<Visibility>
         {
+            [CanBeNull]
             public event Action<Visibility> StateChanged;
 
             private Visibility state;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 2e457f827d..bac84b8134 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -647,7 +647,7 @@ namespace osu.Game.Screens.Select
 
             beginLooping();
 
-            if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
+            if (!Beatmap.Value.BeatmapSetInfo.DeletePending)
             {
                 updateCarouselSelection();
 

From af7180a5b544570cbcaea0c172cf6a2c8e486956 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 19:07:03 +0900
Subject: [PATCH 1889/2100] Add `SpinnerSpinHistory` and tests

---
 .../SpinnerSpinHistoryTest.cs                 | 132 +++++++++++++++++
 .../TestSceneSpinnerInput.cs                  |   5 -
 .../Judgements/OsuSpinnerJudgementResult.cs   |  30 ++--
 .../Objects/Drawables/SpinnerSpinHistory.cs   | 138 ++++++++++++++++++
 .../Default/SpinnerRotationTracker.cs         |   8 +-
 5 files changed, 282 insertions(+), 31 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
new file mode 100644
index 0000000000..9fee5382ec
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
@@ -0,0 +1,132 @@
+// Copyright (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.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public class SpinnerSpinHistoryTest
+    {
+        private SpinnerSpinHistory history = null!;
+
+        [SetUp]
+        public void Setup()
+        {
+            history = new SpinnerSpinHistory();
+        }
+
+        [TestCase(0, 0)]
+        [TestCase(10, 10)]
+        [TestCase(180, 180)]
+        [TestCase(350, 350)]
+        [TestCase(360, 360)]
+        [TestCase(370, 370)]
+        [TestCase(540, 540)]
+        [TestCase(720, 720)]
+        // ---
+        [TestCase(-0, 0)]
+        [TestCase(-10, 10)]
+        [TestCase(-180, 180)]
+        [TestCase(-350, 350)]
+        [TestCase(-360, 360)]
+        [TestCase(-370, 370)]
+        [TestCase(-540, 540)]
+        [TestCase(-720, 720)]
+        public void TestSpinOneDirection(float spin, float expectedRotation)
+        {
+            history.ReportDelta(500, spin);
+            Assert.That(history.TotalRotation, Is.EqualTo(expectedRotation));
+        }
+
+        [TestCase(0, 0, 0, 0)]
+        // ---
+        [TestCase(10, -10, 0, 10)]
+        [TestCase(-10, 10, 0, 10)]
+        // ---
+        [TestCase(10, -20, 0, 10)]
+        [TestCase(-10, 20, 0, 10)]
+        // ---
+        [TestCase(20, -10, 0, 20)]
+        [TestCase(-20, 10, 0, 20)]
+        // ---
+        [TestCase(10, -360, 0, 350)]
+        [TestCase(-10, 360, 0, 350)]
+        // ---
+        [TestCase(360, -10, 0, 370)]
+        [TestCase(360, 10, 0, 370)]
+        [TestCase(-360, 10, 0, 370)]
+        [TestCase(-360, -10, 0, 370)]
+        // ---
+        [TestCase(10, 10, 10, 30)]
+        [TestCase(10, 10, -10, 20)]
+        [TestCase(10, -10, 10, 10)]
+        [TestCase(-10, -10, -10, 30)]
+        [TestCase(-10, -10, 10, 20)]
+        [TestCase(-10, 10, 10, 10)]
+        // ---
+        [TestCase(10, -20, -350, 360)]
+        [TestCase(10, -20, 350, 340)]
+        [TestCase(-10, 20, 350, 360)]
+        [TestCase(-10, 20, -350, 340)]
+        public void TestSpinMultipleDirections(float spin1, float spin2, float spin3, float expectedRotation)
+        {
+            history.ReportDelta(500, spin1);
+            history.ReportDelta(1000, spin2);
+            history.ReportDelta(1500, spin3);
+            Assert.That(history.TotalRotation, Is.EqualTo(expectedRotation));
+        }
+
+        // One spin
+        [TestCase(370, -50, 320)]
+        [TestCase(-370, 50, 320)]
+        // Two spins
+        [TestCase(740, -420, 320)]
+        [TestCase(-740, 420, 320)]
+        public void TestRemoveAndCrossFullSpin(float deltaToAdd, float deltaToRemove, float expectedRotation)
+        {
+            history.ReportDelta(1000, deltaToAdd);
+            history.ReportDelta(500, deltaToRemove);
+            Assert.That(history.TotalRotation, Is.EqualTo(expectedRotation));
+        }
+
+        // One spin + partial
+        [TestCase(400, -30, -50, 320)]
+        [TestCase(-400, 30, 50, 320)]
+        // Two spins + partial
+        [TestCase(800, -430, -50, 320)]
+        [TestCase(-800, 430, 50, 320)]
+        public void TestRemoveAndCrossFullAndPartialSpins(float deltaToAdd1, float deltaToAdd2, float deltaToRemove, float expectedRotation)
+        {
+            history.ReportDelta(1000, deltaToAdd1);
+            history.ReportDelta(1500, deltaToAdd2);
+            history.ReportDelta(500, deltaToRemove);
+            Assert.That(history.TotalRotation, Is.EqualTo(expectedRotation));
+        }
+
+        [Test]
+        public void TestRewindMultipleFullSpins()
+        {
+            history.ReportDelta(500, 360);
+            history.ReportDelta(1000, 720);
+
+            Assert.That(history.TotalRotation, Is.EqualTo(1080));
+
+            history.ReportDelta(250, -180);
+
+            Assert.That(history.TotalRotation, Is.EqualTo(180));
+        }
+
+        [Test]
+        public void TestRewindIntoSegmentThatHasNotCrossedZero()
+        {
+            history.ReportDelta(1000, -180);
+            history.ReportDelta(1500, 90);
+            history.ReportDelta(2000, 450);
+            history.ReportDelta(1750, -45);
+
+            Assert.That(history.TotalRotation, Is.EqualTo(180));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index c4bf0d4e2e..67c7dbdb66 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -53,7 +53,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// While off-centre, vibrates backwards and forwards on the x-axis, from centre-50 to centre+50, every 50ms.
         /// </summary>
         [Test]
-        [Ignore("An upcoming implementation will fix this case")]
         public void TestVibrateWithoutSpinningOffCentre()
         {
             List<ReplayFrame> frames = new List<ReplayFrame>();
@@ -81,7 +80,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// While centred on the slider, vibrates backwards and forwards on the x-axis, from centre-50 to centre+50, every 50ms.
         /// </summary>
         [Test]
-        [Ignore("An upcoming implementation will fix this case")]
         public void TestVibrateWithoutSpinningOnCentre()
         {
             List<ReplayFrame> frames = new List<ReplayFrame>();
@@ -130,7 +128,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// No ticks should be hit since the total rotation is -0.5 (0.5 CW + 1 CCW = 0.5 CCW).
         /// </summary>
         [Test]
-        [Ignore("An upcoming implementation will fix this case")]
         public void TestSpinHalfBothDirections()
         {
             performTest(new SpinFramesGenerator(time_spinner_start)
@@ -149,7 +146,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(-180, 540, 1)]
         [TestCase(180, -900, 2)]
         [TestCase(-180, 900, 2)]
-        [Ignore("An upcoming implementation will fix this case")]
         public void TestSpinOneDirectionThenChangeDirection(float direction1, float direction2, int expectedTicks)
         {
             performTest(new SpinFramesGenerator(time_spinner_start)
@@ -162,7 +158,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
-        [Ignore("An upcoming implementation will fix this case")]
         public void TestRewind()
         {
             AddStep("set manual clock", () => manualClock = new ManualClock { Rate = 1 });
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
index c5e15d63ea..e8fc1d99bc 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
@@ -4,6 +4,7 @@
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Judgements
 {
@@ -15,28 +16,15 @@ namespace osu.Game.Rulesets.Osu.Judgements
         public Spinner Spinner => (Spinner)HitObject;
 
         /// <summary>
-        /// The total rotation performed on the spinner disc, disregarding the spin direction,
-        /// adjusted for the track's playback rate.
+        /// The total amount that the spinner was rotated.
         /// </summary>
-        /// <remarks>
-        /// <para>
-        /// This value is always non-negative and is monotonically increasing with time
-        /// (i.e. will only increase if time is passing forward, but can decrease during rewind).
-        /// </para>
-        /// <para>
-        /// The rotation from each frame is multiplied by the clock's current playback rate.
-        /// The reason this is done is to ensure that spinners give the same score and require the same number of spins
-        /// regardless of whether speed-modifying mods are applied.
-        /// </para>
-        /// </remarks>
-        /// <example>
-        /// Assuming no speed-modifying mods are active,
-        /// if the spinner is spun 360 degrees clockwise and then 360 degrees counter-clockwise,
-        /// this property will return the value of 720 (as opposed to 0).
-        /// If Double Time is active instead (with a speed multiplier of 1.5x),
-        /// in the same scenario the property will return 720 * 1.5 = 1080.
-        /// </example>
-        public float TotalRotation;
+        public float TotalRotation => History.TotalRotation;
+
+        /// <summary>
+        /// Stores the spinning history of the spinner.<br />
+        /// Instants of movement deltas may be added or removed from this in order to calculate the total rotation for the spinner.
+        /// </summary>
+        public readonly SpinnerSpinHistory History = new SpinnerSpinHistory();
 
         /// <summary>
         /// Time instant at which the spin was started (the first user input which caused an increase in spin).
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
new file mode 100644
index 0000000000..0464ed422f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
@@ -0,0 +1,138 @@
+// Copyright (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;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    /// <summary>
+    /// Stores the spinning history of a single spinner.<br />
+    /// Instants of movement deltas may be added or removed from this in order to calculate the total rotation for the spinner.
+    /// </summary>
+    /// <remarks>
+    /// A single, full rotation of the spinner is defined as a 360-degree rotation of the spinner, starting from 0, going in a single direction.<br />
+    /// </remarks>
+    /// <example>
+    /// If the player spins 90-degrees clockwise, then changes direction, they need to spin 90-degrees counter-clockwise to return to 0
+    /// and then continue rotating the spinner for another 360-degrees in the same direction.
+    /// </example>
+    public class SpinnerSpinHistory
+    {
+        /// <summary>
+        /// The sum of all complete spins and any current partial spin, in degrees.
+        /// </summary>
+        /// <remarks>
+        /// This is the final scoring value.
+        /// </remarks>
+        public float TotalRotation => 360 * segments.Count + currentMaxRotation;
+
+        /// <summary>
+        /// The list of all segments where either:
+        /// <list type="bullet">
+        /// <item>The spinning direction was changed.</item>
+        /// <item>A full spin of 360 degrees was performed in either direction.</item>
+        /// </list>
+        /// </summary>
+        private readonly Stack<SpinSegment> segments = new Stack<SpinSegment>();
+
+        /// <summary>
+        /// The total accumulated rotation.
+        /// </summary>
+        private float currentAbsoluteRotation;
+
+        private float lastCompletionAbsoluteRotation;
+
+        /// <summary>
+        /// For the current spin, represents the maximum rotation (from 0..360) achieved by the user.
+        /// </summary>
+        private float currentMaxRotation;
+
+        /// <summary>
+        /// The current spin, from -360..360.
+        /// </summary>
+        private float currentRotation => currentAbsoluteRotation - lastCompletionAbsoluteRotation;
+
+        private double lastReportTime = double.NegativeInfinity;
+
+        /// <summary>
+        /// Report a delta update based on user input.
+        /// </summary>
+        /// <param name="currentTime">The current time.</param>
+        /// <param name="delta">The delta of the angle moved through since the last report.</param>
+        public void ReportDelta(double currentTime, float delta)
+        {
+            // TODO: Debug.Assert(Math.Abs(delta) < 180);
+            // This will require important frame guarantees.
+
+            currentAbsoluteRotation += delta;
+
+            if (currentTime >= lastReportTime)
+                addDelta(currentTime, delta);
+            else
+                rewindDelta(currentTime, delta);
+
+            lastReportTime = currentTime;
+        }
+
+        private void addDelta(double currentTime, float delta)
+        {
+            if (delta == 0)
+                return;
+
+            currentMaxRotation = Math.Max(currentMaxRotation, Math.Abs(currentRotation));
+
+            while (currentMaxRotation >= 360)
+            {
+                int direction = Math.Sign(currentRotation);
+
+                segments.Push(new SpinSegment(currentTime, direction));
+
+                lastCompletionAbsoluteRotation += direction * 360;
+                currentMaxRotation = Math.Abs(currentRotation);
+            }
+        }
+
+        private void rewindDelta(double currentTime, float delta)
+        {
+            while (segments.TryPeek(out var segment) && segment.StartTime > currentTime)
+            {
+                segments.Pop();
+                lastCompletionAbsoluteRotation -= segment.Direction * 360;
+                currentMaxRotation = Math.Abs(currentRotation);
+            }
+
+            currentMaxRotation = Math.Abs(currentRotation);
+        }
+
+        /// <summary>
+        /// Represents a single segment of history.
+        /// </summary>
+        /// <remarks>
+        /// Each time the player changes direction, a new segment is recorded.
+        /// A segment stores the current absolute angle of rotation. Generally this would be either -360 or 360 for a completed spin, or
+        /// a number representing the last incomplete spin.
+        /// </remarks>
+        private class SpinSegment
+        {
+            /// <summary>
+            /// The start time of this segment, when the direction change occurred.
+            /// </summary>
+            public readonly double StartTime;
+
+            /// <summary>
+            /// The direction this segment started in.
+            /// </summary>
+            public readonly int Direction;
+
+            public SpinSegment(double startTime, int direction)
+            {
+                Debug.Assert(direction == -1 || direction == 1);
+
+                StartTime = startTime;
+                Direction = direction;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 69c2bf3dd0..4bdcc4b381 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -101,15 +101,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 rotationTransferred = true;
             }
 
-            currentRotation += delta;
-
             double rate = gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate;
+            delta = (float)(delta * Math.Abs(rate));
 
             Debug.Assert(Math.Abs(delta) <= 180);
 
-            // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
-            // (see: ModTimeRamp)
-            drawableSpinner.Result.TotalRotation += (float)(Math.Abs(delta) * rate);
+            currentRotation += delta;
+            drawableSpinner.Result.History.ReportDelta(Time.Current, delta);
         }
 
         private void resetState(DrawableHitObject obj)

From 9011170c3e4df5ccf26ff762da2972c7f4d0bd0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 20:10:31 +0900
Subject: [PATCH 1890/2100] Adjust tests in line with new expectations

---
 .../SpinnerSpinHistoryTest.cs                 | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
index 9fee5382ec..c20a7bbfd9 100644
--- a/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             Assert.That(history.TotalRotation, Is.EqualTo(1080));
 
-            history.ReportDelta(250, -180);
+            history.ReportDelta(250, -900);
 
             Assert.That(history.TotalRotation, Is.EqualTo(180));
         }
@@ -122,11 +122,27 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestRewindIntoSegmentThatHasNotCrossedZero()
         {
             history.ReportDelta(1000, -180);
-            history.ReportDelta(1500, 90);
-            history.ReportDelta(2000, 450);
-            history.ReportDelta(1750, -45);
-
             Assert.That(history.TotalRotation, Is.EqualTo(180));
+            history.ReportDelta(1500, 90);
+            Assert.That(history.TotalRotation, Is.EqualTo(180));
+            history.ReportDelta(2000, 450);
+            Assert.That(history.TotalRotation, Is.EqualTo(360));
+            history.ReportDelta(1750, -45);
+            Assert.That(history.TotalRotation, Is.EqualTo(315));
+        }
+
+        [Test]
+        public void TestRewindOverDirectionChange()
+        {
+            history.ReportDelta(1000, 40); // max is now CW 40 degrees
+            Assert.That(history.TotalRotation, Is.EqualTo(40));
+            history.ReportDelta(1100, -90); // max is now CCW 50 degrees
+            Assert.That(history.TotalRotation, Is.EqualTo(50));
+            history.ReportDelta(1200, 110); // max is now CW 60 degrees
+            Assert.That(history.TotalRotation, Is.EqualTo(60));
+
+            history.ReportDelta(1000, -20);
+            Assert.That(history.TotalRotation, Is.EqualTo(40));
         }
     }
 }

From 80ac0c46d9895e40171445552551f76ff7f2b118 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 19:12:12 +0900
Subject: [PATCH 1891/2100] Fix final test

This looks to have been a WIP test, so I've brought it up to the point
of passing. I haven't given it much more attention than that, though.
---
 .../TestSceneSpinnerInput.cs                  | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index 67c7dbdb66..662734ddcd 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -162,13 +162,20 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("set manual clock", () => manualClock = new ManualClock { Rate = 1 });
 
-            List<ReplayFrame> frames = new SpinFramesGenerator(time_spinner_start)
-                                       .Spin(360, 500) // 2000ms -> 1 full CW spin
-                                       .Spin(-180, 500) // 2500ms -> 0.5 CCW spins
-                                       .Spin(90, 500) // 3000ms -> 0.25 CW spins
-                                       .Spin(450, 500) // 3500ms -> 1 full CW spin
-                                       .Spin(180, 500) // 4000ms -> 0.5 CW spins
-                                       .Build();
+            List<ReplayFrame> frames =
+                new SpinFramesGenerator(time_spinner_start)
+                    // 1500ms start
+                    .Spin(360, 500)
+                    // 2000ms -> 1 full CW spin
+                    .Spin(-180, 500)
+                    // 2500ms -> 1 full CW spin + 0.5 CCW spins
+                    .Spin(90, 500)
+                    // 3000ms -> 1 full CW spin + 0.25 CCW spins
+                    .Spin(450, 500)
+                    // 3500ms -> 2 full CW spins
+                    .Spin(180, 500)
+                    // 4000ms -> 2 full CW spins + 0.5 CW spins
+                    .Build();
 
             loadPlayer(frames);
 
@@ -189,11 +196,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertTotalRotation(3750, 810);
             assertTotalRotation(3500, 720);
             assertTotalRotation(3250, 530);
-            assertTotalRotation(3000, 540);
+            assertTotalRotation(3000, 450);
             assertTotalRotation(2750, 540);
             assertTotalRotation(2500, 540);
-            assertTotalRotation(2250, 360);
-            assertTotalRotation(2000, 180);
+            assertTotalRotation(2250, 450);
+            assertTotalRotation(2000, 360);
             assertTotalRotation(1500, 0);
 
             void assertTotalRotation(double time, float expected)
@@ -206,7 +213,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             void addSeekStep(double time)
             {
                 AddStep($"seek to {time}", () => clock.Seek(time));
-                AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time));
+                // Lenience is required due to interpolation running slightly ahead on a stalled clock.
+                AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time).Within(40));
             }
         }
 

From 4f0d55e1a900026ee43c678614cedf4598dcd4f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 19:39:15 +0900
Subject: [PATCH 1892/2100] Clean up code and add xmldoc and inline doc

---
 .../Objects/Drawables/SpinnerSpinHistory.cs   | 130 ++++++++++--------
 1 file changed, 69 insertions(+), 61 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
index 0464ed422f..3212ddc1ef 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
@@ -26,33 +26,33 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <remarks>
         /// This is the final scoring value.
         /// </remarks>
-        public float TotalRotation => 360 * segments.Count + currentMaxRotation;
+        public float TotalRotation => 360 * completedSpins.Count + currentSpinMaxRotation;
 
-        /// <summary>
-        /// The list of all segments where either:
-        /// <list type="bullet">
-        /// <item>The spinning direction was changed.</item>
-        /// <item>A full spin of 360 degrees was performed in either direction.</item>
-        /// </list>
-        /// </summary>
-        private readonly Stack<SpinSegment> segments = new Stack<SpinSegment>();
+        private readonly Stack<CompletedSpin> completedSpins = new Stack<CompletedSpin>();
 
         /// <summary>
         /// The total accumulated rotation.
         /// </summary>
-        private float currentAbsoluteRotation;
+        private float totalAbsoluteRotation;
 
-        private float lastCompletionAbsoluteRotation;
+        private float totalAbsoluteRotationsAtLastCompletion;
 
         /// <summary>
-        /// For the current spin, represents the maximum rotation (from 0..360) achieved by the user.
+        /// For the current spin, represents the maximum absolute rotation (from 0..360) achieved by the user.
         /// </summary>
-        private float currentMaxRotation;
+        /// <remarks>
+        /// This is used to report <see cref="TotalRotation"/> in the case a user spins backwards.
+        /// Basically it allows us to not reduce the total rotation in such a case.
+        ///
+        /// This also stops spinner "cheese" where a user may rapidly change directions and cause an increase
+        /// in rotations.
+        /// </remarks>
+        private float currentSpinMaxRotation;
 
         /// <summary>
         /// The current spin, from -360..360.
         /// </summary>
-        private float currentRotation => currentAbsoluteRotation - lastCompletionAbsoluteRotation;
+        private float currentSpinRotation => totalAbsoluteRotation - totalAbsoluteRotationsAtLastCompletion;
 
         private double lastReportTime = double.NegativeInfinity;
 
@@ -63,74 +63,82 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <param name="delta">The delta of the angle moved through since the last report.</param>
         public void ReportDelta(double currentTime, float delta)
         {
-            // TODO: Debug.Assert(Math.Abs(delta) < 180);
-            // This will require important frame guarantees.
+            if (delta == 0)
+                return;
 
-            currentAbsoluteRotation += delta;
+            // Importantly, outside of tests the max delta entering here is 180 degrees.
+            // If it wasn't for tests, we could add this line:
+            //
+            // Debug.Assert(Math.Abs(delta) < 180);
+            //
+            // For this to be 101% correct, we need to add the ability for important frames to be
+            // created based on gameplay intrinsics (ie. there should be one frame for any spinner delta 90 < n < 180 degrees).
+            //
+            // But this can come later.
+
+            totalAbsoluteRotation += delta;
 
             if (currentTime >= lastReportTime)
-                addDelta(currentTime, delta);
+            {
+                currentSpinMaxRotation = Math.Max(currentSpinMaxRotation, Math.Abs(currentSpinRotation));
+
+                // Handle the case where the user has completed another spin.
+                // Note that this does could be an `if` rather than `while` if the above assertion held true.
+                // It is a `while` loop to handle tests which throw larger values at this method.
+                while (currentSpinMaxRotation >= 360)
+                {
+                    int direction = Math.Sign(currentSpinRotation);
+
+                    completedSpins.Push(new CompletedSpin(currentTime, direction));
+
+                    // Incrementing the last completion point will cause `currentSpinRotation` to
+                    // hold the remaining spin that needs to be considered.
+                    totalAbsoluteRotationsAtLastCompletion += direction * 360;
+
+                    // Reset the current max as we are entering a new spin.
+                    // Importantly, carry over the remainder (which is now stored in `currentSpinRotation`).
+                    currentSpinMaxRotation = Math.Abs(currentSpinRotation);
+                }
+            }
             else
-                rewindDelta(currentTime, delta);
+            {
+                // When rewinding, the main thing we care about is getting `totalAbsoluteRotationsAtLastCompletion`
+                // to the correct value. We can used the stored history for this.
+                while (completedSpins.TryPeek(out var segment) && segment.CompletionTime > currentTime)
+                {
+                    completedSpins.Pop();
+                    totalAbsoluteRotationsAtLastCompletion -= segment.Direction * 360;
+                }
+
+                // This is a best effort. We may not have enough data to match this 1:1, but that's okay.
+                // We know that the player is somewhere in a spin.
+                // In the worst case, this will be lower than expected, and recover in forward playback.
+                currentSpinMaxRotation = Math.Abs(currentSpinRotation);
+            }
 
             lastReportTime = currentTime;
         }
 
-        private void addDelta(double currentTime, float delta)
-        {
-            if (delta == 0)
-                return;
-
-            currentMaxRotation = Math.Max(currentMaxRotation, Math.Abs(currentRotation));
-
-            while (currentMaxRotation >= 360)
-            {
-                int direction = Math.Sign(currentRotation);
-
-                segments.Push(new SpinSegment(currentTime, direction));
-
-                lastCompletionAbsoluteRotation += direction * 360;
-                currentMaxRotation = Math.Abs(currentRotation);
-            }
-        }
-
-        private void rewindDelta(double currentTime, float delta)
-        {
-            while (segments.TryPeek(out var segment) && segment.StartTime > currentTime)
-            {
-                segments.Pop();
-                lastCompletionAbsoluteRotation -= segment.Direction * 360;
-                currentMaxRotation = Math.Abs(currentRotation);
-            }
-
-            currentMaxRotation = Math.Abs(currentRotation);
-        }
-
         /// <summary>
-        /// Represents a single segment of history.
+        /// Represents a single completed spin.
         /// </summary>
-        /// <remarks>
-        /// Each time the player changes direction, a new segment is recorded.
-        /// A segment stores the current absolute angle of rotation. Generally this would be either -360 or 360 for a completed spin, or
-        /// a number representing the last incomplete spin.
-        /// </remarks>
-        private class SpinSegment
+        private class CompletedSpin
         {
             /// <summary>
-            /// The start time of this segment, when the direction change occurred.
+            /// The time at which this spin completion occurred.
             /// </summary>
-            public readonly double StartTime;
+            public readonly double CompletionTime;
 
             /// <summary>
-            /// The direction this segment started in.
+            /// The direction this spin completed in.
             /// </summary>
             public readonly int Direction;
 
-            public SpinSegment(double startTime, int direction)
+            public CompletedSpin(double completionTime, int direction)
             {
                 Debug.Assert(direction == -1 || direction == 1);
 
-                StartTime = startTime;
+                CompletionTime = completionTime;
                 Direction = direction;
             }
         }

From 08845ec1c691df95d457860112186b5cccb45a1d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 17 Oct 2023 20:15:00 +0900
Subject: [PATCH 1893/2100] Use action for GHA diffcalc workflow permissions
 check

---
 .github/workflows/diffcalc.yml | 49 +++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 5fde6e2f1a..d39dffc4b9 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -14,8 +14,8 @@
 #
 # The workflow can be run in two ways:
 # 1. Via workflow dispatch.
-# 2. By an owner of the repository posting a pull request or issue comment containing `!diffcalc`.  
-# For pull requests, the workflow will assume the pull request as the target to compare against (i.e. the `OSU_B` variable).  
+# 2. By an owner of the repository posting a pull request or issue comment containing `!diffcalc`.
+# For pull requests, the workflow will assume the pull request as the target to compare against (i.e. the `OSU_B` variable).
 # Any lines in the comment of the form `KEY=VALUE` are treated as variables for the generator.
 #
 # ## Google Service Account
@@ -104,21 +104,22 @@ env:
   COMMENT_TAG: execution-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
 
 jobs:
-  wait-for-queue:
-    name: "Wait for previous workflows"
+  check-permissions:
+    name: Check permissions
     runs-on: ubuntu-latest
-    if: ${{ !cancelled() && (github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER') }}
-    timeout-minutes: 50400 # 35 days, the maximum for jobs.
+    if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') }}
     steps:
-      - uses: ahmadnassri/action-workflow-queue@v1
+      - name: Check permissions
+        if: ${{ github.event_name != 'workflow_dispatch' }}
+        uses: actions-cool/check-user-permission@v2
         with:
-          timeout: 2147483647 # Around 24 days, maximum supported.
-          delay: 120000 # Poll every 2 minutes. API seems fairly low on this one.
+          require: 'write'
 
   create-comment:
     name: Create PR comment
+    needs: check-permissions
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER' }}
+    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
     steps:
       - name: Create comment
         uses: thollander/actions-comment-pull-request@v2
@@ -129,11 +130,21 @@ jobs:
 
             *This comment will update on completion*
 
+  wait-for-queue:
+    name: "Wait for previous workflows"
+    needs: check-permissions
+    runs-on: ubuntu-latest
+    timeout-minutes: 50400 # 35 days, the maximum for jobs.
+    steps:
+      - uses: ahmadnassri/action-workflow-queue@v1
+        with:
+          timeout: 2147483647 # Around 24 days, maximum supported.
+          delay: 120000 # Poll every 2 minutes. API seems fairly low on this one.
+
   directory:
     name: Prepare directory
     needs: wait-for-queue
     runs-on: self-hosted
-    if: ${{ !cancelled() && (github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER') }}
     outputs:
       GENERATOR_DIR: ${{ steps.set-outputs.outputs.GENERATOR_DIR }}
       GENERATOR_ENV: ${{ steps.set-outputs.outputs.GENERATOR_ENV }}
@@ -159,7 +170,6 @@ jobs:
     name: Setup environment
     needs: directory
     runs-on: self-hosted
-    if: ${{ !cancelled() && needs.directory.result == 'success' }}
     env:
       VARS_JSON: ${{ toJSON(vars) }}
     steps:
@@ -239,7 +249,6 @@ jobs:
     name: Setup scores
     needs: [ directory, environment ]
     runs-on: self-hosted
-    if: ${{ !cancelled() && needs.environment.result == 'success' }}
     steps:
       - name: Query latest data
         id: query
@@ -272,7 +281,6 @@ jobs:
     name: Setup beatmaps
     needs: directory
     runs-on: self-hosted
-    if: ${{ !cancelled() && needs.directory.result == 'success' }}
     steps:
       - name: Query latest data
         id: query
@@ -305,7 +313,6 @@ jobs:
     needs: [ directory, environment, scores, beatmaps ]
     runs-on: self-hosted
     timeout-minutes: 720
-    if: ${{ !cancelled() && needs.scores.result == 'success' && needs.beatmaps.result == 'success' }}
     outputs:
       TARGET: ${{ steps.run.outputs.TARGET }}
       SPREADSHEET_LINK: ${{ steps.run.outputs.SPREADSHEET_LINK }}
@@ -331,17 +338,21 @@ jobs:
           cd "${{ needs.directory.outputs.GENERATOR_DIR }}"
           docker-compose down
 
+  output-cli:
+    name: Output info
+    needs: generator
+    runs-on: ubuntu-latest
+    steps:
       - name: Output info
-        if: ${{ success() }}
         run: |
-          echo "Target: ${{ steps.run.outputs.TARGET }}"
-          echo "Spreadsheet: ${{ steps.run.outputs.SPREADSHEET_LINK }}"
+          echo "Target: ${{ needs.generator.outputs.TARGET }}"
+          echo "Spreadsheet: ${{ needs.generator.outputs.SPREADSHEET_LINK }}"
 
   update-comment:
     name: Update PR comment
     needs: [ create-comment, generator ]
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER' }}
+    if: ${{ needs.create-comment.result == 'success' }}
     steps:
       - name: Update comment on success
         if: ${{ needs.generator.result == 'success' }}

From 566b09ff208feb6625ec4a52324f1b9f8770eac0 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 17 Oct 2023 20:36:24 +0900
Subject: [PATCH 1894/2100] Delete comment on cancellation

- Add always() pre-condition to force evaluation.

- Message is set as it's required by the action for a non-error status code.
---
 .github/workflows/diffcalc.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index d39dffc4b9..a8dc16af15 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -352,7 +352,7 @@ jobs:
     name: Update PR comment
     needs: [ create-comment, generator ]
     runs-on: ubuntu-latest
-    if: ${{ needs.create-comment.result == 'success' }}
+    if: ${{ always() && needs.create-comment.result == 'success' }}
     steps:
       - name: Update comment on success
         if: ${{ needs.generator.result == 'success' }}
@@ -374,3 +374,11 @@ jobs:
           create_if_not_exists: false
           message: |
             Difficulty calculation failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+      - name: Update comment on cancellation
+        if: ${{ needs.generator.result == 'cancelled' }}
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: ${{ env.COMMENT_TAG }}
+          mode: delete
+          message: '.' # Appears to be required by this action for non-error status code.

From 4946b437c9c5c639cfc9ea6a27aa3919ed33c250 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 17 Oct 2023 20:58:09 +0900
Subject: [PATCH 1895/2100] Run timeout job on self-hosted runner

---
 .github/workflows/diffcalc.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index a8dc16af15..c3d92b6d1f 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -133,13 +133,13 @@ jobs:
   wait-for-queue:
     name: "Wait for previous workflows"
     needs: check-permissions
-    runs-on: ubuntu-latest
-    timeout-minutes: 50400 # 35 days, the maximum for jobs.
+    runs-on: self-hosted
+    timeout-minutes: 50400 # 35 days, the maximum for jobs on self-hosted runners.
     steps:
       - uses: ahmadnassri/action-workflow-queue@v1
         with:
-          timeout: 2147483647 # Around 24 days, maximum supported.
-          delay: 120000 # Poll every 2 minutes. API seems fairly low on this one.
+          timeout: 2147483647 # Around 24 days - the maximum supported by JS setTimeout().
+          delay: 120000 # Poll every 2 minutes - the API limit seems fairly low on this one.
 
   directory:
     name: Prepare directory

From f116854c9fed7d6318ceb4021e0e99a62fbe58a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 14:15:17 +0200
Subject: [PATCH 1896/2100] Add test step for covering slider appearance with
 hidden active

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index e005d7cac3..b805e7ed63 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -27,6 +27,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Configuration;
+using osu.Game.Rulesets.Osu.Mods;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -50,6 +51,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 snakingOut.Value = !v;
             });
 
+            AddToggleStep("toggle hidden", hiddenActive => SelectedMods.Value = hiddenActive ? new[] { new OsuModHidden() } : Array.Empty<Mod>());
+
             AddSliderStep("hit at", 0f, 1f, 0f, v =>
             {
                 progressToHit = v;

From 30e5f470073399be071a7e947f6331c8056d3770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 13:39:52 +0200
Subject: [PATCH 1897/2100] Instantly fade out slider repeats when hidden is
 active

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 996ee1cddb..dd2befef4e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -98,6 +98,9 @@ namespace osu.Game.Rulesets.Osu.Mods
                         // only apply to circle piece – reverse arrow is not affected by hidden.
                         sliderRepeat.CirclePiece.FadeOut(fadeDuration);
 
+                    using (drawableObject.BeginAbsoluteSequence(drawableObject.HitStateUpdateTime))
+                        sliderRepeat.FadeOut();
+
                     break;
 
                 case DrawableHitCircle circle:

From f3cda5847448fa037b8739cf28815ebda4be0c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 14:33:57 +0200
Subject: [PATCH 1898/2100] Fix legacy slider repeats becoming much too large
 on hit

They had scale transforms applied to them in two places: the actual
legacy pieces themselves (esp. `LegacyHitCirclePiece`), and on the
`DrawableSliderRepeat` level.

This change moves all of the scale transforms to the skinnable pieces.
Argon and triangles have received a copy of the previous logic each,
so behaviour on those skins should not change.
---
 .../Objects/Drawables/DrawableSliderRepeat.cs |  5 ----
 .../Skinning/Argon/ArgonReverseArrow.cs       | 22 ++++++++++-----
 .../Skinning/Default/DefaultReverseArrow.cs   | 19 +++++++++----
 .../Skinning/Legacy/LegacyReverseArrow.cs     | 28 +++++++++++--------
 4 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index ac4d733672..0be571c229 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -118,11 +118,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                 case ArmedState.Hit:
                     this.FadeOut(animDuration, Easing.Out);
-
-                    const float final_scale = 1.5f;
-
-                    Arrow.ScaleTo(Scale * final_scale, animDuration, Easing.Out);
-                    CirclePiece.ScaleTo(Scale * final_scale, animDuration, Easing.Out);
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index 160edb6f67..87b89a07cf 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.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.Extensions.Color4Extensions;
@@ -12,6 +13,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
@@ -19,8 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
     public partial class ArgonReverseArrow : CompositeDrawable
     {
-        [Resolved]
-        private DrawableHitObject drawableObject { get; set; } = null!;
+        private DrawableSliderRepeat drawableRepeat { get; set; } = null!;
 
         private Bindable<Color4> accentColour = null!;
 
@@ -29,8 +30,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         private Sprite side = null!;
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        private void load(DrawableHitObject drawableObject, TextureStore textures)
         {
+            drawableRepeat = (DrawableSliderRepeat)drawableObject;
+
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
@@ -70,10 +73,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 }
             };
 
-            accentColour = drawableObject.AccentColour.GetBoundCopy();
+            accentColour = drawableRepeat.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4), true);
 
-            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
+            drawableRepeat.ApplyCustomUpdateState += updateStateTransforms;
         }
 
         private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
@@ -96,6 +99,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                         .MoveToX(0, move_in_duration, Easing.Out)
                         .Loop(total - (move_in_duration + move_out_duration));
                     break;
+
+                case ArmedState.Hit:
+                    double animDuration = Math.Min(300, drawableRepeat.HitObject.SpanDuration);
+                    this.ScaleTo(1.5f, animDuration, Easing.Out);
+                    break;
             }
         }
 
@@ -103,8 +111,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         {
             base.Dispose(isDisposing);
 
-            if (drawableObject.IsNotNull())
-                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+            if (drawableRepeat.IsNotNull())
+                drawableRepeat.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
index b44f6571b9..ad49150d81 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.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.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
@@ -8,14 +9,14 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public partial class DefaultReverseArrow : CompositeDrawable
     {
-        [Resolved]
-        private DrawableHitObject drawableObject { get; set; } = null!;
+        private DrawableSliderRepeat drawableRepeat { get; set; } = null!;
 
         public DefaultReverseArrow()
         {
@@ -36,9 +37,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(DrawableHitObject drawableObject)
         {
-            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
+            drawableRepeat = (DrawableSliderRepeat)drawableObject;
+            drawableRepeat.ApplyCustomUpdateState += updateStateTransforms;
         }
 
         private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
@@ -55,6 +57,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                                  .ScaleTo(1f, move_in_duration, Easing.Out)
                                  .Loop(total - (move_in_duration + move_out_duration));
                     break;
+
+                case ArmedState.Hit:
+                    double animDuration = Math.Min(300, drawableRepeat.HitObject.SpanDuration);
+                    InternalChild.ScaleTo(1.5f, animDuration, Easing.Out);
+                    break;
             }
         }
 
@@ -62,8 +69,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         {
             base.Dispose(isDisposing);
 
-            if (drawableObject.IsNotNull())
-                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+            if (drawableRepeat.IsNotNull())
+                drawableRepeat.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 9048a92e13..a535fbdbc3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -17,8 +18,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public partial class LegacyReverseArrow : CompositeDrawable
     {
-        [Resolved]
-        private DrawableHitObject drawableObject { get; set; } = null!;
+        private DrawableSliderRepeat drawableRepeat { get; set; } = null!;
 
         private Drawable proxy = null!;
 
@@ -31,8 +31,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private bool shouldRotate;
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skinSource)
+        private void load(DrawableHitObject drawableObject, ISkinSource skinSource)
         {
+            drawableRepeat = (DrawableSliderRepeat)drawableObject;
+
             AutoSizeAxes = Axes.Both;
 
             string lookupName = new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow).LookupName;
@@ -58,10 +60,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             proxy = CreateProxy();
 
-            drawableObject.HitObjectApplied += onHitObjectApplied;
-            onHitObjectApplied(drawableObject);
+            drawableRepeat.HitObjectApplied += onHitObjectApplied;
+            onHitObjectApplied(drawableRepeat);
 
-            accentColour = drawableObject.AccentColour.GetBoundCopy();
+            accentColour = drawableRepeat.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(c =>
             {
                 arrow.Colour = textureIsDefaultSkin && c.NewValue.R + c.NewValue.G + c.NewValue.B > (600 / 255f) ? Color4.Black : Color4.White;
@@ -73,8 +75,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             Debug.Assert(proxy.Parent == null);
 
             // see logic in LegacySliderHeadHitCircle.
-            (drawableObject as DrawableSliderRepeat)?.DrawableSlider
-                                                    .OverlayElementContainer.Add(proxy);
+            drawableRepeat.DrawableSlider.OverlayElementContainer.Add(proxy);
         }
 
         private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
@@ -102,6 +103,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     }
 
                     break;
+
+                case ArmedState.Hit:
+                    double animDuration = Math.Min(300, drawableRepeat.HitObject.SpanDuration);
+                    InternalChild.ScaleTo(1.4f, animDuration, Easing.Out);
+                    break;
             }
         }
 
@@ -109,10 +115,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.Dispose(isDisposing);
 
-            if (drawableObject.IsNotNull())
+            if (drawableRepeat.IsNotNull())
             {
-                drawableObject.HitObjectApplied -= onHitObjectApplied;
-                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+                drawableRepeat.HitObjectApplied -= onHitObjectApplied;
+                drawableRepeat.ApplyCustomUpdateState -= updateStateTransforms;
             }
         }
     }

From 1a3a81c33b82ce881a33b5635a987c31cfe960cb Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 17 Oct 2023 21:41:00 -0700
Subject: [PATCH 1899/2100] Add slider nub double click revert to default test

---
 .../TestSceneRoundedSliderBar.cs              | 59 +++++++++++++++++++
 .../TestSceneShearedSliderBar.cs              | 26 +++++++-
 2 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
new file mode 100644
index 0000000000..419e88137c
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
@@ -0,0 +1,59 @@
+// Copyright (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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public partial class TestSceneRoundedSliderBar : OsuManualInputManagerTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private readonly BindableDouble current = new BindableDouble(5)
+        {
+            Precision = 0.1f,
+            MinValue = 0,
+            MaxValue = 15
+        };
+
+        private RoundedSliderBar<double> slider = null!;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = slider = new RoundedSliderBar<double>
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Current = current,
+                RelativeSizeAxes = Axes.X,
+                Width = 0.4f
+            };
+        }
+
+        [Test]
+        public void TestNubDoubleClickRevertToDefault()
+        {
+            AddStep("set slider to 1", () => slider.Current.Value = 1);
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(slider.ChildrenOfType<Nub>().Single()));
+
+            AddStep("double click nub", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("slider is default", () => slider.Current.IsDefault);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
index 766f22d867..d459a2c701 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
@@ -1,15 +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.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public partial class TestSceneShearedSliderBar : OsuTestScene
+    public partial class TestSceneShearedSliderBar : OsuManualInputManagerTestScene
     {
         [Cached]
         private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Purple);
@@ -21,10 +25,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             MaxValue = 15
         };
 
+        private ShearedSliderBar<double> slider = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new ShearedSliderBar<double>
+            Child = slider = new ShearedSliderBar<double>
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -33,5 +39,21 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Width = 0.4f
             };
         }
+
+        [Test]
+        public void TestNubDoubleClickRevertToDefault()
+        {
+            AddStep("set slider to 1", () => slider.Current.Value = 1);
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(slider.ChildrenOfType<ShearedNub>().Single()));
+
+            AddStep("double click nub", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("slider is default", () => slider.Current.IsDefault);
+        }
     }
 }

From 18e8ca624554386bb408cacbebb6b0c7dd937b9f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 17 Oct 2023 21:37:38 -0700
Subject: [PATCH 1900/2100] Add ability to revert slider settings to default
 when double-clicking nub

---
 .../Graphics/UserInterface/RoundedSliderBar.cs | 18 ++++++++++++++++--
 osu.Game/Graphics/UserInterface/ShearedNub.cs  | 11 +++++++++++
 .../Graphics/UserInterface/ShearedSliderBar.cs |  3 ++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
index 56af23ff10..e5976fe893 100644
--- a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
@@ -93,11 +93,12 @@ namespace osu.Game.Graphics.UserInterface
                 nubContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = Nub = new Nub
+                    Child = Nub = new SliderNub
                     {
                         Origin = Anchor.TopCentre,
                         RelativePositionAxes = Axes.X,
-                        Current = { Value = true }
+                        Current = { Value = true },
+                        OnDoubleClicked = () => Current.SetDefault(),
                     },
                 },
                 hoverClickSounds = new HoverClickSounds()
@@ -166,5 +167,18 @@ namespace osu.Game.Graphics.UserInterface
         {
             Nub.MoveToX(value, 250, Easing.OutQuint);
         }
+
+        public partial class SliderNub : Nub
+        {
+            public Action? OnDoubleClicked { get; init; }
+
+            protected override bool OnClick(ClickEvent e) => true;
+
+            protected override bool OnDoubleClick(DoubleClickEvent e)
+            {
+                OnDoubleClicked?.Invoke();
+                return true;
+            }
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/ShearedNub.cs b/osu.Game/Graphics/UserInterface/ShearedNub.cs
index 3a09fd7445..7485f68525 100644
--- a/osu.Game/Graphics/UserInterface/ShearedNub.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedNub.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
@@ -18,6 +19,8 @@ namespace osu.Game.Graphics.UserInterface
 {
     public partial class ShearedNub : Container, IHasCurrentValue<bool>, IHasAccentColour
     {
+        public Action? OnDoubleClicked { get; init; }
+
         protected const float BORDER_WIDTH = 3;
 
         public const int HEIGHT = 30;
@@ -179,5 +182,13 @@ namespace osu.Game.Graphics.UserInterface
                 main.TransformTo(nameof(BorderThickness), BORDER_WIDTH, duration, Easing.OutQuint);
             }
         }
+
+        protected override bool OnClick(ClickEvent e) => true;
+
+        protected override bool OnDoubleClick(DoubleClickEvent e)
+        {
+            OnDoubleClicked?.Invoke();
+            return true;
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs b/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
index a18a6a259c..9ef5f3073a 100644
--- a/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
@@ -100,7 +100,8 @@ namespace osu.Game.Graphics.UserInterface
                         X = -SHEAR.X * HEIGHT / 2f,
                         Origin = Anchor.TopCentre,
                         RelativePositionAxes = Axes.X,
-                        Current = { Value = true }
+                        Current = { Value = true },
+                        OnDoubleClicked = () => Current.SetDefault(),
                     },
                 },
                 hoverClickSounds = new HoverClickSounds()

From 7479830a8ea8b21b8c6517354f35ce3fa4ddb0ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 16:26:32 +0900
Subject: [PATCH 1901/2100] Comment flaky tests for now

Same issue as other commented test (clock precision not high enough).

Will probably want a solution to this at some point.
---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 9e83ca428b..7f81ccddf6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(80, 1)]
         [TestCase(80, 0)]
         [TestCase(80, 10)]
-        [TestCase(90, 1)]
+        // [TestCase(90, 1)] flaky
         public void TestVeryShortSlider(float sliderLength, int repeatCount)
         {
             Slider slider;
@@ -87,8 +87,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(300, false)]
         [TestCase(200, true)]
         [TestCase(150, true)]
-        [TestCase(120, true)]
-        [TestCase(60, true)]
+        // [TestCase(120, true)] flaky
+        // [TestCase(60, true)] flaky
         [TestCase(10, true)]
         // [TestCase(0, true)] headless test doesn't run at high enough precision for this to always enter a tracking state in time.
         [TestCase(-30, false)]

From 43238b0cee94f28ff6b8abebb7f4bfcbbc134f93 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 16:55:27 +0900
Subject: [PATCH 1902/2100] Split common functionality from rate adjust mods
 into helper class

---
 osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs    | 20 +++-------
 osu.Game/Rulesets/Mods/ModDaycore.cs          |  1 -
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       | 20 +++-------
 osu.Game/Rulesets/Mods/ModHalfTime.cs         | 20 +++-------
 osu.Game/Rulesets/Mods/ModNightcore.cs        | 40 +++++++++----------
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         | 20 ++--------
 osu.Game/Rulesets/Mods/RateAdjustModHelper.cs | 36 +++++++++++++++++
 7 files changed, 74 insertions(+), 83 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/RateAdjustModHelper.cs

diff --git a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
index f62ba21827..f122baed90 100644
--- a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
+++ b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
@@ -71,7 +71,6 @@ namespace osu.Game.Rulesets.Mods
         // Apply a fixed rate change when missing, allowing the player to catch up when the rate is too fast.
         private const double rate_change_on_miss = 0.95d;
 
-        private IAdjustableAudioComponent? track;
         private double targetRate = 1d;
 
         /// <summary>
@@ -123,24 +122,26 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         private readonly Dictionary<HitObject, double> ratesForRewinding = new Dictionary<HitObject, double>();
 
+        private readonly RateAdjustModHelper rateAdjustHelper;
+
         public ModAdaptiveSpeed()
         {
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+
             InitialRate.BindValueChanged(val =>
             {
                 SpeedChange.Value = val.NewValue;
                 targetRate = val.NewValue;
             });
-            AdjustPitch.BindValueChanged(adjustPitchChanged);
         }
 
         public void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            this.track = track;
-
             InitialRate.TriggerChange();
-            AdjustPitch.TriggerChange();
             recentRates.Clear();
             recentRates.AddRange(Enumerable.Repeat(InitialRate.Value, recent_rate_count));
+
+            rateAdjustHelper.ApplyToTrack(track);
         }
 
         public void ApplyToSample(IAdjustableAudioComponent sample)
@@ -199,15 +200,6 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
-        private void adjustPitchChanged(ValueChangedEvent<bool> adjustPitchSetting)
-        {
-            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
-            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
-        }
-
-        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
-            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
-
         private IEnumerable<HitObject> getAllApplicableHitObjects(IEnumerable<HitObject> hitObjects)
         {
             foreach (var hitObject in hitObjects)
diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index c5810cc9e5..60ce610d7d 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Rulesets.Mods
 
         public override void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
             track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index df17f4f963..938c6268e2 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -27,29 +27,19 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        private IAdjustableAudioComponent? track;
-
         [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
-        public virtual BindableBool AdjustPitch { get; } = new BindableBool(false);
+        public virtual BindableBool AdjustPitch { get; } = new BindableBool();
+
+        private readonly RateAdjustModHelper rateAdjustHelper;
 
         protected ModDoubleTime()
         {
-            AdjustPitch.BindValueChanged(adjustPitchChanged);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
         }
 
-        private void adjustPitchChanged(ValueChangedEvent<bool> adjustPitchSetting)
-        {
-            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
-            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
-        }
-
-        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
-            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
-
         public override void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            this.track = track;
-            AdjustPitch.TriggerChange();
+            rateAdjustHelper.ApplyToTrack(track);
         }
 
         public override double ScoreMultiplier
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 390d07d3ee..965e94efcb 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -27,29 +27,19 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        private IAdjustableAudioComponent? track;
-
         [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
-        public virtual BindableBool AdjustPitch { get; } = new BindableBool(false);
+        public virtual BindableBool AdjustPitch { get; } = new BindableBool();
+
+        private readonly RateAdjustModHelper rateAdjustHelper;
 
         protected ModHalfTime()
         {
-            AdjustPitch.BindValueChanged(adjustPitchChanged);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
         }
 
-        private void adjustPitchChanged(ValueChangedEvent<bool> adjustPitchSetting)
-        {
-            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
-            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
-        }
-
-        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
-            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
-
         public override void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            this.track = track;
-            AdjustPitch.TriggerChange();
+            rateAdjustHelper.ApplyToTrack(track);
         }
 
         public override double ScoreMultiplier
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 80b9314aec..520ee6319a 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -36,27 +36,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(SpeedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                // Each 0.1 multiple changes score multiplier by 0.02.
-                value /= 5;
-
-                return 1 + value;
-            }
-        }
-    }
-
-    public abstract partial class ModNightcore<TObject> : ModNightcore, IApplicableToDrawableRuleset<TObject>
-        where TObject : HitObject
-    {
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
         private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
 
@@ -71,11 +50,28 @@ namespace osu.Game.Rulesets.Mods
 
         public override void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
             track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
 
+        public override double ScoreMultiplier
+        {
+            get
+            {
+                // Round to the nearest multiple of 0.1.
+                double value = (int)(SpeedChange.Value * 10) / 10.0;
+
+                // Offset back to 0.
+                value -= 1;
+
+                return 1 + value;
+            }
+        }
+    }
+
+    public abstract partial class ModNightcore<TObject> : ModNightcore, IApplicableToDrawableRuleset<TObject>
+        where TObject : HitObject
+    {
         public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
         {
             drawableRuleset.Overlays.Add(new NightcoreBeatContainer());
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 54ee0cd3bf..1048caa698 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -44,21 +44,20 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        private IAdjustableAudioComponent? track;
+        private readonly RateAdjustModHelper rateAdjustHelper;
 
         protected ModTimeRamp()
         {
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+
             // for preview purpose at song select. eventually we'll want to be able to update every frame.
             FinalRate.BindValueChanged(_ => applyRateAdjustment(double.PositiveInfinity), true);
-            AdjustPitch.BindValueChanged(applyPitchAdjustment);
         }
 
         public void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            this.track = track;
-
+            rateAdjustHelper.ApplyToTrack(track);
             FinalRate.TriggerChange();
-            AdjustPitch.TriggerChange();
         }
 
         public void ApplyToSample(IAdjustableAudioComponent sample)
@@ -95,16 +94,5 @@ namespace osu.Game.Rulesets.Mods
         /// Adjust the rate along the specified ramp.
         /// </summary>
         private void applyRateAdjustment(double time) => SpeedChange.Value = ApplyToRate(time);
-
-        private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
-        {
-            // remove existing old adjustment
-            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
-
-            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
-        }
-
-        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
-            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
new file mode 100644
index 0000000000..a54be77338
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/RateAdjustModHelper.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 osu.Framework.Audio;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public class RateAdjustModHelper : IApplicableToTrack
+    {
+        private readonly BindableBool? adjustPitch;
+        private IAdjustableAudioComponent? track;
+
+        public RateAdjustModHelper(BindableNumber<double> speedChange, BindableBool? adjustPitch)
+        {
+            this.adjustPitch = adjustPitch;
+
+            // When switching between pitch adjust, we need to update adjustments to time-shift or frequency-scale.
+            adjustPitch?.BindValueChanged(adjustPitchSetting =>
+            {
+                track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), speedChange);
+                track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), speedChange);
+
+                AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
+                    => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
+            });
+        }
+
+        public void ApplyToTrack(IAdjustableAudioComponent track)
+        {
+            this.track = track;
+
+            adjustPitch?.TriggerChange();
+        }
+    }
+}

From e56ff33271932eeda3776034562af8a91b05b178 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 17:23:14 +0900
Subject: [PATCH 1903/2100] Also share `ScoreMultiplier` implementation

---
 osu.Game/Rulesets/Mods/ModDaycore.cs          | 17 +++----------
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       | 17 +------------
 osu.Game/Rulesets/Mods/ModHalfTime.cs         | 14 +----------
 osu.Game/Rulesets/Mods/ModNightcore.cs        | 18 ++++---------
 osu.Game/Rulesets/Mods/RateAdjustModHelper.cs | 25 +++++++++++++++++--
 5 files changed, 34 insertions(+), 57 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index 60ce610d7d..0b32788bf3 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -27,9 +27,12 @@ namespace osu.Game.Rulesets.Mods
 
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
         private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
+        private readonly RateAdjustModHelper rateAdjustHelper;
 
         protected ModDaycore()
         {
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+
             SpeedChange.BindValueChanged(val =>
             {
                 freqAdjust.Value = SpeedChange.Default;
@@ -43,18 +46,6 @@ namespace osu.Game.Rulesets.Mods
             track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
 
-        public override double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(SpeedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                return 1 + value;
-            }
-        }
+        public override double ScoreMultiplier => rateAdjustHelper.ScoreMultiplier;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 938c6268e2..f20cdcb18d 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -42,21 +42,6 @@ namespace osu.Game.Rulesets.Mods
             rateAdjustHelper.ApplyToTrack(track);
         }
 
-        public override double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(SpeedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                // Each 0.1 multiple changes score multiplier by 0.02.
-                value /= 5;
-
-                return 1 + value;
-            }
-        }
+        public override double ScoreMultiplier => rateAdjustHelper.ScoreMultiplier;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 965e94efcb..4d75ee16bd 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -42,18 +42,6 @@ namespace osu.Game.Rulesets.Mods
             rateAdjustHelper.ApplyToTrack(track);
         }
 
-        public override double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(SpeedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                return 1 + value;
-            }
-        }
+        public override double ScoreMultiplier => rateAdjustHelper.ScoreMultiplier;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 520ee6319a..933c9c9fc5 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -39,8 +39,12 @@ namespace osu.Game.Rulesets.Mods
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
         private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
 
+        private readonly RateAdjustModHelper rateAdjustHelper;
+
         protected ModNightcore()
         {
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+
             SpeedChange.BindValueChanged(val =>
             {
                 freqAdjust.Value = SpeedChange.Default;
@@ -54,19 +58,7 @@ namespace osu.Game.Rulesets.Mods
             track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
 
-        public override double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(SpeedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                return 1 + value;
-            }
-        }
+        public override double ScoreMultiplier => rateAdjustHelper.ScoreMultiplier;
     }
 
     public abstract partial class ModNightcore<TObject> : ModNightcore, IApplicableToDrawableRuleset<TObject>
diff --git a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
index a54be77338..034c20fc78 100644
--- a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
+++ b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
@@ -6,13 +6,18 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Mods
 {
+    /// <summary>
+    /// Provides common functionality shared across various rate adjust mods.
+    /// </summary>
     public class RateAdjustModHelper : IApplicableToTrack
     {
         private readonly BindableBool? adjustPitch;
+        private readonly BindableNumber<double> speedChange;
         private IAdjustableAudioComponent? track;
 
-        public RateAdjustModHelper(BindableNumber<double> speedChange, BindableBool? adjustPitch)
+        public RateAdjustModHelper(BindableNumber<double> speedChange, BindableBool? adjustPitch = null)
         {
+            this.speedChange = speedChange;
             this.adjustPitch = adjustPitch;
 
             // When switching between pitch adjust, we need to update adjustments to time-shift or frequency-scale.
@@ -29,8 +34,24 @@ namespace osu.Game.Rulesets.Mods
         public void ApplyToTrack(IAdjustableAudioComponent track)
         {
             this.track = track;
-
             adjustPitch?.TriggerChange();
         }
+
+        public double ScoreMultiplier
+        {
+            get
+            {
+                // Round to the nearest multiple of 0.1.
+                double value = (int)(speedChange.Value * 10) / 10.0;
+
+                // Offset back to 0.
+                value -= 1;
+
+                if (speedChange.Value >= 1)
+                    value /= 5;
+
+                return 1 + value;
+            }
+        }
     }
 }

From 161890292fc4c18c1f8dc2cefa8233fcdf0df2dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 17:38:11 +0900
Subject: [PATCH 1904/2100] Move audio adjustment hookup to own method for
 clarity

---
 osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs    |  3 +-
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       |  3 +-
 osu.Game/Rulesets/Mods/ModHalfTime.cs         |  3 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  3 +-
 osu.Game/Rulesets/Mods/RateAdjustModHelper.cs | 35 ++++++++++++++++---
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
index f122baed90..607e6b8399 100644
--- a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
+++ b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
@@ -126,7 +126,8 @@ namespace osu.Game.Rulesets.Mods
 
         public ModAdaptiveSpeed()
         {
-            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+            rateAdjustHelper.HandleAudioAdjustments(AdjustPitch);
 
             InitialRate.BindValueChanged(val =>
             {
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index f20cdcb18d..789291772d 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -34,7 +34,8 @@ namespace osu.Game.Rulesets.Mods
 
         protected ModDoubleTime()
         {
-            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+            rateAdjustHelper.HandleAudioAdjustments(AdjustPitch);
         }
 
         public override void ApplyToTrack(IAdjustableAudioComponent track)
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 4d75ee16bd..8b5dd39584 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -34,7 +34,8 @@ namespace osu.Game.Rulesets.Mods
 
         protected ModHalfTime()
         {
-            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+            rateAdjustHelper.HandleAudioAdjustments(AdjustPitch);
         }
 
         public override void ApplyToTrack(IAdjustableAudioComponent track)
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 1048caa698..d2772417db 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -48,7 +48,8 @@ namespace osu.Game.Rulesets.Mods
 
         protected ModTimeRamp()
         {
-            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+            rateAdjustHelper.HandleAudioAdjustments(AdjustPitch);
 
             // for preview purpose at song select. eventually we'll want to be able to update every frame.
             FinalRate.BindValueChanged(_ => applyRateAdjustment(double.PositiveInfinity), true);
diff --git a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
index 034c20fc78..701bad06bc 100644
--- a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
+++ b/osu.Game/Rulesets/Mods/RateAdjustModHelper.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.Audio;
 using osu.Framework.Bindables;
 
@@ -11,17 +12,32 @@ namespace osu.Game.Rulesets.Mods
     /// </summary>
     public class RateAdjustModHelper : IApplicableToTrack
     {
-        private readonly BindableBool? adjustPitch;
         private readonly BindableNumber<double> speedChange;
+
         private IAdjustableAudioComponent? track;
 
-        public RateAdjustModHelper(BindableNumber<double> speedChange, BindableBool? adjustPitch = null)
+        private BindableBool? adjustPitch;
+
+        /// <summary>
+        /// Construct a new <see cref="RateAdjustModHelper"/>.
+        /// </summary>
+        /// <param name="speedChange">The main speed adjust parameter which is exposed to the user.</param>
+        public RateAdjustModHelper(BindableNumber<double> speedChange)
         {
             this.speedChange = speedChange;
+        }
+
+        /// <summary>
+        /// Setup audio track adjustments for a rate adjust mod.
+        /// Importantly, <see cref="ApplyToTrack"/> must be called when a track is obtained/changed for this to work.
+        /// </summary>
+        /// <param name="adjustPitch">The "adjust pitch" setting as exposed to the user.</param>
+        public void HandleAudioAdjustments(BindableBool adjustPitch)
+        {
             this.adjustPitch = adjustPitch;
 
             // When switching between pitch adjust, we need to update adjustments to time-shift or frequency-scale.
-            adjustPitch?.BindValueChanged(adjustPitchSetting =>
+            adjustPitch.BindValueChanged(adjustPitchSetting =>
             {
                 track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), speedChange);
                 track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), speedChange);
@@ -31,12 +47,23 @@ namespace osu.Game.Rulesets.Mods
             });
         }
 
+        /// <summary>
+        /// Should be invoked when a track is obtained / changed.
+        /// </summary>
+        /// <param name="track">The new track.</param>
+        /// <exception cref="InvalidOperationException">If this method is called before <see cref="HandleAudioAdjustments"/>.</exception>
         public void ApplyToTrack(IAdjustableAudioComponent track)
         {
+            if (adjustPitch == null)
+                throw new InvalidOperationException($"Must call {nameof(HandleAudioAdjustments)} first");
+
             this.track = track;
-            adjustPitch?.TriggerChange();
+            adjustPitch.TriggerChange();
         }
 
+        /// <summary>
+        /// The score multiplier for the current <see cref="speedChange"/>.
+        /// </summary>
         public double ScoreMultiplier
         {
             get

From 9907adc337dd7d4d14c2b0b0b8144695fcc475a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 17:39:11 +0900
Subject: [PATCH 1905/2100] Take in `IBindable`s and tidy up multiplier
 handling

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

diff --git a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
index 701bad06bc..ffd4de0e90 100644
--- a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
+++ b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
@@ -12,19 +12,39 @@ namespace osu.Game.Rulesets.Mods
     /// </summary>
     public class RateAdjustModHelper : IApplicableToTrack
     {
-        private readonly BindableNumber<double> speedChange;
+        public readonly IBindableNumber<double> SpeedChange;
 
         private IAdjustableAudioComponent? track;
 
         private BindableBool? adjustPitch;
 
+        /// <summary>
+        /// The score multiplier for the current <see cref="SpeedChange"/>.
+        /// </summary>
+        public double ScoreMultiplier
+        {
+            get
+            {
+                // Round to the nearest multiple of 0.1.
+                double value = (int)(SpeedChange.Value * 10) / 10.0;
+
+                // Offset back to 0.
+                value -= 1;
+
+                if (SpeedChange.Value >= 1)
+                    value /= 5;
+
+                return 1 + value;
+            }
+        }
+
         /// <summary>
         /// Construct a new <see cref="RateAdjustModHelper"/>.
         /// </summary>
         /// <param name="speedChange">The main speed adjust parameter which is exposed to the user.</param>
-        public RateAdjustModHelper(BindableNumber<double> speedChange)
+        public RateAdjustModHelper(IBindableNumber<double> speedChange)
         {
-            this.speedChange = speedChange;
+            SpeedChange = speedChange;
         }
 
         /// <summary>
@@ -39,8 +59,8 @@ namespace osu.Game.Rulesets.Mods
             // When switching between pitch adjust, we need to update adjustments to time-shift or frequency-scale.
             adjustPitch.BindValueChanged(adjustPitchSetting =>
             {
-                track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), speedChange);
-                track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), speedChange);
+                track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
+                track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
 
                 AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
                     => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
@@ -60,25 +80,5 @@ namespace osu.Game.Rulesets.Mods
             this.track = track;
             adjustPitch.TriggerChange();
         }
-
-        /// <summary>
-        /// The score multiplier for the current <see cref="speedChange"/>.
-        /// </summary>
-        public double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(speedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                if (speedChange.Value >= 1)
-                    value /= 5;
-
-                return 1 + value;
-            }
-        }
     }
 }

From 92524d42990747e5545194c4def191f073ee7e39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 17:44:01 +0900
Subject: [PATCH 1906/2100] Remove incorrect plural from variable

---
 .../Objects/Drawables/SpinnerSpinHistory.cs               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
index 3212ddc1ef..1cf511f526 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         private float totalAbsoluteRotation;
 
-        private float totalAbsoluteRotationsAtLastCompletion;
+        private float totalAbsoluteRotationAtLastCompletion;
 
         /// <summary>
         /// For the current spin, represents the maximum absolute rotation (from 0..360) achieved by the user.
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// The current spin, from -360..360.
         /// </summary>
-        private float currentSpinRotation => totalAbsoluteRotation - totalAbsoluteRotationsAtLastCompletion;
+        private float currentSpinRotation => totalAbsoluteRotation - totalAbsoluteRotationAtLastCompletion;
 
         private double lastReportTime = double.NegativeInfinity;
 
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                     // Incrementing the last completion point will cause `currentSpinRotation` to
                     // hold the remaining spin that needs to be considered.
-                    totalAbsoluteRotationsAtLastCompletion += direction * 360;
+                    totalAbsoluteRotationAtLastCompletion += direction * 360;
 
                     // Reset the current max as we are entering a new spin.
                     // Importantly, carry over the remainder (which is now stored in `currentSpinRotation`).
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 while (completedSpins.TryPeek(out var segment) && segment.CompletionTime > currentTime)
                 {
                     completedSpins.Pop();
-                    totalAbsoluteRotationsAtLastCompletion -= segment.Direction * 360;
+                    totalAbsoluteRotationAtLastCompletion -= segment.Direction * 360;
                 }
 
                 // This is a best effort. We may not have enough data to match this 1:1, but that's okay.

From be321e34e90ee47a2ba0076587c965ef72e0d24f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 17:46:14 +0900
Subject: [PATCH 1907/2100] Attempt to fix flaky tests with egregious retry
 rule

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 7f81ccddf6..ce78119861 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -51,7 +51,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(80, 1)]
         [TestCase(80, 0)]
         [TestCase(80, 10)]
-        // [TestCase(90, 1)] flaky
+        [TestCase(90, 1)]
+        [Retry(100)] // headless test doesn't run at high enough precision for this to always enter a tracking state in time.
         public void TestVeryShortSlider(float sliderLength, int repeatCount)
         {
             Slider slider;
@@ -87,11 +88,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(300, false)]
         [TestCase(200, true)]
         [TestCase(150, true)]
-        // [TestCase(120, true)] flaky
-        // [TestCase(60, true)] flaky
+        [TestCase(120, true)]
+        [TestCase(60, true)]
         [TestCase(10, true)]
-        // [TestCase(0, true)] headless test doesn't run at high enough precision for this to always enter a tracking state in time.
+        [TestCase(0, true)]
         [TestCase(-30, false)]
+        [Retry(100)] // headless test doesn't run at high enough precision for this to always enter a tracking state in time.
         public void TestTailLeniency(float finalPosition, bool hit)
         {
             Slider slider;

From 6ae82c5e73d27d91ad4d11d381cc59d3044784c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 18:35:08 +0900
Subject: [PATCH 1908/2100] Fix circle scale not matching stable due to missing
 multiplier

This multiplier has to exist.

I'm not guaranteeing that the rest is correct here. Should we be doing
proper cross-testing on this? Maybe, but it's going to be hard to get
right. We could likely check as far as "game pixels", but there's still
a chance that the osu-framework could be doing something weird in the
rest of the hierarchy where playfield scale is involved.

Closes https://github.com/ppy/osu/issues/25162. Tested to fix the linked
replay.
---
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 0bdbfaa760..80d3de75ea 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -155,7 +155,17 @@ namespace osu.Game.Rulesets.Osu.Objects
             // This adjustment is necessary for AR>10, otherwise TimePreempt can become smaller leading to hitcircles not fully fading in.
             TimeFadeIn = 400 * Math.Min(1, TimePreempt / PREEMPT_MIN);
 
-            Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
+            // The following comment is copied verbatim from osu-stable:
+            //
+            //   Builds of osu! up to 2013-05-04 had the gamefield being rounded down, which caused incorrect radius calculations
+            //   in widescreen cases. This ratio adjusts to allow for old replays to work post-fix, which in turn increases the lenience
+            //   for all plays, but by an amount so small it should only be effective in replays.
+            //
+            // To match expectations of gameplay we need to apply this multiplier to circle scale. It's weird but is what it is.
+            // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
+            const float broken_gamefield_rounding_allowance = 1.00041f;
+
+            Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2 * broken_gamefield_rounding_allowance;
         }
 
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();

From cff69d63a62c532957eb269c6eb492b441501c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 18 Oct 2023 12:27:16 +0200
Subject: [PATCH 1909/2100] Add inline commentary in `Mod{Day,Night}core` about
 different speed adjustments

---
 osu.Game/Rulesets/Mods/ModDaycore.cs   | 2 ++
 osu.Game/Rulesets/Mods/ModNightcore.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index 0b32788bf3..39ebd1fe4c 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Rulesets.Mods
         {
             rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
 
+            // intentionally not deferring the speed change handling to `RateAdjustModHelper`
+            // as the expected result of operation is not the same (daycore should preserve constant pitch).
             SpeedChange.BindValueChanged(val =>
             {
                 freqAdjust.Value = SpeedChange.Default;
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 933c9c9fc5..b519ab4db7 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -45,6 +45,8 @@ namespace osu.Game.Rulesets.Mods
         {
             rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
 
+            // intentionally not deferring the speed change handling to `RateAdjustModHelper`
+            // as the expected result of operation is not the same (nightcore should preserve constant pitch).
             SpeedChange.BindValueChanged(val =>
             {
                 freqAdjust.Value = SpeedChange.Default;

From 3a5490892ce669bc8d7ae66f1bbc90e33d2e1ed9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 19:50:42 +0900
Subject: [PATCH 1910/2100] Centralise and repair circle size calculations
 game-wide

---
 .../Objects/CatchHitObject.cs                 |  2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  9 ++-----
 .../TestSceneSliderFollowCircleInput.cs       |  2 +-
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs | 12 +---------
 .../Statistics/AccuracyHeatmap.cs             |  3 +--
 osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs   | 24 ++++++++++++++++++-
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index f4bd515995..1d536eb5cb 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             TimePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
 
-            Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
+            Scale = IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize);
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index c5c9556ed7..236a7290da 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch.UI
             Size = new Vector2(BASE_SIZE);
 
             if (difficulty != null)
-                Scale = calculateScale(difficulty);
+                Scale = new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize));
 
             CatchWidth = CalculateCatchWidth(Scale);
 
@@ -182,11 +182,6 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public Drawable CreateProxiedContent() => caughtObjectContainer.CreateProxy();
 
-        /// <summary>
-        /// Calculates the scale of the catcher based off the provided beatmap difficulty.
-        /// </summary>
-        private static Vector2 calculateScale(IBeatmapDifficultyInfo difficulty) => new Vector2(1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
-
         /// <summary>
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
@@ -197,7 +192,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
         /// <param name="difficulty">The beatmap difficulty.</param>
-        public static float CalculateCatchWidth(IBeatmapDifficultyInfo difficulty) => CalculateCatchWidth(calculateScale(difficulty));
+        public static float CalculateCatchWidth(IBeatmapDifficultyInfo difficulty) => CalculateCatchWidth(new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize)));
 
         /// <summary>
         /// Determine if this catcher can catch a <see cref="CatchHitObject"/> in the current position.
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
index 5adc50859f..0e5f8a8cf6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             const double time_slider_start = 1000;
 
-            float circleRadius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (circleSize - 5) / 5) / 2;
+            float circleRadius = OsuHitObject.OBJECT_RADIUS * IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(circleSize);
             float followCircleRadius = circleRadius * 1.2f;
 
             performTest(new Beatmap<OsuHitObject>
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 80d3de75ea..0b1f413362 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -155,17 +155,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             // This adjustment is necessary for AR>10, otherwise TimePreempt can become smaller leading to hitcircles not fully fading in.
             TimeFadeIn = 400 * Math.Min(1, TimePreempt / PREEMPT_MIN);
 
-            // The following comment is copied verbatim from osu-stable:
-            //
-            //   Builds of osu! up to 2013-05-04 had the gamefield being rounded down, which caused incorrect radius calculations
-            //   in widescreen cases. This ratio adjusts to allow for old replays to work post-fix, which in turn increases the lenience
-            //   for all plays, but by an amount so small it should only be effective in replays.
-            //
-            // To match expectations of gameplay we need to apply this multiplier to circle scale. It's weird but is what it is.
-            // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
-            const float broken_gamefield_rounding_allowance = 1.00041f;
-
-            Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2 * broken_gamefield_rounding_allowance;
+            Scale = IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize);
         }
 
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();
diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 6564a086fe..8a2c7ff13a 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -208,8 +208,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             if (score.HitEvents.Count == 0)
                 return;
 
-            // Todo: This should probably not be done like this.
-            float radius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (playableBeatmap.Difficulty.CircleSize - 5) / 5) / 2;
+            float radius = OsuHitObject.OBJECT_RADIUS * IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(playableBeatmap.Difficulty.CircleSize);
 
             foreach (var e in score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)))
             {
diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index 78234a9dd9..af943b62e7 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -44,6 +44,21 @@ namespace osu.Game.Beatmaps
         /// </summary>
         double SliderTickRate { get; }
 
+        static float CalculateScaleFromCircleSize(float circleSize)
+        {
+            // The following comment is copied verbatim from osu-stable:
+            //
+            //   Builds of osu! up to 2013-05-04 had the gamefield being rounded down, which caused incorrect radius calculations
+            //   in widescreen cases. This ratio adjusts to allow for old replays to work post-fix, which in turn increases the lenience
+            //   for all plays, but by an amount so small it should only be effective in replays.
+            //
+            // To match expectations of gameplay we need to apply this multiplier to circle scale. It's weird but is what it is.
+            // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
+            const float broken_gamefield_rounding_allowance = 1.00041f;
+
+            return (float)(1.0f - 0.7f * DifficultyRange(circleSize)) / 2 * broken_gamefield_rounding_allowance;
+        }
+
         /// <summary>
         /// Maps a difficulty value [0, 10] to a two-piece linear range of values.
         /// </summary>
@@ -55,13 +70,20 @@ namespace osu.Game.Beatmaps
         static double DifficultyRange(double difficulty, double min, double mid, double max)
         {
             if (difficulty > 5)
-                return mid + (max - mid) * (difficulty - 5) / 5;
+                return mid + (max - mid) * DifficultyRange(difficulty);
             if (difficulty < 5)
                 return mid - (mid - min) * (5 - difficulty) / 5;
 
             return mid;
         }
 
+        /// <summary>
+        /// Maps a difficulty value [0, 10] to a linear range of [-1, 1].
+        /// </summary>
+        /// <param name="difficulty">The difficulty value to be mapped.</param>
+        /// <returns>Value to which the difficulty value maps in the specified range.</returns>
+        static double DifficultyRange(double difficulty) => (difficulty - 5) / 5;
+
         /// <summary>
         /// Maps a difficulty value [0, 10] to a two-piece linear range of values.
         /// </summary>

From 78d3c3723dec9b46f1b271c32c4b86267555bffa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 20:12:14 +0900
Subject: [PATCH 1911/2100] Ignore instead of retry tests

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index ce78119861..247aa4f445 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(80, 0)]
         [TestCase(80, 10)]
         [TestCase(90, 1)]
-        [Retry(100)] // headless test doesn't run at high enough precision for this to always enter a tracking state in time.
+        [Ignore("headless test doesn't run at high enough precision for this to always enter a tracking state in time.")]
         public void TestVeryShortSlider(float sliderLength, int repeatCount)
         {
             Slider slider;
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(10, true)]
         [TestCase(0, true)]
         [TestCase(-30, false)]
-        [Retry(100)] // headless test doesn't run at high enough precision for this to always enter a tracking state in time.
+        [Ignore("headless test doesn't run at high enough precision for this to always enter a tracking state in time.")]
         public void TestTailLeniency(float finalPosition, bool hit)
         {
             Slider slider;

From 040d0970f219fbb58c10f72fca9c3c6b80c53a51 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 23:54:18 +0900
Subject: [PATCH 1912/2100] Use `DifficultyRange` helper method in one more
 place

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

diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index af943b62e7..19944afa1c 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Beatmaps
             if (difficulty > 5)
                 return mid + (max - mid) * DifficultyRange(difficulty);
             if (difficulty < 5)
-                return mid - (mid - min) * (5 - difficulty) / 5;
+                return mid + (mid - min) * DifficultyRange(difficulty);
 
             return mid;
         }

From 42087037aeea9409fac0723b9a9d05b9fe2d7e98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 23:56:15 +0900
Subject: [PATCH 1913/2100] Fix `Catcher` code change not accounting for double
 sizing requirement

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 236a7290da..f09614816d 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch.UI
             Size = new Vector2(BASE_SIZE);
 
             if (difficulty != null)
-                Scale = new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize));
+                Scale = calculateScale(difficulty);
 
             CatchWidth = CalculateCatchWidth(Scale);
 
@@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
         /// <param name="difficulty">The beatmap difficulty.</param>
-        public static float CalculateCatchWidth(IBeatmapDifficultyInfo difficulty) => CalculateCatchWidth(new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize)));
+        public static float CalculateCatchWidth(IBeatmapDifficultyInfo difficulty) => CalculateCatchWidth(calculateScale(difficulty));
 
         /// <summary>
         /// Determine if this catcher can catch a <see cref="CatchHitObject"/> in the current position.
@@ -466,6 +466,11 @@ namespace osu.Game.Rulesets.Catch.UI
             d.Expire();
         }
 
+        /// <summary>
+        /// Calculates the scale of the catcher based off the provided beatmap difficulty.
+        /// </summary>
+        private static Vector2 calculateScale(IBeatmapDifficultyInfo difficulty) => new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize) * 2);
+
         private enum DroppedObjectAnimation
         {
             Drop,

From 14cadd1eeb23fe59733b5237f46ce98eefbda33d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 19 Oct 2023 02:39:34 +0900
Subject: [PATCH 1914/2100] Pin third-party actions

---
 .github/workflows/diffcalc.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index c3d92b6d1f..ce8edc1d95 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -111,7 +111,7 @@ jobs:
     steps:
       - name: Check permissions
         if: ${{ github.event_name != 'workflow_dispatch' }}
-        uses: actions-cool/check-user-permission@v2
+        uses: actions-cool/check-user-permission@a0668c9aec87f3875fc56170b6452a453e9dd819 # v2.2.0
         with:
           require: 'write'
 
@@ -122,7 +122,7 @@ jobs:
     if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
     steps:
       - name: Create comment
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
           comment_tag: ${{ env.COMMENT_TAG }}
           message: |
@@ -136,7 +136,7 @@ jobs:
     runs-on: self-hosted
     timeout-minutes: 50400 # 35 days, the maximum for jobs on self-hosted runners.
     steps:
-      - uses: ahmadnassri/action-workflow-queue@v1
+      - uses: ahmadnassri/action-workflow-queue@f547ac848c16a9bb1b2ed4a850e0cc5098af2cf8 # v1.1.5
         with:
           timeout: 2147483647 # Around 24 days - the maximum supported by JS setTimeout().
           delay: 120000 # Poll every 2 minutes - the API limit seems fairly low on this one.
@@ -261,7 +261,7 @@ jobs:
 
       - name: Restore cache
         id: restore-cache
-        uses: maxnowack/local-cache@v1
+        uses: maxnowack/local-cache@038cc090b52e4f205fbc468bf5b0756df6f68775 # v1
         with:
           path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
           key: ${{ steps.query.outputs.DATA_NAME }}
@@ -292,7 +292,7 @@ jobs:
 
       - name: Restore cache
         id: restore-cache
-        uses: maxnowack/local-cache@v1
+        uses: maxnowack/local-cache@038cc090b52e4f205fbc468bf5b0756df6f68775 # v1
         with:
           path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
           key: ${{ steps.query.outputs.DATA_NAME }}
@@ -356,7 +356,7 @@ jobs:
     steps:
       - name: Update comment on success
         if: ${{ needs.generator.result == 'success' }}
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
           comment_tag: ${{ env.COMMENT_TAG }}
           mode: upsert
@@ -367,7 +367,7 @@ jobs:
 
       - name: Update comment on failure
         if: ${{ needs.generator.result == 'failure' }}
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
           comment_tag: ${{ env.COMMENT_TAG }}
           mode: upsert
@@ -377,7 +377,7 @@ jobs:
 
       - name: Update comment on cancellation
         if: ${{ needs.generator.result == 'cancelled' }}
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
           comment_tag: ${{ env.COMMENT_TAG }}
           mode: delete

From 832ba861bb1054aa76e056f57fceb22bc98c6dfe Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 19 Oct 2023 15:19:51 +0900
Subject: [PATCH 1915/2100] Fix incorrect PR url in diffcalc workflow

---
 .github/workflows/diffcalc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index ce8edc1d95..dbb4067676 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -195,7 +195,7 @@ jobs:
       - name: Add pull-request environment
         if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
         run: |
-          sed -i "s;^OSU_B=.*$;OSU_B=${{ github.event.issue.pull_request.url }};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          sed -i "s;^OSU_B=.*$;OSU_B=${{ github.event.issue.pull_request.html_url }};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
       - name: Add comment environment
         if: ${{ github.event_name == 'issue_comment' }}

From 3ab083b696906a03a6c6cd575ab81b8fe5541c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 09:56:40 +0200
Subject: [PATCH 1916/2100] Split `IPositionSnapProvider` from
 `IDistanceSnapProvider`

In preparation to remove `DistancedHitObjectComposer`, split off
`IPositionSnapProvider` from `IDistanceSnapProvider`.

`DistancedHitObjectComposer` was not touching `IPositionSnapProvider`'s
only interface member at all, it was just forwarding it for subclasses
to override to their own leisure.
---
 .../Components/PathControlPointVisualiser.cs        | 13 ++++++++-----
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs  |  9 ++++++---
 .../Blueprints/Sliders/SliderSelectionBlueprint.cs  | 11 +++++++----
 osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs     |  2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)

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 f624ebc8b5..f891d23bbd 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -47,7 +47,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         public Action<List<PathControlPoint>> SplitControlPointsRequested;
 
         [Resolved(CanBeNull = true)]
-        private IDistanceSnapProvider snapProvider { get; set; }
+        private IPositionSnapProvider positionSnapProvider { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
         public PathControlPointVisualiser(T hitObject, bool allowSelection)
         {
@@ -289,7 +292,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             {
                 // Special handling for selections containing head control point - the position of the hit object changes which means the snapped position and time have to be taken into account
                 Vector2 newHeadPosition = Parent!.ToScreenSpace(e.MousePosition + (dragStartPositions[0] - dragStartPositions[draggedControlPointIndex]));
-                var result = snapProvider?.FindSnappedPositionAndTime(newHeadPosition);
+                var result = positionSnapProvider?.FindSnappedPositionAndTime(newHeadPosition);
 
                 Vector2 movementDelta = Parent!.ToLocalSpace(result?.ScreenSpacePosition ?? newHeadPosition) - hitObject.Position;
 
@@ -309,7 +312,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
             {
-                var result = snapProvider?.FindSnappedPositionAndTime(Parent!.ToScreenSpace(e.MousePosition), SnapType.GlobalGrids);
+                var result = positionSnapProvider?.FindSnappedPositionAndTime(Parent!.ToScreenSpace(e.MousePosition), SnapType.GlobalGrids);
 
                 Vector2 movementDelta = Parent!.ToLocalSpace(result?.ScreenSpacePosition ?? Parent!.ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - hitObject.Position;
 
@@ -322,7 +325,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
 
             // Snap the path to the current beat divisor before checking length validity.
-            hitObject.SnapTo(snapProvider);
+            hitObject.SnapTo(distanceSnapProvider);
 
             if (!hitObject.Path.HasValidLength)
             {
@@ -332,7 +335,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 hitObject.Position = oldPosition;
                 hitObject.StartTime = oldStartTime;
                 // Snap the path length again to undo the invalid length.
-                hitObject.SnapTo(snapProvider);
+                hitObject.SnapTo(distanceSnapProvider);
                 return;
             }
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index ba7b855511..9b6adc04cf 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -39,7 +39,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private int currentSegmentLength;
 
         [Resolved(CanBeNull = true)]
-        private IDistanceSnapProvider snapProvider { get; set; }
+        private IPositionSnapProvider positionSnapProvider { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
         protected override bool IsValidForPlacement => HitObject.Path.HasValidLength;
 
@@ -198,7 +201,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 }
 
                 // Update the cursor position.
-                var result = snapProvider?.FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position, state == SliderPlacementState.Body ? SnapType.GlobalGrids : SnapType.All);
+                var result = positionSnapProvider?.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)
@@ -230,7 +233,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void updateSlider()
         {
-            HitObject.Path.ExpectedDistance.Value = snapProvider?.FindSnappedDistance(HitObject, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
+            HitObject.Path.ExpectedDistance.Value = distanceSnapProvider?.FindSnappedDistance(HitObject, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
 
             bodyPiece.UpdateFrom(HitObject);
             headCirclePiece.UpdateFrom(HitObject.HeadCircle);
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 02023decd6..80c4cee7f2 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -40,7 +40,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         protected PathControlPointVisualiser<Slider> ControlPointVisualiser { get; private set; }
 
         [Resolved(CanBeNull = true)]
-        private IDistanceSnapProvider snapProvider { get; set; }
+        private IPositionSnapProvider positionSnapProvider { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
         [Resolved(CanBeNull = true)]
         private IPlacementHandler placementHandler { get; set; }
@@ -194,7 +197,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             if (placementControlPoint != null)
             {
-                var result = snapProvider?.FindSnappedPositionAndTime(ToScreenSpace(e.MousePosition));
+                var result = positionSnapProvider?.FindSnappedPositionAndTime(ToScreenSpace(e.MousePosition));
                 placementControlPoint.Position = ToLocalSpace(result?.ScreenSpacePosition ?? ToScreenSpace(e.MousePosition)) - HitObject.Position;
             }
         }
@@ -245,7 +248,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             // Move the control points from the insertion index onwards to make room for the insertion
             controlPoints.Insert(insertionIndex, pathControlPoint);
 
-            HitObject.SnapTo(snapProvider);
+            HitObject.SnapTo(distanceSnapProvider);
 
             return pathControlPoint;
         }
@@ -267,7 +270,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
 
             // Snap the slider to the current beat divisor before checking length validity.
-            HitObject.SnapTo(snapProvider);
+            HitObject.SnapTo(distanceSnapProvider);
 
             // If there are 0 or 1 remaining control points, or the slider has an invalid length, it is in a degenerate form and should be deleted
             if (controlPoints.Count <= 1 || !HitObject.Path.HasValidLength)
diff --git a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
index da44b42831..af9d02f5c4 100644
--- a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Edit
     /// A snap provider which given a reference hit object and proposed distance from it, offers a more correct duration or distance value.
     /// </summary>
     [Cached]
-    public interface IDistanceSnapProvider : IPositionSnapProvider
+    public interface IDistanceSnapProvider
     {
         /// <summary>
         /// A multiplier which changes the ratio of distance travelled per time unit.

From dcfd6a0a8a9ad298fe63ea988dbe6f70dae3cfad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 11:20:10 +0200
Subject: [PATCH 1917/2100] Remove `DistancedHitObjectComposer` inheritance
 from osu! composer

---
 .../Editor/TestSceneOsuDistanceSnapGrid.cs    |  28 +-
 .../Edit/OsuDistanceSnapProvider.cs           |  31 ++
 .../Edit/OsuHitObjectComposer.cs              |  44 +--
 ...tSceneHitObjectComposerDistanceSnapping.cs |  13 +-
 .../Editing/TestSceneDistanceSnapGrid.cs      |   4 +-
 .../Edit/ComposerDistanceSnapProvider.cs      | 311 ++++++++++++++++++
 .../Edit/DistancedHitObjectComposer.cs        |   4 +-
 .../Rulesets/Edit/IDistanceSnapProvider.cs    |   2 +-
 8 files changed, 392 insertions(+), 45 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/OsuDistanceSnapProvider.cs
 create mode 100644 osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index 9338d5453d..b70f932913 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -47,8 +47,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [Cached]
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
 
-        [Cached(typeof(IDistanceSnapProvider))]
-        private readonly OsuHitObjectComposer snapProvider = new OsuHitObjectComposer(new OsuRuleset())
+        private readonly TestHitObjectComposer composer = new TestHitObjectComposer
         {
             // Just used for the snap implementation, so let's hide from vision.
             AlwaysPresent = true,
@@ -71,11 +70,18 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             base.Content.Children = new Drawable[]
             {
                 editorClock = new EditorClock(editorBeatmap),
-                new PopoverContainer { Child = snapProvider },
+                new PopoverContainer { Child = composer },
                 Content
             };
         }
 
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.CacheAs(composer.DistanceSnapProvider);
+            return dependencies;
+        }
+
         protected override Container<Drawable> Content { get; } = new PopoverContainer { RelativeSizeAxes = Axes.Both };
 
         [SetUp]
@@ -84,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             editorBeatmap.Difficulty.SliderMultiplier = 1;
             editorBeatmap.ControlPointInfo.Clear();
             editorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = beat_length });
-            snapProvider.DistanceSpacingMultiplier.Value = 1;
+            composer.DistanceSnapProvider.DistanceSpacingMultiplier.Value = 1;
 
             Children = new Drawable[]
             {
@@ -116,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [TestCase(0.5f)]
         public void TestDistanceSpacing(float multiplier)
         {
-            AddStep($"set distance spacing = {multiplier}", () => snapProvider.DistanceSpacingMultiplier.Value = multiplier);
+            AddStep($"set distance spacing = {multiplier}", () => composer.DistanceSnapProvider.DistanceSpacingMultiplier.Value = multiplier);
         }
 
         [Test]
@@ -153,7 +159,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [TestCase(2f, beat_length * 2)]
         public void TestDistanceSpacingAdjust(float multiplier, float expectedDistance)
         {
-            AddStep($"Set distance spacing to {multiplier}", () => snapProvider.DistanceSpacingMultiplier.Value = multiplier);
+            AddStep($"Set distance spacing to {multiplier}", () => composer.DistanceSnapProvider.DistanceSpacingMultiplier.Value = multiplier);
             AddStep("move mouse to point", () => InputManager.MoveMouseTo(grid.ToScreenSpace(grid_position + new Vector2(beat_length, 0) * 2)));
 
             assertSnappedDistance(expectedDistance);
@@ -266,5 +272,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 cursor.Position = LastSnappedPosition = GetSnapPosition.Invoke(inputManager.CurrentState.Mouse.Position);
             }
         }
+
+        private partial class TestHitObjectComposer : OsuHitObjectComposer
+        {
+            public new IDistanceSnapProvider DistanceSnapProvider => base.DistanceSnapProvider;
+
+            public TestHitObjectComposer()
+                : base(new OsuRuleset())
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuDistanceSnapProvider.cs b/osu.Game.Rulesets.Osu/Edit/OsuDistanceSnapProvider.cs
new file mode 100644
index 0000000000..522943df7d
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/OsuDistanceSnapProvider.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.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public partial class OsuDistanceSnapProvider : ComposerDistanceSnapProvider
+    {
+        protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
+        {
+            float expectedDistance = DurationToDistance(before, after.StartTime - before.GetEndTime());
+            float actualDistance = Vector2.Distance(((OsuHitObject)before).EndPosition, ((OsuHitObject)after).Position);
+
+            return actualDistance / expectedDistance;
+        }
+
+        protected override bool AdjustDistanceSpacing(GlobalAction action, float amount)
+        {
+            // To allow better visualisation, ensure that the spacing grid is visible before adjusting.
+            DistanceSnapToggle.Value = TernaryState.True;
+
+            return base.AdjustDistanceSpacing(action, amount);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index fdc11be42c..0f8c960b65 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -17,7 +17,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
@@ -30,7 +29,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public partial class OsuHitObjectComposer : DistancedHitObjectComposer<OsuHitObject>
+    public partial class OsuHitObjectComposer : HitObjectComposer<OsuHitObject>
     {
         public OsuHitObjectComposer(Ruleset ruleset)
             : base(ruleset)
@@ -49,18 +48,27 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private readonly Bindable<TernaryState> rectangularGridSnapToggle = new Bindable<TernaryState>();
 
-        protected override IEnumerable<TernaryButton> CreateTernaryButtons() => base.CreateTernaryButtons().Concat(new[]
-        {
-            new TernaryButton(rectangularGridSnapToggle, "Grid Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Th })
-        });
+        protected override IEnumerable<TernaryButton> CreateTernaryButtons()
+            => base.CreateTernaryButtons()
+                   .Concat(DistanceSnapProvider.CreateTernaryButtons())
+                   .Concat(new[]
+                   {
+                       new TernaryButton(rectangularGridSnapToggle, "Grid Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Th })
+                   });
 
         private BindableList<HitObject> selectedHitObjects;
 
         private Bindable<HitObject> placementObject;
 
+        [Cached(typeof(IDistanceSnapProvider))]
+        protected readonly OsuDistanceSnapProvider DistanceSnapProvider = new OsuDistanceSnapProvider();
+
         [BackgroundDependencyLoader]
         private void load()
         {
+            AddInternal(DistanceSnapProvider);
+            DistanceSnapProvider.AttachToToolbox(RightToolbox);
+
             // Give a bit of breathing room around the playfield content.
             PlayfieldContentContainer.Padding = new MarginPadding(10);
 
@@ -81,7 +89,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             placementObject = EditorBeatmap.PlacementObject.GetBoundCopy();
             placementObject.ValueChanged += _ => updateDistanceSnapGrid();
-            DistanceSnapToggle.ValueChanged += _ => updateDistanceSnapGrid();
+            DistanceSnapProvider.DistanceSnapToggle.ValueChanged += _ => updateDistanceSnapGrid();
 
             // we may be entering the screen with a selection already active
             updateDistanceSnapGrid();
@@ -106,14 +114,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private RectangularPositionSnapGrid rectangularPositionSnapGrid;
 
-        protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
-        {
-            float expectedDistance = DurationToDistance(before, after.StartTime - before.GetEndTime());
-            float actualDistance = Vector2.Distance(((OsuHitObject)before).EndPosition, ((OsuHitObject)after).Position);
-
-            return actualDistance / expectedDistance;
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -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.RelativeGrids) && DistanceSnapToggle.Value == TernaryState.True && distanceSnapGrid != null)
+                if (snapType.HasFlagFast(SnapType.RelativeGrids) && DistanceSnapProvider.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))
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             if (snapType.HasFlagFast(SnapType.RelativeGrids))
             {
-                if (DistanceSnapToggle.Value == TernaryState.True && distanceSnapGrid != null)
+                if (DistanceSnapProvider.DistanceSnapToggle.Value == TernaryState.True && distanceSnapGrid != null)
                 {
                     (Vector2 pos, double time) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(screenSpacePosition));
 
@@ -220,7 +220,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             distanceSnapGridCache.Invalidate();
             distanceSnapGrid = null;
 
-            if (DistanceSnapToggle.Value != TernaryState.True)
+            if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True)
                 return;
 
             switch (BlueprintContainer.CurrentTool)
@@ -262,14 +262,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             base.OnKeyUp(e);
         }
 
-        protected override bool AdjustDistanceSpacing(GlobalAction action, float amount)
-        {
-            // To allow better visualisation, ensure that the spacing grid is visible before adjusting.
-            DistanceSnapToggle.Value = TernaryState.True;
-
-            return base.AdjustDistanceSpacing(action, amount);
-        }
-
         private bool gridSnapMomentary;
 
         private void handleToggleViaKey(KeyboardEvent key)
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 6b78eea009..463287fb35 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -230,25 +229,25 @@ namespace osu.Game.Tests.Editing
         }
 
         private void assertSnapDistance(float expectedDistance, HitObject? referenceObject, bool includeSliderVelocity)
-            => AddAssert($"distance is {expectedDistance}", () => composer.GetBeatSnapDistanceAt(referenceObject ?? new HitObject(), includeSliderVelocity), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
+            => AddAssert($"distance is {expectedDistance}", () => composer.DistanceSnapProvider.GetBeatSnapDistanceAt(referenceObject ?? new HitObject(), includeSliderVelocity), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
 
         private void assertDurationToDistance(double duration, float expectedDistance, HitObject? referenceObject = null)
-            => AddAssert($"duration = {duration} -> distance = {expectedDistance}", () => composer.DurationToDistance(referenceObject ?? new HitObject(), duration), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
+            => AddAssert($"duration = {duration} -> distance = {expectedDistance}", () => composer.DistanceSnapProvider.DurationToDistance(referenceObject ?? new HitObject(), duration), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
 
         private void assertDistanceToDuration(float distance, double expectedDuration, HitObject? referenceObject = null)
-            => AddAssert($"distance = {distance} -> duration = {expectedDuration}", () => composer.DistanceToDuration(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDuration).Within(Precision.FLOAT_EPSILON));
+            => AddAssert($"distance = {distance} -> duration = {expectedDuration}", () => composer.DistanceSnapProvider.DistanceToDuration(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDuration).Within(Precision.FLOAT_EPSILON));
 
         private void assertSnappedDuration(float distance, double expectedDuration, HitObject? referenceObject = null)
-            => AddAssert($"distance = {distance} -> duration = {expectedDuration} (snapped)", () => composer.FindSnappedDuration(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDuration).Within(Precision.FLOAT_EPSILON));
+            => AddAssert($"distance = {distance} -> duration = {expectedDuration} (snapped)", () => composer.DistanceSnapProvider.FindSnappedDuration(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDuration).Within(Precision.FLOAT_EPSILON));
 
         private void assertSnappedDistance(float distance, float expectedDistance, HitObject? referenceObject = null)
-            => AddAssert($"distance = {distance} -> distance = {expectedDistance} (snapped)", () => composer.FindSnappedDistance(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
+            => AddAssert($"distance = {distance} -> distance = {expectedDistance} (snapped)", () => composer.DistanceSnapProvider.FindSnappedDistance(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
 
         private partial class TestHitObjectComposer : OsuHitObjectComposer
         {
             public new EditorBeatmap EditorBeatmap => base.EditorBeatmap;
 
-            public new Bindable<double> DistanceSpacingMultiplier => base.DistanceSpacingMultiplier;
+            public new IDistanceSnapProvider DistanceSnapProvider => base.DistanceSnapProvider;
 
             public TestHitObjectComposer()
                 : base(new OsuRuleset())
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index 70e4420a45..f2a015402a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -187,11 +187,9 @@ namespace osu.Game.Tests.Visual.Editing
 
         private class SnapProvider : IDistanceSnapProvider
         {
-            public SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.AllGrids) => new SnapResult(screenSpacePosition, 0);
-
             public Bindable<double> DistanceSpacingMultiplier { get; } = new BindableDouble(1);
 
-            IBindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
+            Bindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
 
             public float GetBeatSnapDistanceAt(HitObject referenceObject, bool useReferenceSliderVelocity = true) => beat_snap_distance;
 
diff --git a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
new file mode 100644
index 0000000000..0b1809e7d9
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
@@ -0,0 +1,311 @@
+// Copyright (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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
+using osu.Framework.Utils;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
+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.Rulesets.UI;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public abstract partial class ComposerDistanceSnapProvider : Component, IDistanceSnapProvider, IScrollBindingHandler<GlobalAction>
+    {
+        private const float adjust_step = 0.1f;
+
+        public BindableDouble DistanceSpacingMultiplier { get; } = new BindableDouble(1.0)
+        {
+            MinValue = 0.1,
+            MaxValue = 6.0,
+            Precision = 0.01,
+        };
+
+        Bindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
+
+        private ExpandableSlider<double, SizeSlider<double>> distanceSpacingSlider = null!;
+        private ExpandableButton currentDistanceSpacingButton = null!;
+
+        [Resolved]
+        private Playfield playfield { get; set; } = null!;
+
+        [Resolved]
+        private EditorClock editorClock { get; set; } = null!;
+
+        [Resolved]
+        private EditorBeatmap editorBeatmap { get; set; } = null!;
+
+        [Resolved]
+        private IBeatSnapProvider beatSnapProvider { get; set; } = null!;
+
+        [Resolved]
+        private OnScreenDisplay? onScreenDisplay { get; set; }
+
+        public readonly Bindable<TernaryState> DistanceSnapToggle = new Bindable<TernaryState>();
+
+        private bool distanceSnapMomentary;
+
+        private EditorToolboxGroup? toolboxGroup;
+
+        public void AttachToToolbox(ExpandingToolboxContainer toolboxContainer)
+        {
+            if (toolboxGroup != null)
+                throw new InvalidOperationException($"{nameof(AttachToToolbox)} may be called only once for a single {nameof(ComposerDistanceSnapProvider)} instance.");
+
+            toolboxContainer.Add(toolboxGroup = new EditorToolboxGroup("snapping")
+            {
+                Alpha = DistanceSpacingMultiplier.Disabled ? 0 : 1,
+                Children = new Drawable[]
+                {
+                    distanceSpacingSlider = new ExpandableSlider<double, SizeSlider<double>>
+                    {
+                        KeyboardStep = adjust_step,
+                        // Manual binding in LoadComplete to handle one-way event flow.
+                        Current = DistanceSpacingMultiplier.GetUnboundCopy(),
+                    },
+                    currentDistanceSpacingButton = new ExpandableButton
+                    {
+                        Action = () =>
+                        {
+                            (HitObject before, HitObject after)? objects = getObjectsOnEitherSideOfCurrentTime();
+
+                            Debug.Assert(objects != null);
+
+                            DistanceSpacingMultiplier.Value = ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after);
+                            DistanceSnapToggle.Value = TernaryState.True;
+                        },
+                        RelativeSizeAxes = Axes.X,
+                    }
+                }
+            });
+
+            if (DistanceSpacingMultiplier.Disabled)
+            {
+                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);
+        }
+
+        private (HitObject before, HitObject after)? getObjectsOnEitherSideOfCurrentTime()
+        {
+            HitObject? lastBefore = playfield.HitObjectContainer.AliveObjects.LastOrDefault(h => h.HitObject.StartTime < editorClock.CurrentTime)?.HitObject;
+
+            if (lastBefore == null)
+                return null;
+
+            HitObject? firstAfter = playfield.HitObjectContainer.AliveObjects.FirstOrDefault(h => h.HitObject.StartTime >= editorClock.CurrentTime)?.HitObject;
+
+            if (firstAfter == null)
+                return null;
+
+            if (lastBefore == firstAfter)
+                return null;
+
+            return (lastBefore, firstAfter);
+        }
+
+        protected abstract double ReadCurrentDistanceSnap(HitObject before, HitObject after);
+
+        protected override void Update()
+        {
+            base.Update();
+
+            (HitObject before, HitObject after)? objects = getObjectsOnEitherSideOfCurrentTime();
+
+            double currentSnap = objects == null
+                ? 0
+                : ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after);
+
+            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)";
+            }
+            else
+            {
+                currentDistanceSpacingButton.Enabled.Value = false;
+                currentDistanceSpacingButton.ContractedLabelText = string.Empty;
+                currentDistanceSpacingButton.ExpandedLabelText = "Use current (unavailable)";
+            }
+        }
+
+        public IEnumerable<TernaryButton> CreateTernaryButtons() => new[]
+        {
+            new TernaryButton(DistanceSnapToggle, "Distance Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Ruler })
+        };
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (e.Repeat)
+                return false;
+
+            handleToggleViaKey(e);
+            return base.OnKeyDown(e);
+        }
+
+        protected override void OnKeyUp(KeyUpEvent e)
+        {
+            handleToggleViaKey(e);
+            base.OnKeyUp(e);
+        }
+
+        private void handleToggleViaKey(KeyboardEvent key)
+        {
+            bool altPressed = key.AltPressed;
+
+            if (altPressed != distanceSnapMomentary)
+            {
+                distanceSnapMomentary = altPressed;
+                DistanceSnapToggle.Value = DistanceSnapToggle.Value == TernaryState.False ? TernaryState.True : TernaryState.False;
+            }
+        }
+
+        public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            switch (e.Action)
+            {
+                case GlobalAction.EditorIncreaseDistanceSpacing:
+                case GlobalAction.EditorDecreaseDistanceSpacing:
+                    return AdjustDistanceSpacing(e.Action, adjust_step);
+            }
+
+            return false;
+        }
+
+        public virtual void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
+
+        public bool OnScroll(KeyBindingScrollEvent<GlobalAction> e)
+        {
+            switch (e.Action)
+            {
+                case GlobalAction.EditorIncreaseDistanceSpacing:
+                case GlobalAction.EditorDecreaseDistanceSpacing:
+                    return AdjustDistanceSpacing(e.Action, e.ScrollAmount * adjust_step);
+            }
+
+            return false;
+        }
+
+        protected virtual bool AdjustDistanceSpacing(GlobalAction action, float amount)
+        {
+            if (DistanceSpacingMultiplier.Disabled)
+                return false;
+
+            if (action == GlobalAction.EditorIncreaseDistanceSpacing)
+                DistanceSpacingMultiplier.Value += amount;
+            else if (action == GlobalAction.EditorDecreaseDistanceSpacing)
+                DistanceSpacingMultiplier.Value -= amount;
+
+            DistanceSnapToggle.Value = TernaryState.True;
+            return true;
+        }
+
+        #region IDistanceSnapProvider
+
+        public virtual float GetBeatSnapDistanceAt(HitObject referenceObject, bool useReferenceSliderVelocity = true)
+        {
+            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocityMultiplier : 1) * editorBeatmap.Difficulty.SliderMultiplier * 1
+                           / beatSnapProvider.BeatDivisor);
+        }
+
+        public virtual float DurationToDistance(HitObject referenceObject, double duration)
+        {
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceObject.StartTime);
+            return (float)(duration / beatLength * GetBeatSnapDistanceAt(referenceObject));
+        }
+
+        public virtual double DistanceToDuration(HitObject referenceObject, float distance)
+        {
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceObject.StartTime);
+            return distance / GetBeatSnapDistanceAt(referenceObject) * beatLength;
+        }
+
+        public virtual double FindSnappedDuration(HitObject referenceObject, float distance)
+            => beatSnapProvider.SnapTime(referenceObject.StartTime + DistanceToDuration(referenceObject, distance), referenceObject.StartTime) - referenceObject.StartTime;
+
+        public virtual float FindSnappedDistance(HitObject referenceObject, float distance)
+        {
+            double startTime = referenceObject.StartTime;
+
+            double actualDuration = startTime + DistanceToDuration(referenceObject, distance);
+
+            double snappedEndTime = beatSnapProvider.SnapTime(actualDuration, startTime);
+
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(startTime);
+
+            // we don't want to exceed the actual duration and snap to a point in the future.
+            // as we are snapping to beat length via SnapTime (which will round-to-nearest), check for snapping in the forward direction and reverse it.
+            if (snappedEndTime > actualDuration + 1)
+                snappedEndTime -= beatLength;
+
+            return DurationToDistance(referenceObject, snappedEndTime - startTime);
+        }
+
+        #endregion
+
+        private partial class DistanceSpacingToast : Toast
+        {
+            private readonly ValueChangedEvent<double> change;
+
+            public DistanceSpacingToast(LocalisableString value, ValueChangedEvent<double> change)
+                : base(getAction(change).GetLocalisableDescription(), value, string.Empty)
+            {
+                this.change = change;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuConfigManager config)
+            {
+                ShortcutText.Text = config.LookupKeyBindings(getAction(change)).ToUpper();
+            }
+
+            private static GlobalAction getAction(ValueChangedEvent<double> change) => change.NewValue - change.OldValue > 0
+                ? GlobalAction.EditorIncreaseDistanceSpacing
+                : GlobalAction.EditorDecreaseDistanceSpacing;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index 70b79c30f0..938e2d9011 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Edit
             Precision = 0.01,
         };
 
-        IBindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
+        Bindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
 
         private ExpandableSlider<double, SizeSlider<double>> distanceSpacingSlider;
         private ExpandableButton currentDistanceSpacingButton;
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Edit
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
-        protected readonly Bindable<TernaryState> DistanceSnapToggle = new Bindable<TernaryState>();
+        public readonly Bindable<TernaryState> DistanceSnapToggle = new Bindable<TernaryState>();
 
         private bool distanceSnapMomentary;
 
diff --git a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
index af9d02f5c4..380038eadf 100644
--- a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Edit
         /// Importantly, this is provided for manual usage, and not multiplied into any of the methods exposed by this interface.
         /// </summary>
         /// <seealso cref="BeatmapInfo.DistanceSpacing"/>
-        IBindable<double> DistanceSpacingMultiplier { get; }
+        Bindable<double> DistanceSpacingMultiplier { get; }
 
         /// <summary>
         /// Retrieves the distance between two points within a timing point that are one beat length apart.

From 31849192c39f555de03d34f1dc95cd24dce2834b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 11:42:40 +0200
Subject: [PATCH 1918/2100] Remove `DistancedHitObjectComposer` inheritance
 from catch composer

---
 .../Edit/CatchDistanceSnapProvider.cs         | 26 +++++++++++
 .../Edit/CatchHitObjectComposer.cs            | 44 ++++++++++---------
 2 files changed, 49 insertions(+), 21 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Edit/CatchDistanceSnapProvider.cs

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchDistanceSnapProvider.cs b/osu.Game.Rulesets.Catch/Edit/CatchDistanceSnapProvider.cs
new file mode 100644
index 0000000000..c3103bd204
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Edit/CatchDistanceSnapProvider.cs
@@ -0,0 +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 osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Catch.Edit
+{
+    public partial class CatchDistanceSnapProvider : ComposerDistanceSnapProvider
+    {
+        protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
+        {
+            // osu!catch's distance snap implementation is limited, in that a custom spacing cannot be specified.
+            // Therefore this functionality is not currently used.
+            //
+            // The implementation below is probably correct but should be checked if/when exposed via controls.
+
+            float expectedDistance = DurationToDistance(before, after.StartTime - before.GetEndTime());
+            float actualDistance = Math.Abs(((CatchHitObject)before).EffectiveX - ((CatchHitObject)after).EffectiveX);
+
+            return actualDistance / expectedDistance;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index dc3a4416a5..50bc9ec157 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.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;
@@ -9,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
@@ -20,13 +20,14 @@ using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit
 {
     // we're also a ScrollingHitObjectComposer candidate, but can't be everything can we?
-    public partial class CatchHitObjectComposer : DistancedHitObjectComposer<CatchHitObject>
+    public partial class CatchHitObjectComposer : HitObjectComposer<CatchHitObject>, IKeyBindingHandler<GlobalAction>
     {
         private const float distance_snap_radius = 50;
 
@@ -42,6 +43,9 @@ namespace osu.Game.Rulesets.Catch.Edit
             MaxValue = 10,
         };
 
+        [Cached(typeof(IDistanceSnapProvider))]
+        protected readonly CatchDistanceSnapProvider DistanceSnapProvider = new CatchDistanceSnapProvider();
+
         public CatchHitObjectComposer(CatchRuleset ruleset)
             : base(ruleset)
         {
@@ -50,8 +54,11 @@ namespace osu.Game.Rulesets.Catch.Edit
         [BackgroundDependencyLoader]
         private void load()
         {
+            AddInternal(DistanceSnapProvider);
+            DistanceSnapProvider.AttachToToolbox(RightToolbox);
+
             // todo: enable distance spacing once catch supports applying it to its existing distance snap grid implementation.
-            DistanceSpacingMultiplier.Disabled = true;
+            DistanceSnapProvider.DistanceSpacingMultiplier.Disabled = true;
 
             LayerBelowRuleset.Add(new PlayfieldBorder
             {
@@ -72,6 +79,10 @@ namespace osu.Game.Rulesets.Catch.Edit
             AddInternal(beatSnapGrid = new CatchBeatSnapGrid());
         }
 
+        protected override IEnumerable<TernaryButton> CreateTernaryButtons()
+            => base.CreateTernaryButtons()
+                   .Concat(DistanceSnapProvider.CreateTernaryButtons());
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -102,19 +113,6 @@ namespace osu.Game.Rulesets.Catch.Edit
             }
         }
 
-        protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
-        {
-            // osu!catch's distance snap implementation is limited, in that a custom spacing cannot be specified.
-            // Therefore this functionality is not currently used.
-            //
-            // The implementation below is probably correct but should be checked if/when exposed via controls.
-
-            float expectedDistance = DurationToDistance(before, after.StartTime - before.GetEndTime());
-            float actualDistance = Math.Abs(((CatchHitObject)before).EffectiveX - ((CatchHitObject)after).EffectiveX);
-
-            return actualDistance / expectedDistance;
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -122,7 +120,7 @@ namespace osu.Game.Rulesets.Catch.Edit
             updateDistanceSnapGrid();
         }
 
-        public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
             {
@@ -131,14 +129,18 @@ namespace osu.Game.Rulesets.Catch.Edit
                 // May be worth considering standardising "zoom" behaviour with what the timeline uses (ie. alt-wheel) but that may cause new conflicts.
                 case GlobalAction.IncreaseScrollSpeed:
                     this.TransformBindableTo(timeRangeMultiplier, timeRangeMultiplier.Value - 1, 200, Easing.OutQuint);
-                    break;
+                    return true;
 
                 case GlobalAction.DecreaseScrollSpeed:
                     this.TransformBindableTo(timeRangeMultiplier, timeRangeMultiplier.Value + 1, 200, Easing.OutQuint);
-                    break;
+                    return true;
             }
 
-            return base.OnPressed(e);
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
         }
 
         protected override DrawableRuleset<CatchHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
@@ -224,7 +226,7 @@ namespace osu.Game.Rulesets.Catch.Edit
 
         private void updateDistanceSnapGrid()
         {
-            if (DistanceSnapToggle.Value != TernaryState.True)
+            if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True)
             {
                 distanceSnapGrid.Hide();
                 return;

From 144ef5a87c2b12d4fe525d15945b6ee0d844ff75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 11:43:11 +0200
Subject: [PATCH 1919/2100] Remove `DistancedHitObjectComposer`

---
 .../Edit/DistancedHitObjectComposer.cs        | 305 ------------------
 1 file changed, 305 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs

diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
deleted file mode 100644
index 938e2d9011..0000000000
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ /dev/null
@@ -1,305 +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 System.Diagnostics;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions;
-using osu.Framework.Extensions.LocalisationExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
-using osu.Framework.Utils;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Input.Bindings;
-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
-{
-    /// <summary>
-    /// Represents a <see cref="HitObjectComposer{TObject}"/> for rulesets with the concept of distances between objects.
-    /// </summary>
-    /// <typeparam name="TObject">The base type of supported objects.</typeparam>
-    public abstract partial class DistancedHitObjectComposer<TObject> : HitObjectComposer<TObject>, IDistanceSnapProvider, IScrollBindingHandler<GlobalAction>
-        where TObject : HitObject
-    {
-        private const float adjust_step = 0.1f;
-
-        public BindableDouble DistanceSpacingMultiplier { get; } = new BindableDouble(1.0)
-        {
-            MinValue = 0.1,
-            MaxValue = 6.0,
-            Precision = 0.01,
-        };
-
-        Bindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
-
-        private ExpandableSlider<double, SizeSlider<double>> distanceSpacingSlider;
-        private ExpandableButton currentDistanceSpacingButton;
-
-        [Resolved(canBeNull: true)]
-        private OnScreenDisplay onScreenDisplay { get; set; }
-
-        public readonly Bindable<TernaryState> DistanceSnapToggle = new Bindable<TernaryState>();
-
-        private bool distanceSnapMomentary;
-
-        protected DistancedHitObjectComposer(Ruleset ruleset)
-            : base(ruleset)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            RightToolbox.Add(new EditorToolboxGroup("snapping")
-            {
-                Alpha = DistanceSpacingMultiplier.Disabled ? 0 : 1,
-                Children = new Drawable[]
-                {
-                    distanceSpacingSlider = new ExpandableSlider<double, SizeSlider<double>>
-                    {
-                        KeyboardStep = adjust_step,
-                        // Manual binding in LoadComplete to handle one-way event flow.
-                        Current = DistanceSpacingMultiplier.GetUnboundCopy(),
-                    },
-                    currentDistanceSpacingButton = new ExpandableButton
-                    {
-                        Action = () =>
-                        {
-                            (HitObject before, HitObject after)? objects = getObjectsOnEitherSideOfCurrentTime();
-
-                            Debug.Assert(objects != null);
-
-                            DistanceSpacingMultiplier.Value = ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after);
-                            DistanceSnapToggle.Value = TernaryState.True;
-                        },
-                        RelativeSizeAxes = Axes.X,
-                    }
-                }
-            });
-        }
-
-        private (HitObject before, HitObject after)? getObjectsOnEitherSideOfCurrentTime()
-        {
-            HitObject lastBefore = Playfield.HitObjectContainer.AliveObjects.LastOrDefault(h => h.HitObject.StartTime < EditorClock.CurrentTime)?.HitObject;
-
-            if (lastBefore == null)
-                return null;
-
-            HitObject firstAfter = Playfield.HitObjectContainer.AliveObjects.FirstOrDefault(h => h.HitObject.StartTime >= EditorClock.CurrentTime)?.HitObject;
-
-            if (firstAfter == null)
-                return null;
-
-            if (lastBefore == firstAfter)
-                return null;
-
-            return (lastBefore, firstAfter);
-        }
-
-        protected abstract double ReadCurrentDistanceSnap(HitObject before, HitObject after);
-
-        protected override void Update()
-        {
-            base.Update();
-
-            (HitObject before, HitObject after)? objects = getObjectsOnEitherSideOfCurrentTime();
-
-            double currentSnap = objects == null
-                ? 0
-                : ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after);
-
-            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)";
-            }
-            else
-            {
-                currentDistanceSpacingButton.Enabled.Value = false;
-                currentDistanceSpacingButton.ContractedLabelText = string.Empty;
-                currentDistanceSpacingButton.ExpandedLabelText = "Use current (unavailable)";
-            }
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            if (DistanceSpacingMultiplier.Disabled)
-            {
-                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[]
-        {
-            new TernaryButton(DistanceSnapToggle, "Distance Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Ruler })
-        });
-
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            if (e.Repeat)
-                return false;
-
-            handleToggleViaKey(e);
-            return base.OnKeyDown(e);
-        }
-
-        protected override void OnKeyUp(KeyUpEvent e)
-        {
-            handleToggleViaKey(e);
-            base.OnKeyUp(e);
-        }
-
-        private void handleToggleViaKey(KeyboardEvent key)
-        {
-            bool altPressed = key.AltPressed;
-
-            if (altPressed != distanceSnapMomentary)
-            {
-                distanceSnapMomentary = altPressed;
-                DistanceSnapToggle.Value = DistanceSnapToggle.Value == TernaryState.False ? TernaryState.True : TernaryState.False;
-            }
-        }
-
-        public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
-        {
-            switch (e.Action)
-            {
-                case GlobalAction.EditorIncreaseDistanceSpacing:
-                case GlobalAction.EditorDecreaseDistanceSpacing:
-                    return AdjustDistanceSpacing(e.Action, adjust_step);
-            }
-
-            return false;
-        }
-
-        public virtual void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
-        {
-        }
-
-        public bool OnScroll(KeyBindingScrollEvent<GlobalAction> e)
-        {
-            switch (e.Action)
-            {
-                case GlobalAction.EditorIncreaseDistanceSpacing:
-                case GlobalAction.EditorDecreaseDistanceSpacing:
-                    return AdjustDistanceSpacing(e.Action, e.ScrollAmount * adjust_step);
-            }
-
-            return false;
-        }
-
-        protected virtual bool AdjustDistanceSpacing(GlobalAction action, float amount)
-        {
-            if (DistanceSpacingMultiplier.Disabled)
-                return false;
-
-            if (action == GlobalAction.EditorIncreaseDistanceSpacing)
-                DistanceSpacingMultiplier.Value += amount;
-            else if (action == GlobalAction.EditorDecreaseDistanceSpacing)
-                DistanceSpacingMultiplier.Value -= amount;
-
-            DistanceSnapToggle.Value = TernaryState.True;
-            return true;
-        }
-
-        public virtual float GetBeatSnapDistanceAt(HitObject referenceObject, bool useReferenceSliderVelocity = true)
-        {
-            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocityMultiplier : 1) * EditorBeatmap.Difficulty.SliderMultiplier * 1
-                           / BeatSnapProvider.BeatDivisor);
-        }
-
-        public virtual float DurationToDistance(HitObject referenceObject, double duration)
-        {
-            double beatLength = BeatSnapProvider.GetBeatLengthAtTime(referenceObject.StartTime);
-            return (float)(duration / beatLength * GetBeatSnapDistanceAt(referenceObject));
-        }
-
-        public virtual double DistanceToDuration(HitObject referenceObject, float distance)
-        {
-            double beatLength = BeatSnapProvider.GetBeatLengthAtTime(referenceObject.StartTime);
-            return distance / GetBeatSnapDistanceAt(referenceObject) * beatLength;
-        }
-
-        public virtual double FindSnappedDuration(HitObject referenceObject, float distance)
-            => BeatSnapProvider.SnapTime(referenceObject.StartTime + DistanceToDuration(referenceObject, distance), referenceObject.StartTime) - referenceObject.StartTime;
-
-        public virtual float FindSnappedDistance(HitObject referenceObject, float distance)
-        {
-            double startTime = referenceObject.StartTime;
-
-            double actualDuration = startTime + DistanceToDuration(referenceObject, distance);
-
-            double snappedEndTime = BeatSnapProvider.SnapTime(actualDuration, startTime);
-
-            double beatLength = BeatSnapProvider.GetBeatLengthAtTime(startTime);
-
-            // we don't want to exceed the actual duration and snap to a point in the future.
-            // as we are snapping to beat length via SnapTime (which will round-to-nearest), check for snapping in the forward direction and reverse it.
-            if (snappedEndTime > actualDuration + 1)
-                snappedEndTime -= beatLength;
-
-            return DurationToDistance(referenceObject, snappedEndTime - startTime);
-        }
-
-        private partial class DistanceSpacingToast : Toast
-        {
-            private readonly ValueChangedEvent<double> change;
-
-            public DistanceSpacingToast(LocalisableString value, ValueChangedEvent<double> change)
-                : base(getAction(change).GetLocalisableDescription(), value, string.Empty)
-            {
-                this.change = change;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuConfigManager config)
-            {
-                ShortcutText.Text = config.LookupKeyBindings(getAction(change)).ToUpper();
-            }
-
-            private static GlobalAction getAction(ValueChangedEvent<double> change) => change.NewValue - change.OldValue > 0
-                ? GlobalAction.EditorIncreaseDistanceSpacing
-                : GlobalAction.EditorDecreaseDistanceSpacing;
-        }
-    }
-}

From 0c4e74c82dbc3423cb461cb73c2e1bd15867257c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 11:43:31 +0200
Subject: [PATCH 1920/2100] Inherit `ScrollingHitObjectComposer` in catch

---
 osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 50bc9ec157..04dd4827b6 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -26,8 +26,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit
 {
-    // we're also a ScrollingHitObjectComposer candidate, but can't be everything can we?
-    public partial class CatchHitObjectComposer : HitObjectComposer<CatchHitObject>, IKeyBindingHandler<GlobalAction>
+    public partial class CatchHitObjectComposer : ScrollingHitObjectComposer<CatchHitObject>, IKeyBindingHandler<GlobalAction>
     {
         private const float distance_snap_radius = 50;
 

From 013b5fa916d819ec7a8a93b1692d4aa027934a67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Oct 2023 23:54:34 +0900
Subject: [PATCH 1921/2100] Move beat snap grid implementation details to
 `ScrollingHitObjectComposer`

---
 .../Edit/CatchHitObjectComposer.cs            | 34 --------------
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 42 -----------------
 .../Edit/ScrollingHitObjectComposer.cs        | 46 +++++++++++++++++++
 3 files changed, 46 insertions(+), 76 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 2ccf99c6e6..9b258841b2 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -40,8 +40,6 @@ namespace osu.Game.Rulesets.Catch.Edit
         [Cached(typeof(IDistanceSnapProvider))]
         protected readonly CatchDistanceSnapProvider DistanceSnapProvider = new CatchDistanceSnapProvider();
 
-        private BeatSnapGrid beatSnapGrid = null!;
-
         public CatchHitObjectComposer(CatchRuleset ruleset)
             : base(ruleset)
         {
@@ -71,44 +69,12 @@ 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 IEnumerable<TernaryButton> CreateTernaryButtons()
             => base.CreateTernaryButtons()
                    .Concat(DistanceSnapProvider.CreateTernaryButtons());
 
-        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 void Update()
-        {
-            base.Update();
-
-            updateDistanceSnapGrid();
-        }
-
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 129ab6751e..b68af49222 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -90,9 +90,6 @@ namespace osu.Game.Rulesets.Edit
 
         protected DrawableRuleset<TObject> DrawableRuleset { get; private set; }
 
-        [CanBeNull]
-        private BeatSnapGrid beatSnapGrid;
-
         protected HitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
@@ -209,8 +206,6 @@ namespace osu.Game.Rulesets.Edit
                         }
                     }
                 },
-                // Must be constructed after drawable ruleset above.
-                (beatSnapGrid = CreateBeatSnapGrid()) ?? Empty(),
             };
 
             toolboxCollection.Items = CompositionTools
@@ -275,37 +270,6 @@ namespace osu.Game.Rulesets.Edit
             }
         }
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            updateBeatSnapGrid();
-        }
-
-        private void updateBeatSnapGrid()
-        {
-            if (beatSnapGrid == null)
-                return;
-
-            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;
-            }
-        }
-
         public override Playfield Playfield => drawableRulesetWrapper.Playfield;
 
         public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
@@ -336,12 +300,6 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         protected virtual ComposeBlueprintContainer CreateBlueprintContainer() => new ComposeBlueprintContainer(this);
 
-        /// <summary>
-        /// Construct an optional beat snap grid.
-        /// </summary>
-        [CanBeNull]
-        protected virtual BeatSnapGrid CreateBeatSnapGrid() => null;
-
         /// <summary>
         /// Construct a drawable ruleset for the provided ruleset.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
index cb92ebbd15..eb73cef01a 100644
--- a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -8,9 +9,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
+using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
 namespace osu.Game.Rulesets.Edit
@@ -21,6 +24,13 @@ namespace osu.Game.Rulesets.Edit
         private readonly Bindable<TernaryState> showSpeedChanges = new Bindable<TernaryState>();
         private Bindable<bool> configShowSpeedChanges = null!;
 
+        private BeatSnapGrid? beatSnapGrid;
+
+        /// <summary>
+        /// Construct an optional beat snap grid.
+        /// </summary>
+        protected virtual BeatSnapGrid? CreateBeatSnapGrid() => null;
+
         protected ScrollingHitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
@@ -57,6 +67,42 @@ namespace osu.Game.Rulesets.Edit
                     configShowSpeedChanges.Value = enabled;
                 }, true);
             }
+
+            beatSnapGrid = CreateBeatSnapGrid();
+
+            if (beatSnapGrid != null)
+                AddInternal(beatSnapGrid);
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            updateBeatSnapGrid();
+        }
+
+        private void updateBeatSnapGrid()
+        {
+            if (beatSnapGrid == null)
+                return;
+
+            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;
+            }
         }
     }
 }

From 74b86349d58e5169e52bbdc70cef3dec81579a74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Oct 2023 23:57:36 +0900
Subject: [PATCH 1922/2100] Tidy up `CatchHitObjectComposer`

---
 .../Edit/CatchHitObjectComposer.cs            | 56 ++++++-------------
 1 file changed, 17 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 9b258841b2..6f0ee260ab 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
@@ -75,6 +74,23 @@ namespace osu.Game.Rulesets.Catch.Edit
             => base.CreateTernaryButtons()
                    .Concat(DistanceSnapProvider.CreateTernaryButtons());
 
+        protected override DrawableRuleset<CatchHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
+            new DrawableCatchEditorRuleset(ruleset, beatmap, mods)
+            {
+                TimeRangeMultiplier = { BindTarget = timeRangeMultiplier, }
+            };
+
+        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new CatchBlueprintContainer(this);
+
+        protected override BeatSnapGrid CreateBeatSnapGrid() => new CatchBeatSnapGrid();
+
+        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
+        {
+            new FruitCompositionTool(),
+            new JuiceStreamCompositionTool(),
+            new BananaShowerCompositionTool()
+        };
+
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
@@ -98,19 +114,6 @@ namespace osu.Game.Rulesets.Catch.Edit
         {
         }
 
-        protected override DrawableRuleset<CatchHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
-            new DrawableCatchEditorRuleset(ruleset, beatmap, mods)
-            {
-                TimeRangeMultiplier = { BindTarget = timeRangeMultiplier, }
-            };
-
-        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
-        {
-            new FruitCompositionTool(),
-            new JuiceStreamCompositionTool(),
-            new BananaShowerCompositionTool()
-        };
-
         public override SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.All)
         {
             var result = base.FindSnappedPositionAndTime(screenSpacePosition, snapType);
@@ -129,10 +132,6 @@ namespace osu.Game.Rulesets.Catch.Edit
             return result;
         }
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new CatchBlueprintContainer(this);
-
-        protected override BeatSnapGrid CreateBeatSnapGrid() => new CatchBeatSnapGrid();
-
         private PalpableCatchHitObject? getLastSnappableHitObject(double time)
         {
             var hitObject = EditorBeatmap.HitObjects.OfType<CatchHitObject>().LastOrDefault(h => h.GetEndTime() < time && !(h is BananaShower));
@@ -180,26 +179,5 @@ namespace osu.Game.Rulesets.Catch.Edit
                     return null;
             }
         }
-
-        private void updateDistanceSnapGrid()
-        {
-            if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True)
-            {
-                distanceSnapGrid.Hide();
-                return;
-            }
-
-            var sourceHitObject = getDistanceSnapGridSourceHitObject();
-
-            if (sourceHitObject == null)
-            {
-                distanceSnapGrid.Hide();
-                return;
-            }
-
-            distanceSnapGrid.Show();
-            distanceSnapGrid.StartTime = sourceHitObject.GetEndTime();
-            distanceSnapGrid.StartX = sourceHitObject.EffectiveX;
-        }
     }
 }

From cc1f1d2270043f452653bd82ea70e702ba41eacd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 19:47:49 +0200
Subject: [PATCH 1923/2100] Fix Floating Fruits not flipping playfield properly

Regressed by https://github.com/ppy/osu/pull/25070.
---
 .../Mods/TestSceneCatchModFloatingFruits.cs   | 21 +++++++++++++++++++
 .../Mods/CatchModFloatingFruits.cs            |  5 +----
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModFloatingFruits.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModFloatingFruits.cs
new file mode 100644
index 0000000000..73579d1c22
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModFloatingFruits.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 NUnit.Framework;
+using osu.Game.Rulesets.Catch.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Catch.Tests.Mods
+{
+    public partial class TestSceneCatchModFloatingFruits : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
+
+        [Test]
+        public void TestFloating() => CreateModTest(new ModTestData
+        {
+            Mod = new CatchModFloatingFruits(),
+            PassCondition = () => true
+        });
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index dd6757eac9..9d88c90576 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.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.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Catch.Objects;
@@ -21,10 +20,8 @@ namespace osu.Game.Rulesets.Catch.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
         {
-            drawableRuleset.PlayfieldAdjustmentContainer.Anchor = Anchor.Centre;
-            drawableRuleset.PlayfieldAdjustmentContainer.Origin = Anchor.Centre;
-
             drawableRuleset.PlayfieldAdjustmentContainer.Scale = new Vector2(1, -1);
+            drawableRuleset.PlayfieldAdjustmentContainer.Y = 1 - drawableRuleset.PlayfieldAdjustmentContainer.Y;
         }
     }
 }

From 2c6bf9e3469e4c004a41508dd802cad9b3882c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 20:45:47 +0200
Subject: [PATCH 1924/2100] Remove unused using directive

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b68af49222..07e5869e28 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;

From d73650331d05a11af6527627d54083d96e70acc8 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 03:26:12 +0900
Subject: [PATCH 1925/2100] Isolate diffcalc workflow runs

---
 .github/workflows/diffcalc.yml | 35 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index dbb4067676..67180f7ec2 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -101,7 +101,7 @@ permissions:
   pull-requests: write
 
 env:
-  COMMENT_TAG: execution-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+  EXECUTION_ID: execution-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
 
 jobs:
   check-permissions:
@@ -124,26 +124,15 @@ jobs:
       - name: Create comment
         uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
-          comment_tag: ${{ env.COMMENT_TAG }}
+          comment_tag: ${{ env.EXECUTION_ID }}
           message: |
             Difficulty calculation queued -- please wait! (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
             *This comment will update on completion*
 
-  wait-for-queue:
-    name: "Wait for previous workflows"
-    needs: check-permissions
-    runs-on: self-hosted
-    timeout-minutes: 50400 # 35 days, the maximum for jobs on self-hosted runners.
-    steps:
-      - uses: ahmadnassri/action-workflow-queue@f547ac848c16a9bb1b2ed4a850e0cc5098af2cf8 # v1.1.5
-        with:
-          timeout: 2147483647 # Around 24 days - the maximum supported by JS setTimeout().
-          delay: 120000 # Poll every 2 minutes - the API limit seems fairly low on this one.
-
   directory:
     name: Prepare directory
-    needs: wait-for-queue
+    needs: check-permissions
     runs-on: self-hosted
     outputs:
       GENERATOR_DIR: ${{ steps.set-outputs.outputs.GENERATOR_DIR }}
@@ -156,15 +145,15 @@ jobs:
       - name: Checkout diffcalc-sheet-generator
         uses: actions/checkout@v3
         with:
-          path: 'diffcalc-sheet-generator'
+          path: ${{ env.EXECUTION_ID }}
           repository: 'smoogipoo/diffcalc-sheet-generator'
 
       - name: Set outputs
         id: set-outputs
         run: |
-          echo "GENERATOR_DIR=${{ github.workspace }}/diffcalc-sheet-generator" >> "${GITHUB_OUTPUT}"
-          echo "GENERATOR_ENV=${{ github.workspace }}/diffcalc-sheet-generator/.env" >> "${GITHUB_OUTPUT}"
-          echo "GOOGLE_CREDS_FILE=${{ github.workspace }}/diffcalc-sheet-generator/google-credentials.json" >> "${GITHUB_OUTPUT}"
+          echo "GENERATOR_DIR=${{ github.workspace }}/${{ env.EXECUTION_ID }}" >> "${GITHUB_OUTPUT}"
+          echo "GENERATOR_ENV=${{ github.workspace }}/${{ env.EXECUTION_ID }}/.env" >> "${GITHUB_OUTPUT}"
+          echo "GOOGLE_CREDS_FILE=${{ github.workspace }}/${{ env.EXECUTION_ID }}/google-credentials.json" >> "${GITHUB_OUTPUT}"
 
   environment:
     name: Setup environment
@@ -176,7 +165,7 @@ jobs:
       - name: Add base environment
         run: |
           # Required by diffcalc-sheet-generator
-          cp '${{ github.workspace }}/diffcalc-sheet-generator/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          cp '${{ env.GENERATOR_DIR }}/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
           # Add Google credentials
           echo '${{ secrets.DIFFCALC_GOOGLE_CREDENTIALS }}' | base64 -d > "${{ needs.directory.outputs.GOOGLE_CREDS_FILE }}"
@@ -336,7 +325,7 @@ jobs:
         if: ${{ always() }}
         run: |
           cd "${{ needs.directory.outputs.GENERATOR_DIR }}"
-          docker-compose down
+          docker-compose down -v
 
   output-cli:
     name: Output info
@@ -358,7 +347,7 @@ jobs:
         if: ${{ needs.generator.result == 'success' }}
         uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
-          comment_tag: ${{ env.COMMENT_TAG }}
+          comment_tag: ${{ env.EXECUTION_ID }}
           mode: upsert
           create_if_not_exists: false
           message: |
@@ -369,7 +358,7 @@ jobs:
         if: ${{ needs.generator.result == 'failure' }}
         uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
-          comment_tag: ${{ env.COMMENT_TAG }}
+          comment_tag: ${{ env.EXECUTION_ID }}
           mode: upsert
           create_if_not_exists: false
           message: |
@@ -379,6 +368,6 @@ jobs:
         if: ${{ needs.generator.result == 'cancelled' }}
         uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
-          comment_tag: ${{ env.COMMENT_TAG }}
+          comment_tag: ${{ env.EXECUTION_ID }}
           mode: delete
           message: '.' # Appears to be required by this action for non-error status code.

From 634323e71ee5ffa1aaa3c2ab0a5b77185f81536f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 11:24:16 +0900
Subject: [PATCH 1926/2100] Fix wrong variable

---
 .github/workflows/diffcalc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 67180f7ec2..6523903bb1 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -165,7 +165,7 @@ jobs:
       - name: Add base environment
         run: |
           # Required by diffcalc-sheet-generator
-          cp '${{ env.GENERATOR_DIR }}/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          cp '${{ needs.directory.outputs.GENERATOR_DIR }}/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
           # Add Google credentials
           echo '${{ secrets.DIFFCALC_GOOGLE_CREDENTIALS }}' | base64 -d > "${{ needs.directory.outputs.GOOGLE_CREDS_FILE }}"

From 6cf0cbf3a9042d1a39e9ed034f2431bd56ace9a2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 11:32:11 +0900
Subject: [PATCH 1927/2100] Remove repo checkout step

---
 .github/workflows/diffcalc.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 6523903bb1..11778b446b 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -139,9 +139,6 @@ jobs:
       GENERATOR_ENV: ${{ steps.set-outputs.outputs.GENERATOR_ENV }}
       GOOGLE_CREDS_FILE: ${{ steps.set-outputs.outputs.GOOGLE_CREDS_FILE }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
       - name: Checkout diffcalc-sheet-generator
         uses: actions/checkout@v3
         with:

From e3bbf293336facc07ccb8ecc76f64d27fb29bc01 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 11:34:08 +0900
Subject: [PATCH 1928/2100] Add cleanup step

---
 .github/workflows/diffcalc.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 11778b446b..99d8f25cc2 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -334,6 +334,14 @@ jobs:
           echo "Target: ${{ needs.generator.outputs.TARGET }}"
           echo "Spreadsheet: ${{ needs.generator.outputs.SPREADSHEET_LINK }}"
 
+  cleanup:
+    name: Cleanup
+    needs: [ directory, generator ]
+    if: ${{ always() }}
+    runs-on: self-hosted
+    run: |
+      rm -rf "${{ needs.directory.outputs.GENERATOR_DIR }}"
+
   update-comment:
     name: Update PR comment
     needs: [ create-comment, generator ]

From 6c61894514749dd1f545bee47aa7233045c364ca Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 11:35:31 +0900
Subject: [PATCH 1929/2100] Cleanup in a step

---
 .github/workflows/diffcalc.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 99d8f25cc2..c5bac64ff2 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -339,8 +339,10 @@ jobs:
     needs: [ directory, generator ]
     if: ${{ always() }}
     runs-on: self-hosted
-    run: |
-      rm -rf "${{ needs.directory.outputs.GENERATOR_DIR }}"
+    steps:
+      - name: Cleanup
+        run: |
+          rm -rf "${{ needs.directory.outputs.GENERATOR_DIR }}"
 
   update-comment:
     name: Update PR comment

From f36a671eb41dce6dd08169891e8992962930aa9f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 15:38:00 +0900
Subject: [PATCH 1930/2100] Fix a couple of silly inspections

---
 osu.Game.Tests/Database/RealmTest.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Database/RealmTest.cs b/osu.Game.Tests/Database/RealmTest.cs
index d2779e3038..2812a97268 100644
--- a/osu.Game.Tests/Database/RealmTest.cs
+++ b/osu.Game.Tests/Database/RealmTest.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Tests.Database
                         Logger.Log($"Running test using realm file {testStorage.GetFullPath(realm.Filename)}");
                         testAction(realm, testStorage);
 
+                        // ReSharper disable once DisposeOnUsingVariable
                         realm.Dispose();
 
                         Logger.Log($"Final database size: {getFileSize(testStorage, realm)}");
@@ -58,6 +59,7 @@ namespace osu.Game.Tests.Database
                         Logger.Log($"Running test using realm file {testStorage.GetFullPath(realm.Filename)}");
                         await testAction(realm, testStorage);
 
+                        // ReSharper disable once DisposeOnUsingVariable
                         realm.Dispose();
 
                         Logger.Log($"Final database size: {getFileSize(testStorage, realm)}");

From f16400929d7eaddaddce0e0c56c30ae5254497e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 15:37:51 +0900
Subject: [PATCH 1931/2100] Update bindable flow to expose every spin, even
 after max bonus is reached

---
 .../Objects/Drawables/DrawableSpinner.cs      | 29 +++++++++----------
 .../Skinning/Argon/ArgonSpinner.cs            |  8 ++---
 .../Skinning/Default/DefaultSpinner.cs        |  8 ++---
 .../Skinning/Legacy/LegacySpinner.cs          |  8 ++---
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 9fa180cf93..72bf7bf1e9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -48,9 +48,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
         /// </summary>
-        public IBindable<double> GainedBonus => gainedBonus;
+        public double CurrentBonusScore => score_per_tick * (completedFullSpins.Value - HitObject.SpinsRequiredForBonus);
 
-        private readonly Bindable<double> gainedBonus = new BindableDouble();
+        /// <summary>
+        /// The maximum amount of bonus score which can be achieved from extra spins.
+        /// </summary>
+        public double MaximumBonusScore => score_per_tick * HitObject.MaximumBonusSpins;
+
+        public IBindable<int> CompletedFullSpins => completedFullSpins;
+
+        private readonly Bindable<int> completedFullSpins = new Bindable<int>();
 
         /// <summary>
         /// The number of spins per minute this spinner is spinning at, for display purposes.
@@ -286,8 +293,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
-        private int completedFullSpins;
-
         private void updateBonusScore()
         {
             if (ticks.Count == 0)
@@ -295,27 +300,21 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             int spins = (int)(Result.TotalRotation / 360);
 
-            if (spins < completedFullSpins)
+            if (spins < completedFullSpins.Value)
             {
                 // rewinding, silently handle
-                completedFullSpins = spins;
+                completedFullSpins.Value = spins;
                 return;
             }
 
-            while (completedFullSpins != spins)
+            while (completedFullSpins.Value != spins)
             {
                 var tick = ticks.FirstOrDefault(t => !t.Result.HasResult);
 
                 // tick may be null if we've hit the spin limit.
-                if (tick != null)
-                {
-                    tick.TriggerResult(true);
+                tick?.TriggerResult(true);
 
-                    if (tick is DrawableSpinnerBonusTick)
-                        gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequiredForBonus);
-                }
-
-                completedFullSpins++;
+                completedFullSpins.Value++;
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
index d5a9cf46c5..dc701aef53 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
@@ -85,17 +85,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             };
         }
 
-        private IBindable<double> gainedBonus = null!;
+        private IBindable<int> completedSpins = null!;
         private IBindable<double> spinsPerMinute = null!;
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
-            gainedBonus.BindValueChanged(bonus =>
+            completedSpins = drawableSpinner.CompletedFullSpins.GetBoundCopy();
+            completedSpins.BindValueChanged(bonus =>
             {
-                bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
+                bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
                 bonusCounter.FadeOutFromOne(1500);
                 bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
             });
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
index 071fbe6add..e001aeceae 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
@@ -80,17 +80,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             });
         }
 
-        private IBindable<double> gainedBonus = null!;
+        private IBindable<int> completedSpins = null!;
         private IBindable<double> spinsPerMinute = null!;
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
-            gainedBonus.BindValueChanged(bonus =>
+            completedSpins = drawableSpinner.CompletedFullSpins.GetBoundCopy();
+            completedSpins.BindValueChanged(bonus =>
             {
-                bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
+                bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
                 bonusCounter.FadeOutFromOne(1500);
                 bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
             });
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index d8f837ae5e..456f041554 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             });
         }
 
-        private IBindable<double> gainedBonus = null!;
+        private IBindable<int> completedSpins = null!;
         private IBindable<double> spinsPerMinute = null!;
 
         private readonly Bindable<bool> completed = new Bindable<bool>();
@@ -116,10 +116,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.LoadComplete();
 
-            gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
-            gainedBonus.BindValueChanged(bonus =>
+            completedSpins = DrawableSpinner.CompletedFullSpins.GetBoundCopy();
+            completedSpins.BindValueChanged(bonus =>
             {
-                bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
+                bonusCounter.Text = DrawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
                 bonusCounter.FadeOutFromOne(800, Easing.Out);
                 bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
             });

From 0da0855692ddc73c519a62aaa2dddf7355926de7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 16:10:50 +0900
Subject: [PATCH 1932/2100] Add ability to change spin speed in spinner test

---
 .../TestSceneSpinner.cs                       | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index b1d9c453d6..ea57a6a1b5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Audio;
@@ -26,6 +27,15 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private TestDrawableSpinner drawableSpinner;
 
+        private readonly BindableDouble spinRate = new BindableDouble();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AddSliderStep("Spin rate", 0.5, 5, 1, val => spinRate.Value = val);
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void TestVariousSpinners(bool autoplay)
@@ -86,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { OverallDifficulty = od });
 
-                return drawableSpinner = new TestDrawableSpinner(spinner, true)
+                return drawableSpinner = new TestDrawableSpinner(spinner, true, spinRate)
                 {
                     Anchor = Anchor.Centre,
                     Depth = depthIndex++,
@@ -114,7 +124,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });
 
-            drawableSpinner = new TestDrawableSpinner(spinner, auto)
+            drawableSpinner = new TestDrawableSpinner(spinner, auto, spinRate)
             {
                 Anchor = Anchor.Centre,
                 Depth = depthIndex++,
@@ -130,18 +140,20 @@ namespace osu.Game.Rulesets.Osu.Tests
         private partial class TestDrawableSpinner : DrawableSpinner
         {
             private readonly bool auto;
+            private readonly BindableDouble spinRate;
 
-            public TestDrawableSpinner(Spinner s, bool auto)
+            public TestDrawableSpinner(Spinner s, bool auto, BindableDouble spinRate)
                 : base(s)
             {
                 this.auto = auto;
+                this.spinRate = spinRate;
             }
 
             protected override void Update()
             {
                 base.Update();
                 if (auto)
-                    RotationTracker.AddRotation((float)(Clock.ElapsedFrameTime * 2));
+                    RotationTracker.AddRotation((float)(Clock.ElapsedFrameTime * spinRate.Value));
             }
         }
     }

From 3986cec949cac13b70a16d3d99d5211ce0e54516 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 15:57:13 +0900
Subject: [PATCH 1933/2100] Cap bonus score more correctly

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 72bf7bf1e9..d4e257d754 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
         /// </summary>
-        public double CurrentBonusScore => score_per_tick * (completedFullSpins.Value - HitObject.SpinsRequiredForBonus);
+        public double CurrentBonusScore => score_per_tick * Math.Clamp(completedFullSpins.Value - HitObject.SpinsRequiredForBonus, 0, HitObject.MaximumBonusSpins);
 
         /// <summary>
         /// The maximum amount of bonus score which can be achieved from extra spins.

From 181a98e8efd346e8f21c744af18239c402bc8f63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 16:05:29 +0900
Subject: [PATCH 1934/2100] Remove duplicate definition of bonus text in
 `ArgonSpinner`

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
index dc701aef53..b667c415fe 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
@@ -35,14 +35,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             InternalChildren = new Drawable[]
             {
-                bonusCounter = new OsuSpriteText
-                {
-                    Alpha = 0,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Font = OsuFont.Default.With(size: 24),
-                    Y = -120,
-                },
                 new ArgonSpinnerDisc
                 {
                     RelativeSizeAxes = Axes.Both,

From ca3a3f600e61165d7f662ef63798e76d3dc18803 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 16:11:09 +0900
Subject: [PATCH 1935/2100] Update visuals of spinner implementations to show
 MAX score differently

---
 .../Skinning/Argon/ArgonSpinner.cs            | 22 ++++++++++++++----
 .../Skinning/Default/DefaultSpinner.cs        | 23 ++++++++++++++++---
 .../Skinning/Legacy/LegacySpinner.cs          | 16 +++++++++++--
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
index b667c415fe..ee9f228137 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
@@ -85,11 +85,25 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             base.LoadComplete();
 
             completedSpins = drawableSpinner.CompletedFullSpins.GetBoundCopy();
-            completedSpins.BindValueChanged(bonus =>
+            completedSpins.BindValueChanged(_ =>
             {
-                bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
-                bonusCounter.FadeOutFromOne(1500);
-                bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+                if (drawableSpinner.CurrentBonusScore <= 0)
+                    return;
+
+                if (drawableSpinner.CurrentBonusScore == drawableSpinner.MaximumBonusScore)
+                {
+                    bonusCounter.Text = "MAX";
+                    bonusCounter.ScaleTo(1.5f).Then().ScaleTo(2.8f, 1000, Easing.OutQuint);
+
+                    bonusCounter.FlashColour(Colour4.FromHex("FC618F"), 400);
+                    bonusCounter.FadeOutFromOne(500);
+                }
+                else
+                {
+                    bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
+                    bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+                    bonusCounter.FadeOutFromOne(1500);
+                }
             });
 
             spinsPerMinute = drawableSpinner.SpinsPerMinute.GetBoundCopy();
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
index e001aeceae..4a76a1aec4 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         private Container spmContainer = null!;
         private OsuSpriteText spmCounter = null!;
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         public DefaultSpinner()
         {
             RelativeSizeAxes = Axes.Both;
@@ -90,9 +93,23 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             completedSpins = drawableSpinner.CompletedFullSpins.GetBoundCopy();
             completedSpins.BindValueChanged(bonus =>
             {
-                bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
-                bonusCounter.FadeOutFromOne(1500);
-                bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+                if (drawableSpinner.CurrentBonusScore <= 0)
+                    return;
+
+                if (drawableSpinner.CurrentBonusScore == drawableSpinner.MaximumBonusScore)
+                {
+                    bonusCounter.Text = "MAX";
+                    bonusCounter.ScaleTo(1.5f).Then().ScaleTo(2.8f, 1000, Easing.OutQuint);
+
+                    bonusCounter.FlashColour(colours.YellowLight, 400);
+                    bonusCounter.FadeOutFromOne(500);
+                }
+                else
+                {
+                    bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
+                    bonusCounter.FadeOutFromOne(1500);
+                    bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+                }
             });
 
             spinsPerMinute = drawableSpinner.SpinsPerMinute.GetBoundCopy();
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 456f041554..28acb4a996 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -119,9 +119,21 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             completedSpins = DrawableSpinner.CompletedFullSpins.GetBoundCopy();
             completedSpins.BindValueChanged(bonus =>
             {
+                if (DrawableSpinner.CurrentBonusScore <= 0)
+                    return;
+
                 bonusCounter.Text = DrawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
-                bonusCounter.FadeOutFromOne(800, Easing.Out);
-                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+
+                if (DrawableSpinner.CurrentBonusScore == DrawableSpinner.MaximumBonusScore)
+                {
+                    bonusCounter.ScaleTo(1.4f).Then().ScaleTo(1.8f, 1000, Easing.Out);
+                    bonusCounter.FadeOutFromOne(500, Easing.Out);
+                }
+                else
+                {
+                    bonusCounter.FadeOutFromOne(800, Easing.Out);
+                    bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+                }
             });
 
             spinsPerMinute = DrawableSpinner.SpinsPerMinute.GetBoundCopy();

From 59a1915451e43e4619c68719ae770974f45bead3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 20 Oct 2023 10:25:28 +0200
Subject: [PATCH 1936/2100] Add failing test case for insufficient sample query
 leniency

---
 .../Beatmaps/Formats/LegacyBeatmapDecoderTest.cs    | 13 +++++++++++++
 osu.Game.Tests/Resources/sample-point-leniency.osu  | 10 ++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/sample-point-leniency.osu

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index fec7f86eb2..66151a51e6 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -1080,5 +1080,18 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(controlPoints.DifficultyPointAt(3000).GenerateTicks, Is.True);
             }
         }
+
+        [Test]
+        public void TestSamplePointLeniency()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("sample-point-leniency.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var hitObject = decoder.Decode(stream).HitObjects.Single();
+                Assert.That(hitObject.Samples.Select(s => s.Volume), Has.All.EqualTo(70));
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Resources/sample-point-leniency.osu b/osu.Game.Tests/Resources/sample-point-leniency.osu
new file mode 100644
index 0000000000..a44838007c
--- /dev/null
+++ b/osu.Game.Tests/Resources/sample-point-leniency.osu
@@ -0,0 +1,10 @@
+osu file format v14
+
+# extracted from https://osu.ppy.sh/beatmapsets/1859679#osu/3823636
+
+[TimingPoints]
+39166,-117.647058823529,4,2,1,5,0,0
+39262,-117.647058823529,4,2,1,70,0,0
+
+[HitObjects]
+440,70,39260,1,10,0:2:0:0:

From c89081589ccbaabef181530a203300116dd3ea00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 20 Oct 2023 10:26:16 +0200
Subject: [PATCH 1937/2100] Fix insufficient leniency when querying sample
 points

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

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 8559ecfe69..8c5e4971d5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -28,9 +28,12 @@ namespace osu.Game.Beatmaps.Formats
         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.
+        /// A small adjustment to the start time of sample control points to account for rounding/precision errors.
         /// </summary>
-        private const double control_point_leniency = 1;
+        /// <remarks>
+        /// Compare: https://github.com/peppy/osu-stable-reference/blob/master/osu!/GameplayElements/HitObjects/HitObject.cs#L319
+        /// </remarks>
+        private const double control_point_leniency = 5;
 
         internal static RulesetStore? RulesetStore;
 

From 4a3a4ee17fd6fdae95e7d2143d61297477028c20 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 20 Oct 2023 11:47:00 +0200
Subject: [PATCH 1938/2100] Change beatmap listing key to B to match Ctrl-B
 shortcut

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 2ead18c3d6..9f881089c3 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -132,11 +132,9 @@ namespace osu.Game.Screens.Menu
             buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Playlists, @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH,
-                Key.P));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0,
-                Key.D));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));

From 3fb74cb5f936f4fb8380f29cf1430c7e4bda5da7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 18:57:14 +0900
Subject: [PATCH 1939/2100] Move helper method to `LegacyRulesetExtensions` and
 stop applying rounding allowance to catch

As discussed, it isn't used in stable like this. Was a mistake.
---
 .../Objects/CatchHitObject.cs                 |  3 ++-
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  3 ++-
 .../TestSceneSliderFollowCircleInput.cs       |  3 ++-
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs |  3 ++-
 .../Statistics/AccuracyHeatmap.cs             |  3 ++-
 osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs   | 15 ---------------
 .../Objects/Legacy/LegacyRulesetExtensions.cs | 19 +++++++++++++++++++
 7 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 1d536eb5cb..b9fef6bf8c 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -8,6 +8,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
@@ -151,7 +152,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             TimePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
 
-            Scale = IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize);
+            Scale = LegacyRulesetExtensions.CalculateScaleFromCircleSize(difficulty.CircleSize);
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index f09614816d..0c2c157d10 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Skinning;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -469,7 +470,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// Calculates the scale of the catcher based off the provided beatmap difficulty.
         /// </summary>
-        private static Vector2 calculateScale(IBeatmapDifficultyInfo difficulty) => new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize) * 2);
+        private static Vector2 calculateScale(IBeatmapDifficultyInfo difficulty) => new Vector2(LegacyRulesetExtensions.CalculateScaleFromCircleSize(difficulty.CircleSize) * 2);
 
         private enum DroppedObjectAnimation
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
index 0e5f8a8cf6..d4bb789a12 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
@@ -10,6 +10,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
@@ -35,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             const double time_slider_start = 1000;
 
-            float circleRadius = OsuHitObject.OBJECT_RADIUS * IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(circleSize);
+            float circleRadius = OsuHitObject.OBJECT_RADIUS * LegacyRulesetExtensions.CalculateScaleFromCircleSize(circleSize, true);
             float followCircleRadius = circleRadius * 1.2f;
 
             performTest(new Beatmap<OsuHitObject>
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 0b1f413362..d74d28c748 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
@@ -155,7 +156,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             // This adjustment is necessary for AR>10, otherwise TimePreempt can become smaller leading to hitcircles not fully fading in.
             TimeFadeIn = 400 * Math.Min(1, TimePreempt / PREEMPT_MIN);
 
-            Scale = IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize);
+            Scale = LegacyRulesetExtensions.CalculateScaleFromCircleSize(difficulty.CircleSize, true);
         }
 
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();
diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 8a2c7ff13a..83bab7dc01 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -13,6 +13,7 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
 using osuTK;
@@ -208,7 +209,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             if (score.HitEvents.Count == 0)
                 return;
 
-            float radius = OsuHitObject.OBJECT_RADIUS * IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(playableBeatmap.Difficulty.CircleSize);
+            float radius = OsuHitObject.OBJECT_RADIUS * LegacyRulesetExtensions.CalculateScaleFromCircleSize(playableBeatmap.Difficulty.CircleSize, true);
 
             foreach (var e in score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)))
             {
diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index 19944afa1c..e7a3d87d0a 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -44,21 +44,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         double SliderTickRate { get; }
 
-        static float CalculateScaleFromCircleSize(float circleSize)
-        {
-            // The following comment is copied verbatim from osu-stable:
-            //
-            //   Builds of osu! up to 2013-05-04 had the gamefield being rounded down, which caused incorrect radius calculations
-            //   in widescreen cases. This ratio adjusts to allow for old replays to work post-fix, which in turn increases the lenience
-            //   for all plays, but by an amount so small it should only be effective in replays.
-            //
-            // To match expectations of gameplay we need to apply this multiplier to circle scale. It's weird but is what it is.
-            // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
-            const float broken_gamefield_rounding_allowance = 1.00041f;
-
-            return (float)(1.0f - 0.7f * DifficultyRange(circleSize)) / 2 * broken_gamefield_rounding_allowance;
-        }
-
         /// <summary>
         /// Maps a difficulty value [0, 10] to a two-piece linear range of values.
         /// </summary>
diff --git a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
index 6cff4b12c4..f006d5e998 100644
--- a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects.Types;
 
@@ -38,5 +39,23 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             return timingControlPoint.BeatLength * bpmMultiplier;
         }
+
+        /// <summary>
+        /// Calculates scale from a CS value, with an optional fudge that was historically applied to the osu! ruleset.
+        /// </summary>
+        public static float CalculateScaleFromCircleSize(float circleSize, bool applyFudge = false)
+        {
+            // The following comment is copied verbatim from osu-stable:
+            //
+            //   Builds of osu! up to 2013-05-04 had the gamefield being rounded down, which caused incorrect radius calculations
+            //   in widescreen cases. This ratio adjusts to allow for old replays to work post-fix, which in turn increases the lenience
+            //   for all plays, but by an amount so small it should only be effective in replays.
+            //
+            // To match expectations of gameplay we need to apply this multiplier to circle scale. It's weird but is what it is.
+            // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
+            const float broken_gamefield_rounding_allowance = 1.00041f;
+
+            return (float)(1.0f - 0.7f * IBeatmapDifficultyInfo.DifficultyRange(circleSize)) / 2 * broken_gamefield_rounding_allowance;
+        }
     }
 }

From 3c3b0a15a666e6be2d1a2cd7c7f82d841dd7cfed Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 18:58:32 +0900
Subject: [PATCH 1940/2100] Only run cleanup if directory was created

---
 .github/workflows/diffcalc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index c5bac64ff2..e7c628e365 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -337,7 +337,7 @@ jobs:
   cleanup:
     name: Cleanup
     needs: [ directory, generator ]
-    if: ${{ always() }}
+    if: ${{ always() && needs.directory.result == 'success' }}
     runs-on: self-hosted
     steps:
       - name: Cleanup

From 1be49f5b93ed4c2738fb411b0a3d99ad34730f27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 19:04:24 +0900
Subject: [PATCH 1941/2100] Update osu! difficulty calculator tests to factor
 in fractional changes

---
 .../OsuDifficultyCalculatorTest.cs                   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index f1c1c4734d..7b7deb9c67 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -15,22 +15,22 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
 
-        [TestCase(6.7115569159190587d, 206, "diffcalc-test")]
-        [TestCase(1.4391311903612753d, 45, "zero-length-sliders")]
+        [TestCase(6.710442985146793d, 206, "diffcalc-test")]
+        [TestCase(1.4386882251130073d, 45, "zero-length-sliders")]
         [TestCase(0.42506480230838789d, 2, "very-fast-slider")]
         [TestCase(0.14102693012101306d, 1, "nan-slider")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)
             => base.Test(expectedStarRating, expectedMaxCombo, name);
 
-        [TestCase(8.9757300665532966d, 206, "diffcalc-test")]
+        [TestCase(8.9742952703071666d, 206, "diffcalc-test")]
         [TestCase(0.55071082800473514d, 2, "very-fast-slider")]
-        [TestCase(1.7437232654020756d, 45, "zero-length-sliders")]
+        [TestCase(1.743180218215227d, 45, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModDoubleTime());
 
-        [TestCase(6.7115569159190587d, 239, "diffcalc-test")]
+        [TestCase(6.710442985146793d, 239, "diffcalc-test")]
         [TestCase(0.42506480230838789d, 4, "very-fast-slider")]
-        [TestCase(1.4391311903612753d, 54, "zero-length-sliders")]
+        [TestCase(1.4386882251130073d, 54, "zero-length-sliders")]
         public void TestClassicMod(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModClassic());
 

From 5bbbca3e44c9c61964d86c2bb414674fc6cb6965 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 20 Oct 2023 12:22:00 +0200
Subject: [PATCH 1942/2100] Also support `D` for those with muscle memory from
 stable

---
 osu.Game/Screens/Menu/ButtonSystem.cs   | 2 +-
 osu.Game/Screens/Menu/MainMenuButton.cs | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 9f881089c3..bf2eba43c0 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Menu
 
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B, Key.D));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index cd3795711e..c3a96e36a1 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Linq;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -34,7 +35,7 @@ namespace osu.Game.Screens.Menu
     {
         public event Action<ButtonState> StateChanged;
 
-        public readonly Key TriggerKey;
+        public readonly Key[] TriggerKeys;
 
         private readonly Container iconText;
         private readonly Container box;
@@ -53,11 +54,11 @@ namespace osu.Game.Screens.Menu
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
-        public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
+        public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, params Key[] triggerKeys)
         {
             this.sampleName = sampleName;
             this.clickAction = clickAction;
-            TriggerKey = triggerKey;
+            TriggerKeys = triggerKeys;
 
             AutoSizeAxes = Axes.Both;
             Alpha = 0;
@@ -213,7 +214,7 @@ namespace osu.Game.Screens.Menu
             if (e.Repeat || e.ControlPressed || e.ShiftPressed || e.AltPressed || e.SuperPressed)
                 return false;
 
-            if (TriggerKey == e.Key && TriggerKey != Key.Unknown)
+            if (TriggerKeys.Contains(e.Key))
             {
                 trigger();
                 return true;

From 137a1d948dad5382af169b4660d57e7f31605253 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 20:04:11 +0900
Subject: [PATCH 1943/2100] Allow interacting with the carousel anywhere in
 empty space at song select

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 16ae54b413..eb47a7201a 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -1197,6 +1197,8 @@ namespace osu.Game.Screens.Select
         {
             private bool rightMouseScrollBlocked;
 
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
             public CarouselScrollContainer()
             {
                 // size is determined by the carousel itself, due to not all content necessarily being loaded.

From 0ae0b0c353618b7289d6fe6b6aac7c34ad9b9886 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 20:04:26 +0900
Subject: [PATCH 1944/2100] Fix carousel "reset position" marging not scaling
 with UI scale correctly

---
 osu.Game/Screens/Select/SongSelect.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index bac84b8134..f792f3e4f5 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -171,11 +171,6 @@ namespace osu.Game.Screens.Select
 
             AddRangeInternal(new Drawable[]
             {
-                new ResetScrollContainer(() => Carousel.ScrollToSelected())
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 250,
-                },
                 new VerticalMaskingContainer
                 {
                     Children = new Drawable[]
@@ -243,6 +238,10 @@ namespace osu.Game.Screens.Select
                                         Padding = new MarginPadding { Top = left_area_padding },
                                         Children = new Drawable[]
                                         {
+                                            new ResetScrollContainer(() => Carousel.ScrollToSelected())
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                            },
                                             beatmapInfoWedge = new BeatmapInfoWedge
                                             {
                                                 Height = WEDGE_HEIGHT,

From 906b700acac611deabd13f6c62ea0d467311940d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 20:18:14 +0900
Subject: [PATCH 1945/2100] Fix fudge not being applied

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

diff --git a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
index f006d5e998..53cf835248 100644
--- a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
             const float broken_gamefield_rounding_allowance = 1.00041f;
 
-            return (float)(1.0f - 0.7f * IBeatmapDifficultyInfo.DifficultyRange(circleSize)) / 2 * broken_gamefield_rounding_allowance;
+            return (float)(1.0f - 0.7f * IBeatmapDifficultyInfo.DifficultyRange(circleSize)) / 2 * (applyFudge ? broken_gamefield_rounding_allowance : 1);
         }
     }
 }

From 6e8a4c2eff989fe560f93b886b3feef8c1e6995f Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 17:11:21 +0900
Subject: [PATCH 1946/2100] Fix toolbar ruleset buttons not having hover sounds

---
 osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index 88326d4048..20415f7507 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
@@ -38,6 +39,8 @@ namespace osu.Game.Overlays.Toolbar
 
         private partial class RulesetButton : ToolbarButton
         {
+            protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds(HoverSampleSet.Button);
+
             public bool Active
             {
                 set

From ba6e36bd675144cfcffb4e137c62d1f26cf2479e Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 17:18:50 +0900
Subject: [PATCH 1947/2100] Remove `NowPlayingOverlay` custom pop-in/pop-out
 samples in favour of the generic overlay ones

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 809c1af408..5bbf18a959 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -55,8 +55,7 @@ namespace osu.Game.Overlays
         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";
+        protected override double PopInOutSampleBalance => OsuGameBase.SFX_STEREO_STRENGTH * 0.75f;
 
         [Resolved]
         private MusicController musicController { get; set; } = null!;

From bf608a6b08a7f185e635bc7b24e8fb14829323e6 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 17:19:45 +0900
Subject: [PATCH 1948/2100] Use `Button` sample set for `NewsCard`

---
 osu.Game/Overlays/News/NewsCard.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index b12aa4509e..8a579a5ccc 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -14,6 +14,7 @@ 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.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.News
@@ -28,6 +29,7 @@ namespace osu.Game.Overlays.News
         private TextFlowContainer main = null!;
 
         public NewsCard(APINewsPost post)
+            : base(HoverSampleSet.Button)
         {
             this.post = post;
 

From e17c94d09d630972b90d92c117bf45f86ca01045 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 17:23:39 +0900
Subject: [PATCH 1949/2100] Change ruleset button hover samples to `Default`
 instead of `Button` to match other toolbar buttons

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

diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index 20415f7507..74f76c7c89 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Toolbar
 
         private partial class RulesetButton : ToolbarButton
         {
-            protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds(HoverSampleSet.Button);
+            protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds();
 
             public bool Active
             {

From 6dc4dbde137c71bc118e7aabcf135664874d04d7 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 17:24:51 +0900
Subject: [PATCH 1950/2100] Reduce `LoginOverlay` pop-in/pop-out sample panning
 to match `NowPlayingOverlay`

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

diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index 8a4bda89d9..c0aff6aae9 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays
 
         private const float transition_time = 400;
 
-        protected override double PopInOutSampleBalance => OsuGameBase.SFX_STEREO_STRENGTH;
+        protected override double PopInOutSampleBalance => OsuGameBase.SFX_STEREO_STRENGTH * 0.75f;
 
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);

From 6b28f8561567e5c8f25562760d8d34dabf302f36 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 20 Oct 2023 14:36:36 +0900
Subject: [PATCH 1951/2100] Change `RevertToDefaultButton` and `BackButton` to
 use `Default` sampleset instead

---
 osu.Game/Overlays/RevertToDefaultButton.cs  | 6 ------
 osu.Game/Overlays/Settings/SidebarButton.cs | 4 ++--
 osu.Game/Overlays/SettingsSubPanel.cs       | 6 ++++++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/RevertToDefaultButton.cs b/osu.Game/Overlays/RevertToDefaultButton.cs
index c43d233fc1..582138b0b4 100644
--- a/osu.Game/Overlays/RevertToDefaultButton.cs
+++ b/osu.Game/Overlays/RevertToDefaultButton.cs
@@ -13,7 +13,6 @@ 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;
 using osuTK;
 
@@ -56,11 +55,6 @@ namespace osu.Game.Overlays
             }
         }
 
-        public RevertToDefaultButton()
-            : base(HoverSampleSet.Button)
-        {
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Overlays/Settings/SidebarButton.cs b/osu.Game/Overlays/Settings/SidebarButton.cs
index 5fe0e1afc0..a63688762d 100644
--- a/osu.Game/Overlays/Settings/SidebarButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarButton.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Overlays.Settings
         [Resolved]
         protected OverlayColourProvider ColourProvider { get; private set; } = null!;
 
-        protected SidebarButton()
-            : base(HoverSampleSet.ButtonSidebar)
+        protected SidebarButton(HoverSampleSet? hoverSounds = HoverSampleSet.ButtonSidebar)
+            : base(hoverSounds)
         {
         }
 
diff --git a/osu.Game/Overlays/SettingsSubPanel.cs b/osu.Game/Overlays/SettingsSubPanel.cs
index 5890d1c8fa..1651975a74 100644
--- a/osu.Game/Overlays/SettingsSubPanel.cs
+++ b/osu.Game/Overlays/SettingsSubPanel.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
 using osuTK;
 
@@ -38,6 +39,11 @@ namespace osu.Game.Overlays
         {
             private Container content;
 
+            public BackButton()
+                : base(HoverSampleSet.Default)
+            {
+            }
+
             [BackgroundDependencyLoader]
             private void load()
             {

From fbf8f52f7d3e93955f20608161767f02df539cb9 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 20 Oct 2023 14:39:36 +0900
Subject: [PATCH 1952/2100] Add audio feedback for when keys are pressed during
 key binding

---
 osu.Game/Graphics/UserInterface/OsuTextBox.cs       |  1 +
 .../Settings/Sections/Input/KeyBindingRow.cs        | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 99803e2956..04ecfa7e9a 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -86,6 +86,7 @@ namespace osu.Game.Graphics.UserInterface
 
             Placeholder.Colour = colourProvider?.Foreground1 ?? new Color4(180, 180, 180, 255);
 
+            // Note that `KeyBindingRow` uses similar logic for input feedback, so remember to update there if changing here.
             var textAddedSamples = new Sample?[4];
             for (int i = 0; i < textAddedSamples.Length; i++)
                 textAddedSamples[i] = audio.Samples.Get($@"Keyboard/key-press-{1 + i}");
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 7a5a269eb3..c85fe4727a 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
@@ -17,6 +19,7 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -96,6 +99,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private KeyButton? bindTarget;
 
+        private Sample?[]? keypressSamples;
+
         private const float transition_time = 150;
         private const float height = 20;
         private const float padding = 5;
@@ -118,7 +123,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider, AudioManager audioManager)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -202,6 +207,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Scheduler.AddOnce(updateButtons);
                 updateIsDefaultValue();
             }, true);
+
+            keypressSamples = new Sample[4];
+            for (int i = 0; i < keypressSamples.Length; i++)
+                keypressSamples[i] = audioManager.Samples.Get($@"Keyboard/key-press-{1 + i}");
         }
 
         public void RestoreDefaults()
@@ -301,6 +310,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             Debug.Assert(bindTarget != null);
 
+            keypressSamples?[RNG.Next(0, keypressSamples.Length)]?.Play();
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromKey(e.Key));
             if (!isModifier(e.Key)) finalise();
 

From b321d556b68691e24183c366fccfed0eced5a81a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 20 Oct 2023 14:18:32 +0200
Subject: [PATCH 1953/2100] Enforce minimum gameplay sample volume of 5%

---
 .../Objects/Drawables/DrawableHoldNote.cs     |  6 ++++-
 .../Objects/Drawables/DrawableSlider.cs       |  6 ++++-
 .../Objects/Drawables/DrawableSpinner.cs      |  1 +
 .../Objects/Drawables/DrawableHitObject.cs    | 25 ++++++++++++++++++-
 .../UI/GameplaySampleTriggerSource.cs         |  6 ++++-
 osu.Game/Skinning/SkinnableSound.cs           |  8 +++++-
 6 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 86920927dc..3490d50871 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -108,7 +108,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                     RelativeSizeAxes = Axes.X
                 },
                 tailContainer = new Container<DrawableHoldNoteTail> { RelativeSizeAxes = Axes.Both },
-                slidingSample = new PausableSkinnableSound { Looping = true }
+                slidingSample = new PausableSkinnableSound
+                {
+                    Looping = true,
+                    MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME,
+                }
             });
 
             maskedContents.AddRange(new[]
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 09973ce5fd..b682d14879 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -107,7 +107,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
                 OverlayElementContainer = new Container { RelativeSizeAxes = Axes.Both, },
                 Ball,
-                slidingSample = new PausableSkinnableSound { Looping = true }
+                slidingSample = new PausableSkinnableSound
+                {
+                    Looping = true,
+                    MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME,
+                }
             });
 
             PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 9fa180cf93..1135ecc7d5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -99,6 +99,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 spinningSample = new PausableSkinnableSound
                 {
                     Volume = { Value = 0 },
+                    MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME,
                     Looping = true,
                     Frequency = { Value = spinning_sample_initial_frequency }
                 }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 3bb0e3dfb8..ce6475d3ce 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -159,6 +159,26 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         internal bool IsInitialized;
 
+        /// <summary>
+        /// The minimum allowable volume for sample playback.
+        /// <see cref="Samples"/> quieter than that will be forcibly played at this volume instead.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Drawable hitobjects adding their own custom samples, or other sample playback sources
+        /// (i.e. <see cref="GameplaySampleTriggerSource"/>) must enforce this themselves.
+        /// </para>
+        /// <para>
+        /// This sample volume floor is present in stable, although it is set at 8% rather than 5%.
+        /// See: https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/Audio/AudioEngine.cs#L1070,
+        /// https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/Audio/AudioEngine.cs#L1404-L1405.
+        /// The reason why it is 5% here is that the 8% cap was enforced in a silent manner
+        /// (i.e. the minimum selectable volume in the editor was 5%, but it would be played at 8% anyways),
+        /// which is confusing and arbitrary, so we're just doing 5% here at the cost of sacrificing strict parity.
+        /// </para>
+        /// </remarks>
+        public const int MINIMUM_SAMPLE_VOLUME = 5;
+
         /// <summary>
         /// Creates a new <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -181,7 +201,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
             comboColourBrightness.BindTo(gameplaySettings.ComboColourNormalisationAmount);
 
             // Explicit non-virtual function call in case a DrawableHitObject overrides AddInternal.
-            base.AddInternal(Samples = new PausableSkinnableSound());
+            base.AddInternal(Samples = new PausableSkinnableSound
+            {
+                MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME
+            });
 
             CurrentSkin = skinSource;
             CurrentSkin.SourceChanged += skinSourceChanged;
diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index fed262868d..b61e8d9674 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 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.Screens.Play;
 using osu.Game.Skinning;
@@ -45,7 +46,10 @@ namespace osu.Game.Rulesets.UI
                 Child = hitSounds = new Container<SkinnableSound>
                 {
                     Name = "concurrent sample pool",
-                    ChildrenEnumerable = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new PausableSkinnableSound())
+                    ChildrenEnumerable = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new PausableSkinnableSound
+                    {
+                        MinimumSampleVolume = DrawableHitObject.MINIMUM_SAMPLE_VOLUME
+                    })
                 }
             };
         }
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 59b3799e0a..f866a4f8ec 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -20,6 +20,12 @@ namespace osu.Game.Skinning
     /// </summary>
     public partial class SkinnableSound : SkinReloadableDrawable, IAdjustableAudioComponent
     {
+        /// <summary>
+        /// The minimum allowable volume for <see cref="Samples"/>.
+        /// <see cref="Samples"/> that specify a lower <see cref="ISampleInfo.Volume"/> will be forcibly pulled up to this volume.
+        /// </summary>
+        public int MinimumSampleVolume { get; set; }
+
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
 
@@ -156,7 +162,7 @@ namespace osu.Game.Skinning
             {
                 var sample = samplePool?.GetPooledSample(s) ?? new PoolableSkinnableSample(s);
                 sample.Looping = Looping;
-                sample.Volume.Value = s.Volume / 100.0;
+                sample.Volume.Value = Math.Max(s.Volume, MinimumSampleVolume) / 100.0;
 
                 samplesContainer.Add(sample);
             }

From 12282fff5c23fefcbee4907c8d4e917801a8cf38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 20 Oct 2023 14:21:11 +0200
Subject: [PATCH 1954/2100] Disallow setting sample volume lower than 5% in
 editor

---
 .../Edit/Compose/Components/Timeline/SamplePointPiece.cs       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index b02cfb505e..28841fc9e5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -16,6 +16,7 @@ using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Edit.Timing;
 using osuTK;
 using osuTK.Graphics;
@@ -101,7 +102,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             },
                             volume = new IndeterminateSliderWithTextBoxInput<int>("Volume", new BindableInt(100)
                             {
-                                MinValue = 0,
+                                MinValue = DrawableHitObject.MINIMUM_SAMPLE_VOLUME,
                                 MaxValue = 100,
                             })
                         }

From ac8c2a173b2a2bedb4ea22fa46f0c7cf56a732e8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 20 Oct 2023 22:47:45 +0300
Subject: [PATCH 1955/2100] Apply velocity into legacy slider ball animation
 rate

---
 .../Skinning/Legacy/LegacySliderBall.cs       | 30 +++++++++++++------
 .../Legacy/OsuLegacySkinTransformer.cs        |  9 ++----
 osu.Game/Skinning/LegacySkinExtensions.cs     |  8 +++--
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 593a0d18dd..afc23921bf 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.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 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;
@@ -15,31 +17,41 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public partial class LegacySliderBall : CompositeDrawable
     {
-        private readonly Drawable animationContent;
-
         private readonly ISkin skin;
 
         [Resolved(canBeNull: true)]
         private DrawableHitObject? parentObject { get; set; }
 
-        public Color4 BallColour => animationContent.Colour;
-
         private Sprite layerNd = null!;
+        private Drawable ball = null!;
         private Sprite layerSpec = null!;
 
-        public LegacySliderBall(Drawable animationContent, ISkin skin)
+        public Color4 BallColour => ball.Colour;
+
+        public LegacySliderBall(ISkin skin)
         {
-            this.animationContent = animationContent;
             this.skin = skin;
 
             AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(DrawableHitObject drawableHitObject)
         {
             var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
 
+            DrawableSlider drawableSlider = (DrawableSlider)drawableHitObject;
+
+            // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
+            double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
+
+            double ballAnimationRate = Math.Max(
+                150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
+                LegacySkinExtensions.SIXTY_FRAME_TIME);
+
+            ball = skin.GetAnimation("sliderb", true, true, animationSeparator: "", frameLength: ballAnimationRate,
+                maxSize: OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE).AsNonNull();
+
             InternalChildren = new[]
             {
                 layerNd = new Sprite
@@ -49,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
+                LegacyColourCompatibility.ApplyWithDoubledAlpha(ball.With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;
@@ -78,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 if (skin.GetConfig<SkinConfiguration.LegacySetting, bool>(SkinConfiguration.LegacySetting.AllowSliderBallTint)?.Value == true)
                 {
                     accentColour.BindTo(parentObject.AccentColour);
-                    accentColour.BindValueChanged(a => animationContent.Colour = a.NewValue, true);
+                    accentColour.BindValueChanged(a => ball.Colour = a.NewValue, true);
                 }
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 3002cbe0ae..1de8fefaae 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -59,13 +59,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return null;
 
                     case OsuSkinComponents.SliderBall:
-                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: MAX_FOLLOW_CIRCLE_AREA_SIZE);
-
-                        // todo: slider ball has a custom frame delay based on velocity
-                        // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
-
-                        if (sliderBallContent != null)
-                            return new LegacySliderBall(sliderBallContent, this);
+                        if (GetTexture("sliderb") != null || GetTexture("sliderb0") != null)
+                            return new LegacySliderBall(this);
 
                         return null;
 
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 868f36fb34..62197fa8a7 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -200,7 +200,11 @@ namespace osu.Game.Skinning
             }
         }
 
-        private const double default_frame_time = 1000 / 60d;
+        /// <summary>
+        /// The frame length of each frame at a 60 FPS rate.
+        /// Default frame rate for legacy skin animations.
+        /// </summary>
+        public const double SIXTY_FRAME_TIME = 1000 / 60d;
 
         private static double getFrameLength(ISkin source, bool applyConfigFrameRate, Texture[] textures)
         {
@@ -214,7 +218,7 @@ namespace osu.Game.Skinning
                 return 1000f / textures.Length;
             }
 
-            return default_frame_time;
+            return SIXTY_FRAME_TIME;
         }
     }
 }

From 7373a9a784ce32d047d3a15eafe0dc946f2179d9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 20 Oct 2023 23:54:29 +0300
Subject: [PATCH 1956/2100] Remove unnecessary usage of `ApplyWithDoubledAlpha`

---
 .../Skinning/Legacy/LegacySliderBall.cs             | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index afc23921bf..5413b0c1d7 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -49,8 +50,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
                 LegacySkinExtensions.SIXTY_FRAME_TIME);
 
-            ball = skin.GetAnimation("sliderb", true, true, animationSeparator: "", frameLength: ballAnimationRate,
-                maxSize: OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE).AsNonNull();
+            Vector2 maxSize = OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE;
 
             InternalChildren = new[]
             {
@@ -58,19 +58,20 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE),
+                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(maxSize),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                LegacyColourCompatibility.ApplyWithDoubledAlpha(ball.With(d =>
+                ball = skin.GetAnimation("sliderb", true, true, animationSeparator: "", frameLength: ballAnimationRate, maxSize: maxSize).AsNonNull().With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;
-                }), ballColour),
+                    d.Colour = ballColour;
+                }),
                 layerSpec = new Sprite
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE),
+                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(maxSize),
                     Blending = BlendingParameters.Additive,
                 },
             };

From 80ce78e05dc2e97947c21520fb9fc7264259a9ea Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 19 Oct 2023 13:59:07 +0300
Subject: [PATCH 1957/2100] Remove animation support from osu! hit circle
 overlay

---
 .../Skinning/Legacy/LegacyMainCirclePiece.cs               | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 3ec914596a..d8d86d1802 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -62,12 +63,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // otherwise fall back to the default prefix "hitcircle".
             string circleName = (priorityLookupPrefix != null && skin.GetTexture(priorityLookupPrefix) != null) ? priorityLookupPrefix : @"hitcircle";
 
+            Vector2 maxSize = OsuHitObject.OBJECT_DIMENSIONS * 2;
+
             // at this point, any further texture fetches should be correctly using the priority source if the base texture was retrieved using it.
             // the conditional above handles the case where a sliderendcircle.png is retrieved from the skin, but sliderendcircleoverlay.png doesn't exist.
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(maxSize) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -76,7 +79,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2))
+                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(@$"{circleName}overlay")?.WithMaximumSize(maxSize) })
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,

From 2a70c331b9f9730c6e775fe3962cf1bf1c1e5fd1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 19 Oct 2023 14:01:13 +0300
Subject: [PATCH 1958/2100] Remove animation support from osu! slider reverse
 arrow

---
 .../Skinning/Legacy/LegacyReverseArrow.cs              | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index a535fbdbc3..780084115d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -8,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -41,11 +42,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
 
-            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2) ?? Empty()).With(d =>
+            InternalChild = arrow = new Sprite
             {
-                d.Anchor = Anchor.Centre;
-                d.Origin = Anchor.Centre;
-            });
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Texture = skin?.GetTexture(lookupName)?.WithMaximumSize(maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2),
+            };
 
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
 

From badb1310a38484955250757f78c3103be93d38c2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 19 Oct 2023 14:00:13 +0300
Subject: [PATCH 1959/2100] Adjust frame length of osu!mania judgement
 animation

---
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 446dfae0f6..73c521b2ed 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result])?.Value
                               ?? default_hit_result_skin_filenames[result];
 
-            var animation = this.GetAnimation(filename, true, true);
+            var animation = this.GetAnimation(filename, true, true, frameLength: 1000 / 20d);
             return animation == null ? null : new LegacyManiaJudgementPiece(result, animation);
         }
 

From 517d0f65b646daa784423dfdf1aae528f8448aaa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 21 Oct 2023 00:22:29 +0300
Subject: [PATCH 1960/2100] Adjust frame length of osu!mania hold-note body
 animation

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index 66e67136df..ee274fc45e 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             direction.BindTo(scrollingInfo.Direction);
             isHitting.BindTo(holdNote.IsHitting);
 
-            bodySprite = skin.GetAnimation(imageName, wrapMode, wrapMode, true, true).With(d =>
+            bodySprite = skin.GetAnimation(imageName, wrapMode, wrapMode, true, true, frameLength: 30).With(d =>
             {
                 if (d == null)
                     return;

From 491f119988f37e6264ccb7ebe3dfe3bb9e9d4b36 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 18 Oct 2023 20:56:17 +0300
Subject: [PATCH 1961/2100] Add animation support for legacy osu!mania column
 lights

---
 .../special-skin/mania/stage-light-0.png      | Bin 0 -> 5122 bytes
 .../special-skin/mania/stage-light-1.png      | Bin 0 -> 5124 bytes
 .../special-skin/mania/stage-light-2.png      | Bin 0 -> 5126 bytes
 .../special-skin/mania/stage-light-3.png      | Bin 0 -> 5125 bytes
 .../Resources/special-skin/skin.ini           |   2 ++
 .../Skinning/Legacy/LegacyColumnBackground.cs |  22 +++++++++---------
 .../Skinning/LegacyManiaSkinConfiguration.cs  |   1 +
 .../LegacyManiaSkinConfigurationLookup.cs     |   3 ++-
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs   |   5 ++++
 osu.Game/Skinning/LegacySkin.cs               |   3 +++
 10 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-0.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-1.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-2.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-3.png

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-0.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..5044c2d15f038bd606159113b8d44da9b86557e4
GIT binary patch
literal 5122
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
D8YOfc

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-1.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a3d61473906eea5bb149b3f2ac756325279d09f
GIT binary patch
literal 5124
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
BXuALa

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-2.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0aa0b3a02a31cc9dc22a41d3844c6958abadb1c
GIT binary patch
literal 5126
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
HJumaW3u|fS

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-3.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f9155b8f770ee62fa9cbe53ffc6f7fb191a561d
GIT binary patch
literal 5125
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
C94z$!

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
index 7c51036d69..3a9d465f8d 100644
--- a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
@@ -4,6 +4,7 @@ Version: 2.5
 [Mania]
 Keys: 4
 ColumnLineWidth: 3,1,3,1,1
+LightFramePerSecond: 15
 // some skins found in the wild had configuration keys where the @2x suffix was included in the values.
 // the expected compatibility behaviour is that the presence of the @2x suffix shouldn't change anything
 // if @2x assets are present.
@@ -15,5 +16,6 @@ Hit300: mania/hit300@2x
 Hit300g: mania/hit300g@2x
 StageLeft: mania/stage-left
 StageRight: mania/stage-right
+StageLight: mania/stage-light
 NoteImage0L: LongNoteTailWang
 NoteImage1L: LongNoteTailWang
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
index ab996519a7..4c65707d70 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -20,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Container lightContainer = null!;
-        private Sprite light = null!;
+        private Drawable? light = null!;
 
         public LegacyColumnBackground()
         {
@@ -39,6 +38,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             Color4 lightColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
                                  ?? Color4.White;
 
+            int lightFramePerSecond = skin.GetManiaSkinConfig<int>(LegacyManiaSkinConfigurationLookups.LightFramePerSecond)?.Value ?? 60;
+
             InternalChildren = new[]
             {
                 lightContainer = new Container
@@ -46,16 +47,15 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Bottom = lightPosition },
-                    Child = light = new Sprite
+                    Child = light = skin.GetAnimation(lightImage, true, true, frameLength: 1000d / lightFramePerSecond)?.With(l =>
                     {
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.BottomCentre,
-                        Colour = LegacyColourCompatibility.DisallowZeroAlpha(lightColour),
-                        Texture = skin.GetTexture(lightImage),
-                        RelativeSizeAxes = Axes.X,
-                        Width = 1,
-                        Alpha = 0
-                    }
+                        l.Anchor = Anchor.BottomCentre;
+                        l.Origin = Anchor.BottomCentre;
+                        l.Colour = LegacyColourCompatibility.DisallowZeroAlpha(lightColour);
+                        l.RelativeSizeAxes = Axes.X;
+                        l.Width = 1;
+                        l.Alpha = 0;
+                    }) ?? Empty(),
                 }
             };
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index f1c99a315d..9acb29a793 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Skinning
         public float ScorePosition = 300 * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
         public bool KeysUnderNotes;
+        public int LightFramePerSecond = 60;
 
         public LegacyNoteBodyStyle? NoteBodyStyle;
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 784e57708e..cacca0de23 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -74,6 +74,7 @@ namespace osu.Game.Skinning
         Hit50,
         Hit0,
         KeysUnderNotes,
-        NoteBodyStyle
+        NoteBodyStyle,
+        LightFramePerSecond
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index e880e3c1ed..b472afb74f 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -123,6 +123,11 @@ namespace osu.Game.Skinning
                         currentConfig.WidthForNoteHeightScale = (float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         break;
 
+                    case "LightFramePerSecond":
+                        int lightFramePerSecond = int.Parse(pair.Value, CultureInfo.InvariantCulture);
+                        currentConfig.LightFramePerSecond = lightFramePerSecond > 0 ? lightFramePerSecond : 24;
+                        break;
+
                     case string when pair.Key.StartsWith("Colour", StringComparison.Ordinal):
                         HandleColours(currentConfig, line, true);
                         break;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 76190d0abe..dc683f1dae 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -273,6 +273,9 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.KeysUnderNotes:
                     return SkinUtils.As<TValue>(new Bindable<bool>(existing.KeysUnderNotes));
+
+                case LegacyManiaSkinConfigurationLookups.LightFramePerSecond:
+                    return SkinUtils.As<TValue>(new Bindable<int>(existing.LightFramePerSecond));
             }
 
             return null;

From ab3b51e4a0a9042d1b20d08d64b2c47b2b6848bb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 19 Oct 2023 14:02:46 +0300
Subject: [PATCH 1962/2100] Refactor osu!taiko circle piece logic to read
 better

---
 .../Skinning/Legacy/LegacyCirclePiece.cs      | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 4dce3f1d4a..b512a46ce1 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         private static readonly Vector2 max_circle_sprite_size = new Vector2(160);
 
         private Drawable backgroundLayer = null!;
-        private Drawable? foregroundLayer;
+        private TextureAnimation? foregroundLayer;
 
         private Bindable<int> currentCombo { get; } = new BindableInt();
 
@@ -48,40 +48,44 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, DrawableHitObject drawableHitObject, IBeatSyncProvider? beatSyncProvider)
         {
-            Drawable? getDrawableFor(string lookup)
+            Drawable? getDrawableFor(string lookup, bool animatable)
             {
                 const string normal_hit = "taikohit";
                 const string big_hit = "taikobig";
 
                 string prefix = ((drawableHitObject.HitObject as TaikoStrongableHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
-                return skin.GetAnimation($"{prefix}{lookup}", true, false, maxSize: max_circle_sprite_size) ??
+                return skin.GetAnimation($"{prefix}{lookup}", animatable, false, maxSize: max_circle_sprite_size) ??
                        // fallback to regular size if "big" version doesn't exist.
-                       skin.GetAnimation($"{normal_hit}{lookup}", true, false, maxSize: max_circle_sprite_size);
+                       skin.GetAnimation($"{normal_hit}{lookup}", animatable, false, maxSize: max_circle_sprite_size);
             }
 
             // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer.
-            AddInternal(backgroundLayer = new LegacyKiaiFlashingDrawable(() => getDrawableFor("circle")));
+            AddInternal(backgroundLayer = new LegacyKiaiFlashingDrawable(() => getDrawableFor("circle", false))
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            });
+
+            foregroundLayer = (TextureAnimation?)getDrawableFor("circleoverlay", true);
 
-            foregroundLayer = getDrawableFor("circleoverlay");
             if (foregroundLayer != null)
+            {
+                foregroundLayer.Anchor = Anchor.Centre;
+                foregroundLayer.Origin = Anchor.Centre;
+
+                // 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.
+                foregroundLayer.Stop();
+
                 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)
-            {
-                (c as IFramedAnimation)?.Stop();
-
-                c.Anchor = Anchor.Centre;
-                c.Origin = Anchor.Centre;
-            }
-
             if (gameplayState != null)
                 currentCombo.BindTo(gameplayState.ScoreProcessor.Combo);
         }
@@ -101,12 +105,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             foreach (var c in InternalChildren)
                 c.Scale = new Vector2(DrawHeight / circle_piece_size.Y);
 
-            if (foregroundLayer is IFramedAnimation animatableForegroundLayer)
-                animateForegroundLayer(animatableForegroundLayer);
+            animateForegroundLayer();
         }
 
-        private void animateForegroundLayer(IFramedAnimation animatableForegroundLayer)
+        private void animateForegroundLayer()
         {
+            if (foregroundLayer == null)
+                return;
+
             int multiplier;
 
             if (currentCombo.Value >= 150)
@@ -119,12 +125,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             }
             else
             {
-                animatableForegroundLayer.GotoFrame(0);
+                foregroundLayer.GotoFrame(0);
                 return;
             }
 
             animationFrame = Math.Abs(Time.Current - timingPoint.Time) % ((timingPoint.BeatLength * 2) / multiplier) >= timingPoint.BeatLength / multiplier ? 0 : 1;
-            animatableForegroundLayer.GotoFrame(animationFrame);
+            foregroundLayer.GotoFrame(animationFrame);
         }
 
         private Color4 accentColour;

From 976ae62214a2314f2d2baa1249f6276374327e7e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 21 Oct 2023 01:10:06 +0300
Subject: [PATCH 1963/2100] Fix incorrect nullability specification

---
 .../Skinning/Legacy/LegacyColumnBackground.cs                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
index 4c65707d70..914ed79234 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Container lightContainer = null!;
-        private Drawable? light = null!;
+        private Drawable light = null!;
 
         public LegacyColumnBackground()
         {

From 71718bd761ffb237cd4f8d733352733a43aaf003 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 23 Sep 2023 07:04:51 +0300
Subject: [PATCH 1964/2100] Limit comment sprite height

---
 .../Comments/CommentMarkdownContainer.cs      | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index 278cef9112..c17e48ef8d 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -1,9 +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.
 
+#nullable disable
+
 using Markdig.Syntax;
+using Markdig.Syntax.Inlines;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics.Containers.Markdown;
+using osuTK;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -16,6 +24,8 @@ namespace osu.Game.Overlays.Comments
 
         protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new CommentMarkdownHeading(headingBlock);
 
+        public override MarkdownTextFlowContainer CreateTextFlow() => new CommentMarkdownTextFlowContainer();
+
         private partial class CommentMarkdownHeading : OsuMarkdownHeading
         {
             public CommentMarkdownHeading(HeadingBlock headingBlock)
@@ -40,5 +50,64 @@ namespace osu.Game.Overlays.Comments
                 }
             }
         }
+
+        private partial class CommentMarkdownTextFlowContainer : MarkdownTextFlowContainer
+        {
+            protected override void AddImage(LinkInline linkInline) => AddDrawable(new CommentMarkdownImage(linkInline.Url));
+
+            private partial class CommentMarkdownImage : MarkdownImage
+            {
+                public CommentMarkdownImage(string url)
+                    : base(url)
+                {
+                }
+
+                private DelayedLoadWrapper wrapper;
+
+                protected override Drawable CreateContent(string url) => wrapper = new DelayedLoadWrapper(CreateImageContainer(url));
+
+                protected override ImageContainer CreateImageContainer(string url)
+                {
+                    var container = new CommentImageContainer(url);
+                    container.OnLoadComplete += d =>
+                    {
+                        // The size of DelayedLoadWrapper depends on AutoSizeAxes of it's content.
+                        // But since it's set to None, we need to specify the size here manually.
+                        wrapper.Size = container.Size;
+                        d.FadeInFromZero(300, Easing.OutQuint);
+                    };
+                    return container;
+                }
+
+                private partial class CommentImageContainer : ImageContainer
+                {
+                    // https://github.com/ppy/osu-web/blob/3bd0f406dc78d60b356d955cd4201f8c3e1cca09/resources/css/bem/osu-md.less#L36
+                    // Web version defines max height in em units (6 em), which assuming default pixel size as 14 results in 84 px,
+                    // which also seems to match my observations upon expecting the web element.
+                    private const float max_height = 84f;
+
+                    public CommentImageContainer(string url)
+                        : base(url)
+                    {
+                        AutoSizeAxes = Axes.None;
+                    }
+
+                    protected override Sprite CreateImageSprite() => new Sprite
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    };
+
+                    protected override Texture GetImageTexture(TextureStore textures, string url)
+                    {
+                        Texture t = base.GetImageTexture(textures, url);
+
+                        if (t != null)
+                            Size = t.Height > 96 ? new Vector2(max_height / t.Height * t.Width, max_height) : t.Size;
+
+                        return t;
+                    }
+                }
+            }
+        }
     }
 }

From e1e9c3d7b377a574bc0dc32f7868683c858219a4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Oct 2023 00:33:26 +0300
Subject: [PATCH 1965/2100] Fix incorrect height limit

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

diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index c17e48ef8d..39894c642e 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Overlays.Comments
                         Texture t = base.GetImageTexture(textures, url);
 
                         if (t != null)
-                            Size = t.Height > 96 ? new Vector2(max_height / t.Height * t.Width, max_height) : t.Size;
+                            Size = t.Height > max_height ? new Vector2(max_height / t.Height * t.Width, max_height) : t.Size;
 
                         return t;
                     }

From fc1254ba47268bb51a547b0dd26945f744e17047 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 16:15:56 +0900
Subject: [PATCH 1966/2100] 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 c289ae89ee..848e17af1a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1014.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1023.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <PackageReference Include="SharpCompress" Version="0.34.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 4e057b446a475e7b2886df925e6d70fafeb8e979 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 16:46:15 +0900
Subject: [PATCH 1967/2100] Rename accumulated rotation variable

---
 .../Objects/Drawables/SpinnerSpinHistory.cs        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
index 1cf511f526..1c6c5b5d02 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
@@ -31,11 +31,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private readonly Stack<CompletedSpin> completedSpins = new Stack<CompletedSpin>();
 
         /// <summary>
-        /// The total accumulated rotation.
+        /// The total accumulated (absolute) rotation.
         /// </summary>
-        private float totalAbsoluteRotation;
+        private float totalAccumulatedRotation;
 
-        private float totalAbsoluteRotationAtLastCompletion;
+        private float totalAccumulatedRotationAtLastCompletion;
 
         /// <summary>
         /// For the current spin, represents the maximum absolute rotation (from 0..360) achieved by the user.
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// The current spin, from -360..360.
         /// </summary>
-        private float currentSpinRotation => totalAbsoluteRotation - totalAbsoluteRotationAtLastCompletion;
+        private float currentSpinRotation => totalAccumulatedRotation - totalAccumulatedRotationAtLastCompletion;
 
         private double lastReportTime = double.NegativeInfinity;
 
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             //
             // But this can come later.
 
-            totalAbsoluteRotation += delta;
+            totalAccumulatedRotation += delta;
 
             if (currentTime >= lastReportTime)
             {
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                     // Incrementing the last completion point will cause `currentSpinRotation` to
                     // hold the remaining spin that needs to be considered.
-                    totalAbsoluteRotationAtLastCompletion += direction * 360;
+                    totalAccumulatedRotationAtLastCompletion += direction * 360;
 
                     // Reset the current max as we are entering a new spin.
                     // Importantly, carry over the remainder (which is now stored in `currentSpinRotation`).
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 while (completedSpins.TryPeek(out var segment) && segment.CompletionTime > currentTime)
                 {
                     completedSpins.Pop();
-                    totalAbsoluteRotationAtLastCompletion -= segment.Direction * 360;
+                    totalAccumulatedRotationAtLastCompletion -= segment.Direction * 360;
                 }
 
                 // This is a best effort. We may not have enough data to match this 1:1, but that's okay.

From 0cf572d0295d26e6b7c842b1bd78000d3683282e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 23 Oct 2023 11:46:21 +0300
Subject: [PATCH 1968/2100] Use existing property and fix nullability

---
 .../Skinning/Legacy/LegacySliderBall.cs       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 5413b0c1d7..147c77bc03 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -37,18 +37,23 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableHitObject)
+        private void load()
         {
             var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
 
-            DrawableSlider drawableSlider = (DrawableSlider)drawableHitObject;
+            double? ballAnimationRate = null;
 
-            // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
-            double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
+            if (parentObject != null)
+            {
+                DrawableSlider drawableSlider = (DrawableSlider)parentObject;
 
-            double ballAnimationRate = Math.Max(
-                150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
-                LegacySkinExtensions.SIXTY_FRAME_TIME);
+                // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
+                double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
+
+                ballAnimationRate = Math.Max(
+                    150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
+                    LegacySkinExtensions.SIXTY_FRAME_TIME);
+            }
 
             Vector2 maxSize = OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE;
 

From ac1783fa94ca445320044723f82daf3726d39364 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 23 Oct 2023 13:26:59 +0300
Subject: [PATCH 1969/2100] Fix comment

---
 osu.Game/Overlays/Comments/CommentMarkdownContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index 39894c642e..2ec2313500 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -82,8 +82,8 @@ namespace osu.Game.Overlays.Comments
                 private partial class CommentImageContainer : ImageContainer
                 {
                     // https://github.com/ppy/osu-web/blob/3bd0f406dc78d60b356d955cd4201f8c3e1cca09/resources/css/bem/osu-md.less#L36
-                    // Web version defines max height in em units (6 em), which assuming default pixel size as 14 results in 84 px,
-                    // which also seems to match my observations upon expecting the web element.
+                    // Web version defines max height in em units (6 em), which assuming default font size as 14 results in 84 px,
+                    // which also seems to match observations upon inspecting the web element.
                     private const float max_height = 84f;
 
                     public CommentImageContainer(string url)

From b18a5e63b74ac6122fe9c30109ee7fe757b07c8a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 23 Oct 2023 13:29:46 +0300
Subject: [PATCH 1970/2100] Remove nullable disable

---
 osu.Game/Overlays/Comments/CommentMarkdownContainer.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index 2ec2313500..e48a52c787 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.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Syntax;
 using Markdig.Syntax.Inlines;
 using osu.Framework.Graphics;
@@ -62,7 +60,7 @@ namespace osu.Game.Overlays.Comments
                 {
                 }
 
-                private DelayedLoadWrapper wrapper;
+                private DelayedLoadWrapper wrapper = null!;
 
                 protected override Drawable CreateContent(string url) => wrapper = new DelayedLoadWrapper(CreateImageContainer(url));
 
@@ -104,7 +102,7 @@ namespace osu.Game.Overlays.Comments
                         if (t != null)
                             Size = t.Height > max_height ? new Vector2(max_height / t.Height * t.Width, max_height) : t.Size;
 
-                        return t;
+                        return t!;
                     }
                 }
             }

From 08b7c3d5ad30bed5353c171cf52b74fbb31a20a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 20:01:23 +0900
Subject: [PATCH 1971/2100] Remove test which makes less sense with new
 algorith

---
 .../SpinnerSpinHistoryTest.cs                       | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
index c20a7bbfd9..cd54873d36 100644
--- a/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
@@ -118,19 +118,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             Assert.That(history.TotalRotation, Is.EqualTo(180));
         }
 
-        [Test]
-        public void TestRewindIntoSegmentThatHasNotCrossedZero()
-        {
-            history.ReportDelta(1000, -180);
-            Assert.That(history.TotalRotation, Is.EqualTo(180));
-            history.ReportDelta(1500, 90);
-            Assert.That(history.TotalRotation, Is.EqualTo(180));
-            history.ReportDelta(2000, 450);
-            Assert.That(history.TotalRotation, Is.EqualTo(360));
-            history.ReportDelta(1750, -45);
-            Assert.That(history.TotalRotation, Is.EqualTo(315));
-        }
-
         [Test]
         public void TestRewindOverDirectionChange()
         {

From 15c1fcbf96cf1e64637ce7f583dde98333f1ca2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 20:28:12 +0900
Subject: [PATCH 1972/2100] Set `ManualClock` rate to 0 to avoid interpolation
 causing test errors

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs | 8 ++++++--
 osu.Game/Tests/Visual/OsuTestScene.cs                | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index 662734ddcd..531f88dff8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -160,7 +160,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestRewind()
         {
-            AddStep("set manual clock", () => manualClock = new ManualClock { Rate = 1 });
+            AddStep("set manual clock", () => manualClock = new ManualClock
+            {
+                // Avoids interpolation trying to run ahead during testing.
+                Rate = 0
+            });
 
             List<ReplayFrame> frames =
                 new SpinFramesGenerator(time_spinner_start)
@@ -214,7 +218,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 AddStep($"seek to {time}", () => clock.Seek(time));
                 // Lenience is required due to interpolation running slightly ahead on a stalled clock.
-                AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time).Within(40));
+                AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time));
             }
         }
 
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 096917cf4f..e1bbddd340 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -432,6 +432,8 @@ namespace osu.Game.Tests.Visual
 
                 private bool running;
 
+                public override double Rate => referenceClock.Rate;
+
                 public TrackVirtualManual(IFrameBasedClock referenceClock, string name = "virtual")
                     : base(name)
                 {

From d08ba764ddfb233125ade630490ef6e09ddaea6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 20:29:46 +0900
Subject: [PATCH 1973/2100] Add extended testing of rewind

---
 .../TestSceneSpinnerInput.cs                  | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index 531f88dff8..5a473409a4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             DrawableSpinner drawableSpinner = null!;
             AddUntilStep("get spinner", () => (drawableSpinner = currentPlayer.ChildrenOfType<DrawableSpinner>().Single()) != null);
 
-            assertTotalRotation(4000, 900);
+            assertFinalRotationCorrect();
             assertTotalRotation(3750, 810);
             assertTotalRotation(3500, 720);
             assertTotalRotation(3250, 530);
@@ -207,6 +207,26 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertTotalRotation(2000, 360);
             assertTotalRotation(1500, 0);
 
+            // same thing but always returning to final time to check.
+            assertFinalRotationCorrect();
+            assertTotalRotation(3750, 810);
+            assertFinalRotationCorrect();
+            assertTotalRotation(3500, 720);
+            assertFinalRotationCorrect();
+            assertTotalRotation(3250, 530);
+            assertFinalRotationCorrect();
+            assertTotalRotation(3000, 450);
+            assertFinalRotationCorrect();
+            assertTotalRotation(2750, 540);
+            assertFinalRotationCorrect();
+            assertTotalRotation(2500, 540);
+            assertFinalRotationCorrect();
+            assertTotalRotation(2250, 450);
+            assertFinalRotationCorrect();
+            assertTotalRotation(2000, 360);
+            assertFinalRotationCorrect();
+            assertTotalRotation(1500, 0);
+
             void assertTotalRotation(double time, float expected)
             {
                 addSeekStep(time);
@@ -220,6 +240,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 // Lenience is required due to interpolation running slightly ahead on a stalled clock.
                 AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time));
             }
+
+            void assertFinalRotationCorrect() => assertTotalRotation(4000, 900);
         }
 
         private void assertTicksHit(int count)

From baf4130f3adf314c3eac7deef89cde013cb9ba28 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 22:18:38 +0900
Subject: [PATCH 1974/2100] Fix test clock no longer accounting for rate
 changes

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index e1bbddd340..4860d3954e 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -432,7 +432,10 @@ namespace osu.Game.Tests.Visual
 
                 private bool running;
 
-                public override double Rate => referenceClock.Rate;
+                public override double Rate => base.Rate
+                                               // This is mainly to allow some tests to override the rate to zero
+                                               // and avoid interpolation.
+                                               * referenceClock.Rate;
 
                 public TrackVirtualManual(IFrameBasedClock referenceClock, string name = "virtual")
                     : base(name)

From cfd8d05fde5cb5cf0b45ff9284ae1182305e5c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 23 Oct 2023 21:26:25 +0200
Subject: [PATCH 1975/2100] Fix spinner ticks not playing samples correctly
 sometimes

Noticed this during work on https://github.com/ppy/osu/pull/25185.

In some circumstances, it seemed that spinner bonus ticks (and mostly
them specifically) would not always play with the correct volume.
Hours of debugging later pointed at a trace at
`DrawableAudioWrapper.refreshLayoutFromParent()` not firing sometimes.

Initially I thought it to be some sort of framework bug, but after
preparing a diff and running final checks, I noticed that sometimes
the sample was being played *by a `PoolableSkinnableSample` that wasn't
loaded*. And determining why *that* is the case turned out with this
diff.

As it happens, spinner ticks get assigned a start time proportionally,
i.e. the 1st of 10 ticks is placed at 10% of the duration, the 2nd
at 20%, and so on. The start time generally shouldn't matter,
because the spinner is manually judging the ticks. *However*, the ticks
*still* receive a lifetime start / end in the same way normal objects
do, which means that in some cases they can *not be alive* when they're
hit, which means that the `DrawableAudioWrapper` flow *hasn't had
a chance to run*, and rightly so.

To fix, ensure that all spinner ticks are alive throughout the entirety
of the spinner's duration.
---
 .../Objects/Drawables/DrawableSpinnerTick.cs  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 34253e3d4f..20fe7172ad 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -4,6 +4,8 @@
 #nullable disable
 
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -25,6 +27,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Origin = Anchor.Centre;
         }
 
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            // the tick can be theoretically judged at any point in the spinner's duration,
+            // so it must be alive throughout the spinner's entire lifetime.
+            // this mostly matters for correct sample playback.
+            LifetimeStart = DrawableSpinner.HitObject.StartTime;
+        }
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            base.UpdateHitStateTransforms(state);
+
+            // the tick can be theoretically judged at any point in the spinner's duration,
+            // so it must be alive throughout the spinner's entire lifetime (or until hit, whichever applies).
+            // this mostly matters for correct sample playback.
+            LifetimeEnd = (Result?.IsHit == true ? Result.TimeAbsolute : DrawableSpinner.HitObject.GetEndTime()) + (Samples?.Length ?? 0);
+        }
+
         /// <summary>
         /// Apply a judgement result.
         /// </summary>

From c5339f440e4a3c968a62235fc439b01539536dc4 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 23 Oct 2023 23:30:54 +0200
Subject: [PATCH 1976/2100] Apply code review suggestions

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 40 +++++++++++---------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 08fe86713a..33ddd08e09 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -46,11 +46,11 @@ namespace osu.Game.Screens.Select
             var openingBracketIndexes = new List<int>();
             var closingBracketIndexes = new List<int>();
 
-            populateIndexLists(ref query);
+            populateIndexLists(query);
 
             return performExtraction(ref query);
 
-            void populateIndexLists(ref string query)
+            void populateIndexLists(string query)
             {
                 bool currentlyBetweenBrackets = false;
 
@@ -58,24 +58,25 @@ namespace osu.Game.Screens.Select
                 {
                     switch (query[i])
                     {
-                        case '[' when !currentlyBetweenBrackets && (i == 0 || query[i - 1] == ' '):
-                            currentlyBetweenBrackets = true;
-                            openingBracketIndexes.Add(i + 1);
+                        case '[':
+                            if (!currentlyBetweenBrackets && (i == 0 || query[i - 1] == ' '))
+                            {
+                                currentlyBetweenBrackets = true;
+                                openingBracketIndexes.Add(i + 1);
+                            }
+
                             break;
 
-                        case ']' when currentlyBetweenBrackets && (i == query.Length - 1 || query[i + 1] == ' '):
-                            currentlyBetweenBrackets = false;
-                            closingBracketIndexes.Add(i);
+                        case ']':
+                            if (currentlyBetweenBrackets && (i == query.Length - 1 || query[i + 1] == ' '))
+                            {
+                                currentlyBetweenBrackets = false;
+                                closingBracketIndexes.Add(i);
+                            }
+
                             break;
                     }
                 }
-
-                if (currentlyBetweenBrackets)
-                {
-                    // If there is no "]" closing the current difficulty search query, append it.
-                    query += ']';
-                    closingBracketIndexes.Add(query.Length - 1);
-                }
             }
 
             string performExtraction(ref string query)
@@ -86,7 +87,10 @@ namespace osu.Game.Screens.Select
                 for (int i = 0; i < openingBracketIndexes.Count; i++)
                 {
                     int startIndex = openingBracketIndexes[i];
-                    int endIndex = closingBracketIndexes[i];
+
+                    int endIndex = closingBracketIndexes.Count > 0
+                        ? closingBracketIndexes[Math.Min(i, closingBracketIndexes.Count - 1)]
+                        : query.Length;
 
                     string searchText = originalQuery[startIndex..endIndex];
 
@@ -96,7 +100,9 @@ namespace osu.Game.Screens.Select
                             .Replace($" [{searchText}]", "")
                             .Replace($"[{searchText}] ", "")
                             .Replace($"[{searchText}]", "")
-                            .Replace($" [{searchText}] ", " ");
+                            .Replace($" [{searchText}] ", " ")
+                            .Replace($" [{searchText}", "")
+                            .Replace($"[{searchText}", "");
                 }
 
                 return string.Join(' ', searchTexts);

From ff66b74b0e5ab4f95967f3234a985f0b27e8a718 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 24 Oct 2023 02:24:00 +0300
Subject: [PATCH 1977/2100] Refactor logic to support DHO pooling

---
 .../Skinning/Legacy/LegacySliderBall.cs       | 77 ++++++++++++-------
 1 file changed, 51 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 147c77bc03..c3ffb6507c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -4,10 +4,11 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
@@ -24,10 +25,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private DrawableHitObject? parentObject { get; set; }
 
         private Sprite layerNd = null!;
-        private Drawable ball = null!;
         private Sprite layerSpec = null!;
 
-        public Color4 BallColour => ball.Colour;
+        private TextureAnimation ballAnimation = null!;
+        private Texture[] ballTextures = null!;
+
+        public Color4 BallColour => ballAnimation.Colour;
 
         public LegacySliderBall(ISkin skin)
         {
@@ -39,25 +42,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load()
         {
-            var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
-
-            double? ballAnimationRate = null;
-
-            if (parentObject != null)
-            {
-                DrawableSlider drawableSlider = (DrawableSlider)parentObject;
-
-                // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
-                double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
-
-                ballAnimationRate = Math.Max(
-                    150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
-                    LegacySkinExtensions.SIXTY_FRAME_TIME);
-            }
-
             Vector2 maxSize = OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE;
 
-            InternalChildren = new[]
+            var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
+            ballTextures = skin.GetTextures("sliderb", default, default, true, "", maxSize, out _);
+
+            InternalChildren = new Drawable[]
             {
                 layerNd = new Sprite
                 {
@@ -66,12 +56,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(maxSize),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                ball = skin.GetAnimation("sliderb", true, true, animationSeparator: "", frameLength: ballAnimationRate, maxSize: maxSize).AsNonNull().With(d =>
+                ballAnimation = new LegacySkinExtensions.SkinnableTextureAnimation
                 {
-                    d.Anchor = Anchor.Centre;
-                    d.Origin = Anchor.Centre;
-                    d.Colour = ballColour;
-                }),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Colour = ballColour,
+                },
                 layerSpec = new Sprite
                 {
                     Anchor = Anchor.Centre,
@@ -80,6 +70,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     Blending = BlendingParameters.Additive,
                 },
             };
+
+            if (parentObject != null)
+                parentObject.HitObjectApplied += onHitObjectApplied;
+
+            onHitObjectApplied(parentObject);
         }
 
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
@@ -96,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 if (skin.GetConfig<SkinConfiguration.LegacySetting, bool>(SkinConfiguration.LegacySetting.AllowSliderBallTint)?.Value == true)
                 {
                     accentColour.BindTo(parentObject.AccentColour);
-                    accentColour.BindValueChanged(a => ball.Colour = a.NewValue, true);
+                    accentColour.BindValueChanged(a => ballAnimation.Colour = a.NewValue, true);
                 }
             }
         }
@@ -112,6 +107,33 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             layerSpec.Rotation = -appliedRotation;
         }
 
+        private void onHitObjectApplied(DrawableHitObject? drawableObject = null)
+        {
+            if (drawableObject != null && drawableObject is not DrawableSlider)
+                return;
+
+            ballAnimation.ClearFrames();
+
+            double frameDelay;
+
+            if (drawableObject?.HitObject != null)
+            {
+                DrawableSlider drawableSlider = (DrawableSlider)drawableObject;
+
+                // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
+                double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
+
+                frameDelay = Math.Max(
+                    150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
+                    LegacySkinExtensions.SIXTY_FRAME_TIME);
+            }
+            else
+                frameDelay = LegacySkinExtensions.SIXTY_FRAME_TIME;
+
+            foreach (var texture in ballTextures)
+                ballAnimation.AddFrame(texture, frameDelay);
+        }
+
         private void updateStateTransforms(DrawableHitObject drawableObject, ArmedState _)
         {
             // Gets called by slider ticks, tails, etc., leading to duplicated
@@ -132,7 +154,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             base.Dispose(isDisposing);
 
             if (parentObject != null)
+            {
+                parentObject.HitObjectApplied -= onHitObjectApplied;
                 parentObject.ApplyCustomUpdateState -= updateStateTransforms;
+            }
         }
     }
 }

From bcbb77d3839028edf18535ac7976668c02cc7c6f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 24 Oct 2023 02:29:07 +0300
Subject: [PATCH 1978/2100] Fix incorrect assumption in taiko circle piece
 logic

---
 .../Skinning/Legacy/LegacyCirclePiece.cs      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index b512a46ce1..dbc8718f02 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         private static readonly Vector2 max_circle_sprite_size = new Vector2(160);
 
         private Drawable backgroundLayer = null!;
-        private TextureAnimation? foregroundLayer;
+        private Drawable? foregroundLayer;
 
         private Bindable<int> currentCombo { get; } = new BindableInt();
 
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 Origin = Anchor.Centre
             });
 
-            foregroundLayer = (TextureAnimation?)getDrawableFor("circleoverlay", true);
+            foregroundLayer = getDrawableFor("circleoverlay", true);
 
             if (foregroundLayer != null)
             {
@@ -76,7 +76,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
                 // 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.
-                foregroundLayer.Stop();
+                if (foregroundLayer is IFramedAnimation animatedForegroundLayer)
+                    animatedForegroundLayer.Stop();
 
                 AddInternal(foregroundLayer);
             }
@@ -105,14 +106,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             foreach (var c in InternalChildren)
                 c.Scale = new Vector2(DrawHeight / circle_piece_size.Y);
 
-            animateForegroundLayer();
+            if (foregroundLayer is IFramedAnimation animatedForegroundLayer)
+                animateForegroundLayer(animatedForegroundLayer);
         }
 
-        private void animateForegroundLayer()
+        private void animateForegroundLayer(IFramedAnimation animation)
         {
-            if (foregroundLayer == null)
-                return;
-
             int multiplier;
 
             if (currentCombo.Value >= 150)
@@ -125,12 +124,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             }
             else
             {
-                foregroundLayer.GotoFrame(0);
+                animation.GotoFrame(0);
                 return;
             }
 
             animationFrame = Math.Abs(Time.Current - timingPoint.Time) % ((timingPoint.BeatLength * 2) / multiplier) >= timingPoint.BeatLength / multiplier ? 0 : 1;
-            foregroundLayer.GotoFrame(animationFrame);
+            animation.GotoFrame(animationFrame);
         }
 
         private Color4 accentColour;

From 1591246afbeb9f7e2f503e4359f43adf1913454b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 13:53:31 +0900
Subject: [PATCH 1979/2100] Update country code names to match database

Required for ASS / osu-web cross-compatibility
---
 osu.Game/Users/CountryCode.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs
index 775de2bcf5..00092c72be 100644
--- a/osu.Game/Users/CountryCode.cs
+++ b/osu.Game/Users/CountryCode.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Users
         [Description("Belize")]
         BZ,
 
-        [Description("Russia")]
+        [Description("Russian Federation")]
         RU,
 
         [Description("Rwanda")]
@@ -639,7 +639,7 @@ namespace osu.Game.Users
         [Description("Trinidad and Tobago")]
         TT,
 
-        [Description("Turkey")]
+        [Description("Türkiye")]
         TR,
 
         [Description("Sri Lanka")]

From ded99c4097539fde80d0901748a07bce9ba6b31e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 14:32:03 +0900
Subject: [PATCH 1980/2100] Simplify calculation

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index c3ffb6507c..19aa5d31f3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -120,11 +120,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             {
                 DrawableSlider drawableSlider = (DrawableSlider)drawableObject;
 
-                // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
-                double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
-
                 frameDelay = Math.Max(
-                    150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
+                    0.15 / drawableSlider.HitObject.Velocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
                     LegacySkinExtensions.SIXTY_FRAME_TIME);
             }
             else

From 11c949d09144d57099d1be3fcd725eeaefaa0a8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 14:45:25 +0900
Subject: [PATCH 1981/2100] Sort countries alphabetically

---
 osu.Game/Users/CountryCode.cs | 1094 ++++++++++++++++-----------------
 1 file changed, 547 insertions(+), 547 deletions(-)

diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs
index 00092c72be..3e28b946f9 100644
--- a/osu.Game/Users/CountryCode.cs
+++ b/osu.Game/Users/CountryCode.cs
@@ -15,6 +15,60 @@ namespace osu.Game.Users
         [Description("Unknown")]
         Unknown = 0,
 
+        [Description("Andorra")]
+        AD,
+
+        [Description("United Arab Emirates")]
+        AE,
+
+        [Description("Afghanistan")]
+        AF,
+
+        [Description("Antigua and Barbuda")]
+        AG,
+
+        [Description("Anguilla")]
+        AI,
+
+        [Description("Albania")]
+        AL,
+
+        [Description("Armenia")]
+        AM,
+
+        [Description("Angola")]
+        AO,
+
+        [Description("Antarctica")]
+        AQ,
+
+        [Description("Argentina")]
+        AR,
+
+        [Description("American Samoa")]
+        AS,
+
+        [Description("Austria")]
+        AT,
+
+        [Description("Australia")]
+        AU,
+
+        [Description("Aruba")]
+        AW,
+
+        [Description("Aland Islands")]
+        AX,
+
+        [Description("Azerbaijan")]
+        AZ,
+
+        [Description("Bosnia and Herzegovina")]
+        BA,
+
+        [Description("Barbados")]
+        BB,
+
         [Description("Bangladesh")]
         BD,
 
@@ -27,14 +81,14 @@ namespace osu.Game.Users
         [Description("Bulgaria")]
         BG,
 
-        [Description("Bosnia and Herzegovina")]
-        BA,
+        [Description("Bahrain")]
+        BH,
 
-        [Description("Barbados")]
-        BB,
+        [Description("Burundi")]
+        BI,
 
-        [Description("Wallis and Futuna")]
-        WF,
+        [Description("Benin")]
+        BJ,
 
         [Description("Saint Barthelemy")]
         BL,
@@ -48,30 +102,6 @@ namespace osu.Game.Users
         [Description("Bolivia")]
         BO,
 
-        [Description("Bahrain")]
-        BH,
-
-        [Description("Burundi")]
-        BI,
-
-        [Description("Benin")]
-        BJ,
-
-        [Description("Bhutan")]
-        BT,
-
-        [Description("Jamaica")]
-        JM,
-
-        [Description("Bouvet Island")]
-        BV,
-
-        [Description("Botswana")]
-        BW,
-
-        [Description("Samoa")]
-        WS,
-
         [Description("Bonaire, Saint Eustatius and Saba")]
         BQ,
 
@@ -81,8 +111,14 @@ namespace osu.Game.Users
         [Description("Bahamas")]
         BS,
 
-        [Description("Jersey")]
-        JE,
+        [Description("Bhutan")]
+        BT,
+
+        [Description("Bouvet Island")]
+        BV,
+
+        [Description("Botswana")]
+        BW,
 
         [Description("Belarus")]
         BY,
@@ -90,179 +126,83 @@ namespace osu.Game.Users
         [Description("Belize")]
         BZ,
 
-        [Description("Russian Federation")]
-        RU,
+        [Description("Canada")]
+        CA,
 
-        [Description("Rwanda")]
-        RW,
+        [Description("Cocos Islands")]
+        CC,
 
-        [Description("Serbia")]
-        RS,
+        [Description("Democratic Republic of the Congo")]
+        CD,
 
-        [Description("East Timor")]
-        TL,
+        [Description("Central African Republic")]
+        CF,
 
-        [Description("Reunion")]
-        RE,
+        [Description("Republic of the Congo")]
+        CG,
 
-        [Description("Turkmenistan")]
-        TM,
+        [Description("Switzerland")]
+        CH,
 
-        [Description("Tajikistan")]
-        TJ,
+        [Description("Ivory Coast")]
+        CI,
 
-        [Description("Romania")]
-        RO,
+        [Description("Cook Islands")]
+        CK,
 
-        [Description("Tokelau")]
-        TK,
+        [Description("Chile")]
+        CL,
 
-        [Description("Guinea-Bissau")]
-        GW,
+        [Description("Cameroon")]
+        CM,
 
-        [Description("Guam")]
-        GU,
+        [Description("China")]
+        CN,
 
-        [Description("Guatemala")]
-        GT,
+        [Description("Colombia")]
+        CO,
 
-        [Description("South Georgia and the South Sandwich Islands")]
-        GS,
+        [Description("Costa Rica")]
+        CR,
 
-        [Description("Greece")]
-        GR,
+        [Description("Cuba")]
+        CU,
 
-        [Description("Equatorial Guinea")]
-        GQ,
+        [Description("Cabo Verde")]
+        CV,
 
-        [Description("Guadeloupe")]
-        GP,
+        [Description("Curacao")]
+        CW,
 
-        [Description("Japan")]
-        JP,
+        [Description("Christmas Island")]
+        CX,
 
-        [Description("Guyana")]
-        GY,
+        [Description("Cyprus")]
+        CY,
 
-        [Description("Guernsey")]
-        GG,
+        [Description("Czech Republic")]
+        CZ,
 
-        [Description("French Guiana")]
-        GF,
+        [Description("Germany")]
+        DE,
 
-        [Description("Georgia")]
-        GE,
+        [Description("Djibouti")]
+        DJ,
 
-        [Description("Grenada")]
-        GD,
+        [Description("Denmark")]
+        DK,
 
-        [Description("United Kingdom")]
-        GB,
+        [Description("Dominica")]
+        DM,
 
-        [Description("Gabon")]
-        GA,
+        [Description("Dominican Republic")]
+        DO,
 
-        [Description("El Salvador")]
-        SV,
+        [Description("Algeria")]
+        DZ,
 
-        [Description("Guinea")]
-        GN,
-
-        [Description("Gambia")]
-        GM,
-
-        [Description("Greenland")]
-        GL,
-
-        [Description("Gibraltar")]
-        GI,
-
-        [Description("Ghana")]
-        GH,
-
-        [Description("Oman")]
-        OM,
-
-        [Description("Tunisia")]
-        TN,
-
-        [Description("Jordan")]
-        JO,
-
-        [Description("Croatia")]
-        HR,
-
-        [Description("Haiti")]
-        HT,
-
-        [Description("Hungary")]
-        HU,
-
-        [Description("Hong Kong")]
-        HK,
-
-        [Description("Honduras")]
-        HN,
-
-        [Description("Heard Island and McDonald Islands")]
-        HM,
-
-        [Description("Venezuela")]
-        VE,
-
-        [Description("Puerto Rico")]
-        PR,
-
-        [Description("Palestinian Territory")]
-        PS,
-
-        [Description("Palau")]
-        PW,
-
-        [Description("Portugal")]
-        PT,
-
-        [Description("Svalbard and Jan Mayen")]
-        SJ,
-
-        [Description("Paraguay")]
-        PY,
-
-        [Description("Iraq")]
-        IQ,
-
-        [Description("Panama")]
-        PA,
-
-        [Description("French Polynesia")]
-        PF,
-
-        [Description("Papua New Guinea")]
-        PG,
-
-        [Description("Peru")]
-        PE,
-
-        [Description("Pakistan")]
-        PK,
-
-        [Description("Philippines")]
-        PH,
-
-        [Description("Pitcairn")]
-        PN,
-
-        [Description("Poland")]
-        PL,
-
-        [Description("Saint Pierre and Miquelon")]
-        PM,
-
-        [Description("Zambia")]
-        ZM,
-
-        [Description("Western Sahara")]
-        EH,
+        [Description("Ecuador")]
+        EC,
 
         [Description("Estonia")]
         EE,
@@ -270,128 +210,17 @@ namespace osu.Game.Users
         [Description("Egypt")]
         EG,
 
-        [Description("South Africa")]
-        ZA,
-
-        [Description("Ecuador")]
-        EC,
-
-        [Description("Italy")]
-        IT,
-
-        [Description("Vietnam")]
-        VN,
-
-        [Description("Solomon Islands")]
-        SB,
-
-        [Description("Ethiopia")]
-        ET,
-
-        [Description("Somalia")]
-        SO,
-
-        [Description("Zimbabwe")]
-        ZW,
-
-        [Description("Saudi Arabia")]
-        SA,
-
-        [Description("Spain")]
-        ES,
+        [Description("Western Sahara")]
+        EH,
 
         [Description("Eritrea")]
         ER,
 
-        [Description("Montenegro")]
-        ME,
+        [Description("Spain")]
+        ES,
 
-        [Description("Moldova")]
-        MD,
-
-        [Description("Madagascar")]
-        MG,
-
-        [Description("Saint Martin")]
-        MF,
-
-        [Description("Morocco")]
-        MA,
-
-        [Description("Monaco")]
-        MC,
-
-        [Description("Uzbekistan")]
-        UZ,
-
-        [Description("Myanmar")]
-        MM,
-
-        [Description("Mali")]
-        ML,
-
-        [Description("Macao")]
-        MO,
-
-        [Description("Mongolia")]
-        MN,
-
-        [Description("Marshall Islands")]
-        MH,
-
-        [Description("North Macedonia")]
-        MK,
-
-        [Description("Mauritius")]
-        MU,
-
-        [Description("Malta")]
-        MT,
-
-        [Description("Malawi")]
-        MW,
-
-        [Description("Maldives")]
-        MV,
-
-        [Description("Martinique")]
-        MQ,
-
-        [Description("Northern Mariana Islands")]
-        MP,
-
-        [Description("Montserrat")]
-        MS,
-
-        [Description("Mauritania")]
-        MR,
-
-        [Description("Isle of Man")]
-        IM,
-
-        [Description("Uganda")]
-        UG,
-
-        [Description("Tanzania")]
-        TZ,
-
-        [Description("Malaysia")]
-        MY,
-
-        [Description("Mexico")]
-        MX,
-
-        [Description("Israel")]
-        IL,
-
-        [Description("France")]
-        FR,
-
-        [Description("British Indian Ocean Territory")]
-        IO,
-
-        [Description("Saint Helena")]
-        SH,
+        [Description("Ethiopia")]
+        ET,
 
         [Description("Finland")]
         FI,
@@ -408,21 +237,264 @@ namespace osu.Game.Users
         [Description("Faroe Islands")]
         FO,
 
-        [Description("Nicaragua")]
-        NI,
+        [Description("France")]
+        FR,
 
-        [Description("Netherlands")]
-        NL,
+        [Description("Gabon")]
+        GA,
 
-        [Description("Norway")]
-        NO,
+        [Description("United Kingdom")]
+        GB,
+
+        [Description("Grenada")]
+        GD,
+
+        [Description("Georgia")]
+        GE,
+
+        [Description("French Guiana")]
+        GF,
+
+        [Description("Guernsey")]
+        GG,
+
+        [Description("Ghana")]
+        GH,
+
+        [Description("Gibraltar")]
+        GI,
+
+        [Description("Greenland")]
+        GL,
+
+        [Description("Gambia")]
+        GM,
+
+        [Description("Guinea")]
+        GN,
+
+        [Description("Guadeloupe")]
+        GP,
+
+        [Description("Equatorial Guinea")]
+        GQ,
+
+        [Description("Greece")]
+        GR,
+
+        [Description("South Georgia and the South Sandwich Islands")]
+        GS,
+
+        [Description("Guatemala")]
+        GT,
+
+        [Description("Guam")]
+        GU,
+
+        [Description("Guinea-Bissau")]
+        GW,
+
+        [Description("Guyana")]
+        GY,
+
+        [Description("Hong Kong")]
+        HK,
+
+        [Description("Heard Island and McDonald Islands")]
+        HM,
+
+        [Description("Honduras")]
+        HN,
+
+        [Description("Croatia")]
+        HR,
+
+        [Description("Haiti")]
+        HT,
+
+        [Description("Hungary")]
+        HU,
+
+        [Description("Indonesia")]
+        ID,
+
+        [Description("Ireland")]
+        IE,
+
+        [Description("Israel")]
+        IL,
+
+        [Description("Isle of Man")]
+        IM,
+
+        [Description("India")]
+        IN,
+
+        [Description("British Indian Ocean Territory")]
+        IO,
+
+        [Description("Iraq")]
+        IQ,
+
+        [Description("Iran")]
+        IR,
+
+        [Description("Iceland")]
+        IS,
+
+        [Description("Italy")]
+        IT,
+
+        [Description("Jersey")]
+        JE,
+
+        [Description("Jamaica")]
+        JM,
+
+        [Description("Jordan")]
+        JO,
+
+        [Description("Japan")]
+        JP,
+
+        [Description("Kenya")]
+        KE,
+
+        [Description("Kyrgyzstan")]
+        KG,
+
+        [Description("Cambodia")]
+        KH,
+
+        [Description("Kiribati")]
+        KI,
+
+        [Description("Comoros")]
+        KM,
+
+        [Description("Saint Kitts and Nevis")]
+        KN,
+
+        [Description("North Korea")]
+        KP,
+
+        [Description("South Korea")]
+        KR,
+
+        [Description("Kuwait")]
+        KW,
+
+        [Description("Cayman Islands")]
+        KY,
+
+        [Description("Kazakhstan")]
+        KZ,
+
+        [Description("Laos")]
+        LA,
+
+        [Description("Lebanon")]
+        LB,
+
+        [Description("Saint Lucia")]
+        LC,
+
+        [Description("Liechtenstein")]
+        LI,
+
+        [Description("Sri Lanka")]
+        LK,
+
+        [Description("Liberia")]
+        LR,
+
+        [Description("Lesotho")]
+        LS,
+
+        [Description("Lithuania")]
+        LT,
+
+        [Description("Luxembourg")]
+        LU,
+
+        [Description("Latvia")]
+        LV,
+
+        [Description("Libya")]
+        LY,
+
+        [Description("Morocco")]
+        MA,
+
+        [Description("Monaco")]
+        MC,
+
+        [Description("Moldova")]
+        MD,
+
+        [Description("Montenegro")]
+        ME,
+
+        [Description("Saint Martin")]
+        MF,
+
+        [Description("Madagascar")]
+        MG,
+
+        [Description("Marshall Islands")]
+        MH,
+
+        [Description("North Macedonia")]
+        MK,
+
+        [Description("Mali")]
+        ML,
+
+        [Description("Myanmar")]
+        MM,
+
+        [Description("Mongolia")]
+        MN,
+
+        [Description("Macao")]
+        MO,
+
+        [Description("Northern Mariana Islands")]
+        MP,
+
+        [Description("Martinique")]
+        MQ,
+
+        [Description("Mauritania")]
+        MR,
+
+        [Description("Montserrat")]
+        MS,
+
+        [Description("Malta")]
+        MT,
+
+        [Description("Mauritius")]
+        MU,
+
+        [Description("Maldives")]
+        MV,
+
+        [Description("Malawi")]
+        MW,
+
+        [Description("Mexico")]
+        MX,
+
+        [Description("Malaysia")]
+        MY,
+
+        [Description("Mozambique")]
+        MZ,
 
         [Description("Namibia")]
         NA,
 
-        [Description("Vanuatu")]
-        VU,
-
         [Description("New Caledonia")]
         NC,
 
@@ -435,8 +507,14 @@ namespace osu.Game.Users
         [Description("Nigeria")]
         NG,
 
-        [Description("New Zealand")]
-        NZ,
+        [Description("Nicaragua")]
+        NI,
+
+        [Description("Netherlands")]
+        NL,
+
+        [Description("Norway")]
+        NO,
 
         [Description("Nepal")]
         NP,
@@ -447,227 +525,140 @@ namespace osu.Game.Users
         [Description("Niue")]
         NU,
 
-        [Description("Cook Islands")]
-        CK,
+        [Description("New Zealand")]
+        NZ,
 
-        [Description("Kosovo")]
-        XK,
+        [Description("Oman")]
+        OM,
 
-        [Description("Ivory Coast")]
-        CI,
+        [Description("Panama")]
+        PA,
 
-        [Description("Switzerland")]
-        CH,
+        [Description("Peru")]
+        PE,
 
-        [Description("Colombia")]
-        CO,
+        [Description("French Polynesia")]
+        PF,
 
-        [Description("China")]
-        CN,
+        [Description("Papua New Guinea")]
+        PG,
 
-        [Description("Cameroon")]
-        CM,
+        [Description("Philippines")]
+        PH,
 
-        [Description("Chile")]
-        CL,
+        [Description("Pakistan")]
+        PK,
 
-        [Description("Cocos Islands")]
-        CC,
+        [Description("Poland")]
+        PL,
 
-        [Description("Canada")]
-        CA,
+        [Description("Saint Pierre and Miquelon")]
+        PM,
 
-        [Description("Republic of the Congo")]
-        CG,
+        [Description("Pitcairn")]
+        PN,
 
-        [Description("Central African Republic")]
-        CF,
+        [Description("Puerto Rico")]
+        PR,
 
-        [Description("Democratic Republic of the Congo")]
-        CD,
+        [Description("Palestinian Territory")]
+        PS,
 
-        [Description("Czech Republic")]
-        CZ,
+        [Description("Portugal")]
+        PT,
 
-        [Description("Cyprus")]
-        CY,
+        [Description("Palau")]
+        PW,
 
-        [Description("Christmas Island")]
-        CX,
+        [Description("Paraguay")]
+        PY,
 
-        [Description("Costa Rica")]
-        CR,
+        [Description("Qatar")]
+        QA,
 
-        [Description("Curacao")]
-        CW,
+        [Description("Reunion")]
+        RE,
 
-        [Description("Cabo Verde")]
-        CV,
+        [Description("Romania")]
+        RO,
 
-        [Description("Cuba")]
-        CU,
+        [Description("Serbia")]
+        RS,
 
-        [Description("Eswatini")]
-        SZ,
+        [Description("Russian Federation")]
+        RU,
 
-        [Description("Syria")]
-        SY,
+        [Description("Rwanda")]
+        RW,
 
-        [Description("Sint Maarten")]
-        SX,
+        [Description("Saudi Arabia")]
+        SA,
 
-        [Description("Kyrgyzstan")]
-        KG,
-
-        [Description("Kenya")]
-        KE,
-
-        [Description("South Sudan")]
-        SS,
-
-        [Description("Suriname")]
-        SR,
-
-        [Description("Kiribati")]
-        KI,
-
-        [Description("Cambodia")]
-        KH,
-
-        [Description("Saint Kitts and Nevis")]
-        KN,
-
-        [Description("Comoros")]
-        KM,
-
-        [Description("Sao Tome and Principe")]
-        ST,
-
-        [Description("Slovakia")]
-        SK,
-
-        [Description("South Korea")]
-        KR,
-
-        [Description("Slovenia")]
-        SI,
-
-        [Description("North Korea")]
-        KP,
-
-        [Description("Kuwait")]
-        KW,
-
-        [Description("Senegal")]
-        SN,
-
-        [Description("San Marino")]
-        SM,
-
-        [Description("Sierra Leone")]
-        SL,
+        [Description("Solomon Islands")]
+        SB,
 
         [Description("Seychelles")]
         SC,
 
-        [Description("Kazakhstan")]
-        KZ,
-
-        [Description("Cayman Islands")]
-        KY,
-
-        [Description("Singapore")]
-        SG,
+        [Description("Sudan")]
+        SD,
 
         [Description("Sweden")]
         SE,
 
-        [Description("Sudan")]
-        SD,
+        [Description("Singapore")]
+        SG,
 
-        [Description("Dominican Republic")]
-        DO,
+        [Description("Saint Helena")]
+        SH,
 
-        [Description("Dominica")]
-        DM,
+        [Description("Slovenia")]
+        SI,
 
-        [Description("Djibouti")]
-        DJ,
+        [Description("Svalbard and Jan Mayen")]
+        SJ,
 
-        [Description("Denmark")]
-        DK,
+        [Description("Slovakia")]
+        SK,
 
-        [Description("British Virgin Islands")]
-        VG,
+        [Description("Sierra Leone")]
+        SL,
 
-        [Description("Germany")]
-        DE,
+        [Description("San Marino")]
+        SM,
 
-        [Description("Yemen")]
-        YE,
+        [Description("Senegal")]
+        SN,
 
-        [Description("Algeria")]
-        DZ,
+        [Description("Somalia")]
+        SO,
 
-        [Description("United States")]
-        US,
+        [Description("Suriname")]
+        SR,
 
-        [Description("Uruguay")]
-        UY,
+        [Description("South Sudan")]
+        SS,
 
-        [Description("Mayotte")]
-        YT,
+        [Description("Sao Tome and Principe")]
+        ST,
 
-        [Description("United States Minor Outlying Islands")]
-        UM,
+        [Description("El Salvador")]
+        SV,
 
-        [Description("Lebanon")]
-        LB,
+        [Description("Sint Maarten")]
+        SX,
 
-        [Description("Saint Lucia")]
-        LC,
+        [Description("Syria")]
+        SY,
 
-        [Description("Laos")]
-        LA,
+        [Description("Eswatini")]
+        SZ,
 
-        [Description("Tuvalu")]
-        TV,
+        [Description("Turks and Caicos Islands")]
+        TC,
 
-        [Description("Taiwan")]
-        TW,
-
-        [Description("Trinidad and Tobago")]
-        TT,
-
-        [Description("Türkiye")]
-        TR,
-
-        [Description("Sri Lanka")]
-        LK,
-
-        [Description("Liechtenstein")]
-        LI,
-
-        [Description("Latvia")]
-        LV,
-
-        [Description("Tonga")]
-        TO,
-
-        [Description("Lithuania")]
-        LT,
-
-        [Description("Luxembourg")]
-        LU,
-
-        [Description("Liberia")]
-        LR,
-
-        [Description("Lesotho")]
-        LS,
-
-        [Description("Thailand")]
-        TH,
+        [Description("Chad")]
+        TD,
 
         [Description("French Southern Territories")]
         TF,
@@ -675,14 +666,59 @@ namespace osu.Game.Users
         [Description("Togo")]
         TG,
 
-        [Description("Chad")]
-        TD,
+        [Description("Thailand")]
+        TH,
 
-        [Description("Turks and Caicos Islands")]
-        TC,
+        [Description("Tajikistan")]
+        TJ,
 
-        [Description("Libya")]
-        LY,
+        [Description("Tokelau")]
+        TK,
+
+        [Description("East Timor")]
+        TL,
+
+        [Description("Turkmenistan")]
+        TM,
+
+        [Description("Tunisia")]
+        TN,
+
+        [Description("Tonga")]
+        TO,
+
+        [Description("Türkiye")]
+        TR,
+
+        [Description("Trinidad and Tobago")]
+        TT,
+
+        [Description("Tuvalu")]
+        TV,
+
+        [Description("Taiwan")]
+        TW,
+
+        [Description("Tanzania")]
+        TZ,
+
+        [Description("Ukraine")]
+        UA,
+
+        [Description("Uganda")]
+        UG,
+
+        [Description("United States Minor Outlying Islands")]
+        UM,
+
+        [Description("United States")]
+        US,
+
+        [Description("Uruguay")]
+        UY,
+
+        [Description("Uzbekistan")]
+        UZ,
 
         [Description("Vatican")]
         VA,
@@ -690,79 +726,43 @@ namespace osu.Game.Users
         [Description("Saint Vincent and the Grenadines")]
         VC,
 
-        [Description("United Arab Emirates")]
-        AE,
+        [Description("Venezuela")]
+        VE,
 
-        [Description("Andorra")]
-        AD,
-
-        [Description("Antigua and Barbuda")]
-        AG,
-
-        [Description("Afghanistan")]
-        AF,
-
-        [Description("Anguilla")]
-        AI,
+        [Description("British Virgin Islands")]
+        VG,
 
         [Description("U.S. Virgin Islands")]
         VI,
 
-        [Description("Iceland")]
-        IS,
+        [Description("Vietnam")]
+        VN,
 
-        [Description("Iran")]
-        IR,
+        [Description("Vanuatu")]
+        VU,
 
-        [Description("Armenia")]
-        AM,
+        [Description("Wallis and Futuna")]
+        WF,
 
-        [Description("Albania")]
-        AL,
+        [Description("Samoa")]
+        WS,
 
-        [Description("Angola")]
-        AO,
+        [Description("Kosovo")]
+        XK,
 
-        [Description("Antarctica")]
-        AQ,
+        [Description("Yemen")]
+        YE,
 
-        [Description("American Samoa")]
-        AS,
+        [Description("Mayotte")]
+        YT,
 
-        [Description("Argentina")]
-        AR,
+        [Description("South Africa")]
+        ZA,
 
-        [Description("Australia")]
-        AU,
+        [Description("Zambia")]
+        ZM,
 
-        [Description("Austria")]
-        AT,
-
-        [Description("Aruba")]
-        AW,
-
-        [Description("India")]
-        IN,
-
-        [Description("Aland Islands")]
-        AX,
-
-        [Description("Azerbaijan")]
-        AZ,
-
-        [Description("Ireland")]
-        IE,
-
-        [Description("Indonesia")]
-        ID,
-
-        [Description("Ukraine")]
-        UA,
-
-        [Description("Qatar")]
-        QA,
-
-        [Description("Mozambique")]
-        MZ,
+        [Description("Zimbabwe")]
+        ZW,
     }
 }

From 17070707b5fbdbaeef32804b0154e45143f03b3d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 14:46:58 +0900
Subject: [PATCH 1982/2100] Update and add remaining country codes to match
 database

---
 osu.Game/Users/CountryCode.cs | 64 ++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs
index 3e28b946f9..e56cdf0dfd 100644
--- a/osu.Game/Users/CountryCode.cs
+++ b/osu.Game/Users/CountryCode.cs
@@ -15,6 +15,12 @@ namespace osu.Game.Users
         [Description("Unknown")]
         Unknown = 0,
 
+        [Description("Anonymous Proxy")]
+        A1,
+
+        [Description("Satellite Provider")]
+        A2,
+
         [Description("Andorra")]
         AD,
 
@@ -36,9 +42,15 @@ namespace osu.Game.Users
         [Description("Armenia")]
         AM,
 
+        [Description("Netherlands Antilles")]
+        AN,
+
         [Description("Angola")]
         AO,
 
+        [Description("Asia/Pacific Region")]
+        AP,
+
         [Description("Antarctica")]
         AQ,
 
@@ -102,7 +114,7 @@ namespace osu.Game.Users
         [Description("Bolivia")]
         BO,
 
-        [Description("Bonaire, Saint Eustatius and Saba")]
+        [Description("Caribbean Netherlands")]
         BQ,
 
         [Description("Brazil")]
@@ -129,22 +141,22 @@ namespace osu.Game.Users
         [Description("Canada")]
         CA,
 
-        [Description("Cocos Islands")]
+        [Description("Cocos (Keeling) Islands")]
         CC,
 
-        [Description("Democratic Republic of the Congo")]
+        [Description("The Democratic Republic of the Congo")]
         CD,
 
         [Description("Central African Republic")]
         CF,
 
-        [Description("Republic of the Congo")]
+        [Description("Congo")]
         CG,
 
         [Description("Switzerland")]
         CH,
 
-        [Description("Ivory Coast")]
+        [Description("Cote D'Ivoire")]
         CI,
 
         [Description("Cook Islands")]
@@ -171,7 +183,7 @@ namespace osu.Game.Users
         [Description("Cabo Verde")]
         CV,
 
-        [Description("Curacao")]
+        [Description("Curaçao")]
         CW,
 
         [Description("Christmas Island")]
@@ -180,7 +192,7 @@ namespace osu.Game.Users
         [Description("Cyprus")]
         CY,
 
-        [Description("Czech Republic")]
+        [Description("Czechia")]
         CZ,
 
         [Description("Germany")]
@@ -222,16 +234,19 @@ namespace osu.Game.Users
         [Description("Ethiopia")]
         ET,
 
+        [Description("Europe")]
+        EU,
+
         [Description("Finland")]
         FI,
 
         [Description("Fiji")]
         FJ,
 
-        [Description("Falkland Islands")]
+        [Description("Falkland Islands (Malvinas)")]
         FK,
 
-        [Description("Micronesia")]
+        [Description("Federated States of Micronesia")]
         FM,
 
         [Description("Faroe Islands")]
@@ -240,6 +255,9 @@ namespace osu.Game.Users
         [Description("France")]
         FR,
 
+        [Description("France, Metropolitan")]
+        FX,
+
         [Description("Gabon")]
         GA,
 
@@ -336,7 +354,7 @@ namespace osu.Game.Users
         [Description("Iraq")]
         IQ,
 
-        [Description("Iran")]
+        [Description("Islamic Republic of Iran")]
         IR,
 
         [Description("Iceland")]
@@ -375,7 +393,7 @@ namespace osu.Game.Users
         [Description("Saint Kitts and Nevis")]
         KN,
 
-        [Description("North Korea")]
+        [Description("Democratic People's Republic of Korea")]
         KP,
 
         [Description("South Korea")]
@@ -390,7 +408,7 @@ namespace osu.Game.Users
         [Description("Kazakhstan")]
         KZ,
 
-        [Description("Laos")]
+        [Description("Lao People's Democratic Republic")]
         LA,
 
         [Description("Lebanon")]
@@ -456,7 +474,7 @@ namespace osu.Game.Users
         [Description("Mongolia")]
         MN,
 
-        [Description("Macao")]
+        [Description("Macau")]
         MO,
 
         [Description("Northern Mariana Islands")]
@@ -528,6 +546,9 @@ namespace osu.Game.Users
         [Description("New Zealand")]
         NZ,
 
+        [Description("Other")]
+        O1,
+
         [Description("Oman")]
         OM,
 
@@ -561,7 +582,7 @@ namespace osu.Game.Users
         [Description("Puerto Rico")]
         PR,
 
-        [Description("Palestinian Territory")]
+        [Description("State of Palestine")]
         PS,
 
         [Description("Portugal")]
@@ -636,9 +657,6 @@ namespace osu.Game.Users
         [Description("Suriname")]
         SR,
 
-        [Description("South Sudan")]
-        SS,
-
         [Description("Sao Tome and Principe")]
         ST,
 
@@ -648,7 +666,7 @@ namespace osu.Game.Users
         [Description("Sint Maarten")]
         SX,
 
-        [Description("Syria")]
+        [Description("Syrian Arab Republic")]
         SY,
 
         [Description("Eswatini")]
@@ -675,7 +693,7 @@ namespace osu.Game.Users
         [Description("Tokelau")]
         TK,
 
-        [Description("East Timor")]
+        [Description("Timor-Leste")]
         TL,
 
         [Description("Turkmenistan")]
@@ -699,7 +717,7 @@ namespace osu.Game.Users
         [Description("Taiwan")]
         TW,
 
-        [Description("Tanzania")]
+        [Description("United Republic of Tanzania")]
         TZ,
 
         [Description("Ukraine")]
@@ -720,7 +738,7 @@ namespace osu.Game.Users
         [Description("Uzbekistan")]
         UZ,
 
-        [Description("Vatican")]
+        [Description("Holy See (Vatican City State)")]
         VA,
 
         [Description("Saint Vincent and the Grenadines")]
@@ -729,10 +747,10 @@ namespace osu.Game.Users
         [Description("Venezuela")]
         VE,
 
-        [Description("British Virgin Islands")]
+        [Description("Virgin Islands, British")]
         VG,
 
-        [Description("U.S. Virgin Islands")]
+        [Description("Virgin Islands, U.S.")]
         VI,
 
         [Description("Vietnam")]

From 127482919329740ef82670e0760c467c1d2e3718 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 14:51:40 +0900
Subject: [PATCH 1983/2100] Block scroll and click operations on the left side
 of song select

---
 osu.Game/Screens/Select/SongSelect.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f792f3e4f5..d5ec94ad71 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -238,7 +238,7 @@ namespace osu.Game.Screens.Select
                                         Padding = new MarginPadding { Top = left_area_padding },
                                         Children = new Drawable[]
                                         {
-                                            new ResetScrollContainer(() => Carousel.ScrollToSelected())
+                                            new LeftSideInteractionContainer(() => Carousel.ScrollToSelected())
                                             {
                                                 RelativeSizeAxes = Axes.Both,
                                             },
@@ -1016,18 +1016,25 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private partial class ResetScrollContainer : Container
+        /// <summary>
+        /// Handles mouse interactions required when moving away from the carousel.
+        /// </summary>
+        private partial class LeftSideInteractionContainer : Container
         {
-            private readonly Action? onHoverAction;
+            private readonly Action? resetCarouselPosition;
 
-            public ResetScrollContainer(Action onHoverAction)
+            public LeftSideInteractionContainer(Action resetCarouselPosition)
             {
-                this.onHoverAction = onHoverAction;
+                this.resetCarouselPosition = resetCarouselPosition;
             }
 
+            protected override bool OnScroll(ScrollEvent e) => true;
+
+            protected override bool OnMouseDown(MouseDownEvent e) => true;
+
             protected override bool OnHover(HoverEvent e)
             {
-                onHoverAction?.Invoke();
+                resetCarouselPosition?.Invoke();
                 return base.OnHover(e);
             }
         }

From 383d7153788152c5dd6cdc4abe1149e03bfb3d7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 14:59:21 +0900
Subject: [PATCH 1984/2100] Fix incorrectly named test

---
 .../{TestSceneDifficultySearch.cs => DifficultySearchTest.cs}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/SongSelect/{TestSceneDifficultySearch.cs => DifficultySearchTest.cs} (97%)

diff --git a/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs b/osu.Game.Tests/SongSelect/DifficultySearchTest.cs
similarity index 97%
rename from osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
rename to osu.Game.Tests/SongSelect/DifficultySearchTest.cs
index f013d5c19a..770e40d672 100644
--- a/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
+++ b/osu.Game.Tests/SongSelect/DifficultySearchTest.cs
@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.SongSelect
 {
-    public partial class TestSceneDifficultySearch : OsuTestScene
+    public partial class DifficultySearchTest : OsuTestScene
     {
         private static readonly (string title, string difficultyName)[] beatmaps =
         {

From b16ece32f42373a0dde565a830f19b414e21966e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 15:14:30 +0900
Subject: [PATCH 1985/2100] Put tests in more correct place

---
 .../Filtering/FilterQueryParserTest.cs        | 50 +++++++++++++
 .../SongSelect/DifficultySearchTest.cs        | 72 -------------------
 2 files changed, 50 insertions(+), 72 deletions(-)
 delete mode 100644 osu.Game.Tests/SongSelect/DifficultySearchTest.cs

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index ce95e921b9..d453954ae0 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Tests.NonVisual.Filtering
@@ -382,6 +384,54 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("unrecognised=keyword", filterCriteria.SearchText.Trim());
         }
 
+        [TestCase("[1]", new[] { 0 })]
+        [TestCase("[1", new[] { 0 })]
+        [TestCase("My[Favourite", new[] { 2 })]
+        [TestCase("My[Favourite]", new[] { 2 })]
+        [TestCase("My[Favourite]Song", new[] { 2 })]
+        [TestCase("Favourite]", new[] { 2 })]
+        [TestCase("[Diff", new[] { 0, 1, 3, 4 })]
+        [TestCase("[Diff]", new[] { 0, 1, 3, 4 })]
+        [TestCase("[Favourite]", new[] { 3 })]
+        [TestCase("Title1 [Diff]", new[] { 0, 1 })]
+        [TestCase("Title1[Diff]", new int[] { })]
+        [TestCase("[diff ]with]", new[] { 4 })]
+        [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
+        [TestCase("[diff] another [brackets]", new[] { 4 })]
+        public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
+        {
+            var carouselBeatmaps = (((string title, string difficultyName)[])new[]
+            {
+                ("Title1", "Diff1"),
+                ("Title1", "Diff2"),
+                ("My[Favourite]Song", "Expert"),
+                ("Title", "My Favourite Diff"),
+                ("Another One", "diff ]with [[ brackets]]]"),
+            }).Select(info => new CarouselBeatmap(new BeatmapInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Title = info.title
+                },
+                DifficultyName = info.difficultyName
+            })).ToList();
+
+            var criteria = new FilterCriteria();
+
+            FilterQueryParser.ApplyQueries(criteria, query);
+            carouselBeatmaps.ForEach(b => b.Filter(criteria));
+
+            Assert.That(carouselBeatmaps.All(b =>
+            {
+                int index = carouselBeatmaps.IndexOf(b);
+
+                bool shouldBeVisible = expectedBeatmapIndexes.Contains(index);
+                bool isVisible = !b.Filtered.Value;
+
+                return isVisible == shouldBeVisible;
+            }));
+        }
+
         private class CustomFilterCriteria : IRulesetFilterCriteria
         {
             public string? CustomValue { get; set; }
diff --git a/osu.Game.Tests/SongSelect/DifficultySearchTest.cs b/osu.Game.Tests/SongSelect/DifficultySearchTest.cs
deleted file mode 100644
index 770e40d672..0000000000
--- a/osu.Game.Tests/SongSelect/DifficultySearchTest.cs
+++ /dev/null
@@ -1,72 +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.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Game.Beatmaps;
-using osu.Game.Screens.Select;
-using osu.Game.Screens.Select.Carousel;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Tests.SongSelect
-{
-    public partial class DifficultySearchTest : OsuTestScene
-    {
-        private static readonly (string title, string difficultyName)[] beatmaps =
-        {
-            ("Title1", "Diff1"),
-            ("Title1", "Diff2"),
-            ("My[Favourite]Song", "Expert"),
-            ("Title", "My Favourite Diff"),
-            ("Another One", "diff ]with [[ brackets]]]"),
-        };
-
-        [TestCase("[1]", new[] { 0 })]
-        [TestCase("[1", new[] { 0 })]
-        [TestCase("My[Favourite", new[] { 2 })]
-        [TestCase("My[Favourite]", new[] { 2 })]
-        [TestCase("My[Favourite]Song", new[] { 2 })]
-        [TestCase("Favourite]", new[] { 2 })]
-        [TestCase("[Diff", new[] { 0, 1, 3, 4 })]
-        [TestCase("[Diff]", new[] { 0, 1, 3, 4 })]
-        [TestCase("[Favourite]", new[] { 3 })]
-        [TestCase("Title1 [Diff]", new[] { 0, 1 })]
-        [TestCase("Title1[Diff]", new int[] { })]
-        [TestCase("[diff ]with]", new[] { 4 })]
-        [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
-        [TestCase("[diff] another [brackets]", new[] { 4 })]
-        public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
-        {
-            var carouselBeatmaps = createCarouselBeatmaps().ToList();
-
-            AddStep("filter beatmaps", () =>
-            {
-                var criteria = new FilterCriteria();
-                FilterQueryParser.ApplyQueries(criteria, query);
-                carouselBeatmaps.ForEach(b => b.Filter(criteria));
-            });
-
-            AddAssert("filtered correctly", () => carouselBeatmaps.All(b =>
-            {
-                int index = carouselBeatmaps.IndexOf(b);
-
-                bool filtered = b.Filtered.Value;
-
-                return filtered != expectedBeatmapIndexes.Contains(index);
-            }));
-        }
-
-        private static IEnumerable<CarouselBeatmap> createCarouselBeatmaps()
-        {
-            return beatmaps.Select(info => new CarouselBeatmap(new BeatmapInfo
-            {
-                Metadata = new BeatmapMetadata
-                {
-                    Title = info.title
-                },
-                DifficultyName = info.difficultyName
-            }));
-        }
-    }
-}

From 794c3a2473024aa8119cd708acfa4fddebd10dc8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 15:22:27 +0900
Subject: [PATCH 1986/2100] Add a couple more tests for sanity

---
 .../NonVisual/Filtering/FilterQueryParserTest.cs          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index d453954ae0..499300ebf8 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -390,14 +390,16 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("My[Favourite]", new[] { 2 })]
         [TestCase("My[Favourite]Song", new[] { 2 })]
         [TestCase("Favourite]", new[] { 2 })]
-        [TestCase("[Diff", new[] { 0, 1, 3, 4 })]
-        [TestCase("[Diff]", new[] { 0, 1, 3, 4 })]
+        [TestCase("[Diff", new[] { 0, 1, 3, 4, 6 })]
+        [TestCase("[Diff]", new[] { 0, 1, 3, 4, 6 })]
         [TestCase("[Favourite]", new[] { 3 })]
         [TestCase("Title1 [Diff]", new[] { 0, 1 })]
         [TestCase("Title1[Diff]", new int[] { })]
         [TestCase("[diff ]with]", new[] { 4 })]
         [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
         [TestCase("[diff] another [brackets]", new[] { 4 })]
+        [TestCase("[Diff in title]", new int[] { })]
+        [TestCase("[Diff in diff]", new int[] { 6 })]
         public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
         {
             var carouselBeatmaps = (((string title, string difficultyName)[])new[]
@@ -407,6 +409,8 @@ namespace osu.Game.Tests.NonVisual.Filtering
                 ("My[Favourite]Song", "Expert"),
                 ("Title", "My Favourite Diff"),
                 ("Another One", "diff ]with [[ brackets]]]"),
+                ("Diff in title", "a"),
+                ("a", "Diff in diff"),
             }).Select(info => new CarouselBeatmap(new BeatmapInfo
             {
                 Metadata = new BeatmapMetadata

From 6865d8894de02cf68466d809875e45508d839bb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 16:01:32 +0900
Subject: [PATCH 1987/2100] Simplify implementation and remove unsupported test
 coverage

---
 .../Filtering/FilterQueryParserTest.cs        |  1 -
 .../Select/Carousel/CarouselBeatmap.cs        |  4 +-
 osu.Game/Screens/Select/FilterCriteria.cs     | 71 +++++++++---------
 osu.Game/Screens/Select/FilterQueryParser.cs  | 75 -------------------
 4 files changed, 36 insertions(+), 115 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 499300ebf8..508251f046 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -397,7 +397,6 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("Title1[Diff]", new int[] { })]
         [TestCase("[diff ]with]", new[] { 4 })]
         [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
-        [TestCase("[diff] another [brackets]", new[] { 4 })]
         [TestCase("[Diff in title]", new int[] { })]
         [TestCase("[Diff in diff]", new int[] { 6 })]
         public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index f433e71cc3..ff781db680 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -59,13 +59,13 @@ namespace osu.Game.Screens.Select.Carousel
                      criteria.Artist.Matches(BeatmapInfo.Metadata.ArtistUnicode);
             match &= !criteria.Title.HasFilter || criteria.Title.Matches(BeatmapInfo.Metadata.Title) ||
                      criteria.Title.Matches(BeatmapInfo.Metadata.TitleUnicode);
+            match &= !criteria.DifficultyName.HasFilter || criteria.DifficultyName.Matches(BeatmapInfo.DifficultyName) ||
+                     criteria.DifficultyName.Matches(BeatmapInfo.Metadata.TitleUnicode);
 
             match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating);
 
             if (!match) return false;
 
-            match &= criteria.DifficultySearchTerms.All(term => term.Matches(BeatmapInfo.DifficultyName));
-
             if (criteria.SearchTerms.Length > 0)
             {
                 var searchableTerms = BeatmapInfo.GetSearchableTerms();
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 1bcff601e5..5666f9d1d4 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Screens.Select
         public OptionalTextFilter Creator;
         public OptionalTextFilter Artist;
         public OptionalTextFilter Title;
+        public OptionalTextFilter DifficultyName;
 
         public OptionalRange<double> UserStarDifficulty = new OptionalRange<double>
         {
@@ -47,11 +48,6 @@ namespace osu.Game.Screens.Select
 
         public OptionalTextFilter[] SearchTerms = Array.Empty<OptionalTextFilter>();
 
-        /// <summary>
-        /// Search terms that are used for searching difficulty names.
-        /// </summary>
-        public OptionalTextFilter[] DifficultySearchTerms = Array.Empty<OptionalTextFilter>();
-
         public RulesetInfo? Ruleset;
         public bool AllowConvertedBeatmaps;
 
@@ -69,7 +65,39 @@ namespace osu.Game.Screens.Select
             {
                 searchText = value;
 
-                SearchTerms = getTermsFromSearchText(value);
+                List<OptionalTextFilter> terms = new List<OptionalTextFilter>();
+
+                string remainingText = value;
+
+                // Match either an open difficulty tag to the end of string,
+                // or match a closed one with a whitespace after it.
+                //
+                // To keep things simple, the closing ']' may be included in the match group,
+                // and is trimmer post-match.
+                foreach (Match quotedSegment in Regex.Matches(value, "(^|\\s)\\[(.*)(\\]\\s|$)"))
+                {
+                    DifficultyName = new OptionalTextFilter
+                    {
+                        SearchTerm = quotedSegment.Groups[2].Value.Trim(']')
+                    };
+
+                    remainingText = remainingText.Replace(quotedSegment.Value, string.Empty);
+                }
+
+                // First handle quoted segments to ensure we keep inline spaces in exact matches.
+                foreach (Match quotedSegment in Regex.Matches(value, "(\"[^\"]+\"[!]?)"))
+                {
+                    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;
 
@@ -78,15 +106,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        /// <summary>
-        /// Extracts the search terms from the provided <see cref="string"/>
-        /// and stores them in <see cref="DifficultySearchTerms"/>.
-        /// </summary>
-        public string DifficultySearchText
-        {
-            set => DifficultySearchTerms = getTermsFromSearchText(value);
-        }
-
         /// <summary>
         /// Hashes from the <see cref="BeatmapCollection"/> to filter to.
         /// </summary>
@@ -94,28 +113,6 @@ namespace osu.Game.Screens.Select
 
         public IRulesetFilterCriteria? RulesetCriteria { get; set; }
 
-        private static OptionalTextFilter[] getTermsFromSearchText(string searchText)
-        {
-            List<OptionalTextFilter> terms = new List<OptionalTextFilter>();
-
-            string remainingText = searchText;
-
-            // 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
-            }));
-
-            return terms.ToArray();
-        }
-
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct
         {
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 33ddd08e09..1238173b41 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Screens.Select
 
         internal static void ApplyQueries(FilterCriteria criteria, string query)
         {
-            criteria.DifficultySearchText = extractDifficultySearchText(ref query);
-
             foreach (Match match in query_syntax_regex.Matches(query))
             {
                 string key = match.Groups["key"].Value.ToLowerInvariant();
@@ -36,79 +34,6 @@ namespace osu.Game.Screens.Select
             criteria.SearchText = query;
         }
 
-        /// <summary>
-        /// Extracts and returns the difficulty search text between square brackets.
-        /// </summary>
-        /// <param name="query">The search query. The difficulty search text will be removed from the query.</param>
-        /// <returns>The difficulty search text (without the square brackets).</returns>
-        private static string extractDifficultySearchText(ref string query)
-        {
-            var openingBracketIndexes = new List<int>();
-            var closingBracketIndexes = new List<int>();
-
-            populateIndexLists(query);
-
-            return performExtraction(ref query);
-
-            void populateIndexLists(string query)
-            {
-                bool currentlyBetweenBrackets = false;
-
-                for (int i = 0; i < query.Length; i++)
-                {
-                    switch (query[i])
-                    {
-                        case '[':
-                            if (!currentlyBetweenBrackets && (i == 0 || query[i - 1] == ' '))
-                            {
-                                currentlyBetweenBrackets = true;
-                                openingBracketIndexes.Add(i + 1);
-                            }
-
-                            break;
-
-                        case ']':
-                            if (currentlyBetweenBrackets && (i == query.Length - 1 || query[i + 1] == ' '))
-                            {
-                                currentlyBetweenBrackets = false;
-                                closingBracketIndexes.Add(i);
-                            }
-
-                            break;
-                    }
-                }
-            }
-
-            string performExtraction(ref string query)
-            {
-                var searchTexts = new List<string>();
-                string originalQuery = query;
-
-                for (int i = 0; i < openingBracketIndexes.Count; i++)
-                {
-                    int startIndex = openingBracketIndexes[i];
-
-                    int endIndex = closingBracketIndexes.Count > 0
-                        ? closingBracketIndexes[Math.Min(i, closingBracketIndexes.Count - 1)]
-                        : query.Length;
-
-                    string searchText = originalQuery[startIndex..endIndex];
-
-                    searchTexts.Add(searchText);
-
-                    query = query
-                            .Replace($" [{searchText}]", "")
-                            .Replace($"[{searchText}] ", "")
-                            .Replace($"[{searchText}]", "")
-                            .Replace($" [{searchText}] ", " ")
-                            .Replace($" [{searchText}", "")
-                            .Replace($"[{searchText}", "");
-                }
-
-                return string.Join(' ', searchTexts);
-            }
-        }
-
         private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key, string value, Operator op)
         {
             switch (key)

From fcb366af4db6736e4786c705de7a3cee59dc0e1d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 16:09:05 +0900
Subject: [PATCH 1988/2100] Add `diff=` support for more advanced usages

---
 .../NonVisual/Filtering/FilterQueryParserTest.cs | 16 ++++++++--------
 osu.Game/Screens/Select/FilterQueryParser.cs     |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 508251f046..74d47b43af 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -399,6 +399,10 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
         [TestCase("[Diff in title]", new int[] { })]
         [TestCase("[Diff in diff]", new int[] { 6 })]
+        [TestCase("diff=Diff", new[] { 0, 1, 3, 4, 6 })]
+        [TestCase("diff=Diff1", new[] { 0 })]
+        [TestCase("diff=\"Diff\"", new[] { 3, 4, 6 })]
+        [TestCase("diff=!\"Diff\"", new int[] {})]
         public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
         {
             var carouselBeatmaps = (((string title, string difficultyName)[])new[]
@@ -424,15 +428,11 @@ namespace osu.Game.Tests.NonVisual.Filtering
             FilterQueryParser.ApplyQueries(criteria, query);
             carouselBeatmaps.ForEach(b => b.Filter(criteria));
 
-            Assert.That(carouselBeatmaps.All(b =>
-            {
-                int index = carouselBeatmaps.IndexOf(b);
+            int[] visibleBeatmaps = carouselBeatmaps
+                                    .Where(b => !b.Filtered.Value)
+                                    .Select(b => carouselBeatmaps.IndexOf(b)).ToArray();
 
-                bool shouldBeVisible = expectedBeatmapIndexes.Contains(index);
-                bool isVisible = !b.Filtered.Value;
-
-                return isVisible == shouldBeVisible;
-            }));
+            Assert.That(visibleBeatmaps, Is.EqualTo(expectedBeatmapIndexes));
         }
 
         private class CustomFilterCriteria : IRulesetFilterCriteria
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 1238173b41..0d8905347b 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -76,6 +76,9 @@ namespace osu.Game.Screens.Select
                 case "title":
                     return TryUpdateCriteriaText(ref criteria.Title, op, value);
 
+                case "diff":
+                    return TryUpdateCriteriaText(ref criteria.DifficultyName, op, value);
+
                 default:
                     return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
             }

From b4cc12ab5aee4682359f874548f937793a075d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 24 Oct 2023 10:00:58 +0200
Subject: [PATCH 1989/2100] Fix formatting

---
 osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 74d47b43af..bfdd5f92a2 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -402,7 +402,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("diff=Diff", new[] { 0, 1, 3, 4, 6 })]
         [TestCase("diff=Diff1", new[] { 0 })]
         [TestCase("diff=\"Diff\"", new[] { 3, 4, 6 })]
-        [TestCase("diff=!\"Diff\"", new int[] {})]
+        [TestCase("diff=!\"Diff\"", new int[] { })]
         public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
         {
             var carouselBeatmaps = (((string title, string difficultyName)[])new[]

From abfe2ce0fe28c8efc99ef622a6724fe399bb4ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 24 Oct 2023 10:05:20 +0200
Subject: [PATCH 1990/2100] Fix comment

---
 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 5666f9d1d4..812a16c484 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Select
                 // or match a closed one with a whitespace after it.
                 //
                 // To keep things simple, the closing ']' may be included in the match group,
-                // and is trimmer post-match.
+                // and is trimmed post-match.
                 foreach (Match quotedSegment in Regex.Matches(value, "(^|\\s)\\[(.*)(\\]\\s|$)"))
                 {
                     DifficultyName = new OptionalTextFilter

From c9161a7bfcbf09a9ce577e174c5867475e21476d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 17:32:01 +0900
Subject: [PATCH 1991/2100] Remove incorrect copy paste fail

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index ff781db680..1d40862df7 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -59,9 +59,7 @@ namespace osu.Game.Screens.Select.Carousel
                      criteria.Artist.Matches(BeatmapInfo.Metadata.ArtistUnicode);
             match &= !criteria.Title.HasFilter || criteria.Title.Matches(BeatmapInfo.Metadata.Title) ||
                      criteria.Title.Matches(BeatmapInfo.Metadata.TitleUnicode);
-            match &= !criteria.DifficultyName.HasFilter || criteria.DifficultyName.Matches(BeatmapInfo.DifficultyName) ||
-                     criteria.DifficultyName.Matches(BeatmapInfo.Metadata.TitleUnicode);
-
+            match &= !criteria.DifficultyName.HasFilter || criteria.DifficultyName.Matches(BeatmapInfo.DifficultyName);
             match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating);
 
             if (!match) return false;

From a0c8158033fcb59459bd10e7ceaba11310241ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 24 Oct 2023 10:42:03 +0200
Subject: [PATCH 1992/2100] Remove unnecessary `LifetimeEnd` specification

---
 .../Objects/Drawables/DrawableSpinnerTick.cs          | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 20fe7172ad..b2de4da01b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -5,7 +5,6 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -37,16 +36,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             LifetimeStart = DrawableSpinner.HitObject.StartTime;
         }
 
-        protected override void UpdateHitStateTransforms(ArmedState state)
-        {
-            base.UpdateHitStateTransforms(state);
-
-            // the tick can be theoretically judged at any point in the spinner's duration,
-            // so it must be alive throughout the spinner's entire lifetime (or until hit, whichever applies).
-            // this mostly matters for correct sample playback.
-            LifetimeEnd = (Result?.IsHit == true ? Result.TimeAbsolute : DrawableSpinner.HitObject.GetEndTime()) + (Samples?.Length ?? 0);
-        }
-
         /// <summary>
         /// Apply a judgement result.
         /// </summary>

From 68397f0e816f131dda8f20b6959298403d7a87b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:01:24 +0900
Subject: [PATCH 1993/2100] Remove unused using

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index b2de4da01b..a5785dd1f6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {

From 966decb0089631032a5eb29a1f547faf16e83cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 24 Oct 2023 11:25:37 +0200
Subject: [PATCH 1994/2100] Remove redundant explicit array type specification

---
 osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index bfdd5f92a2..739a72df08 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -398,7 +398,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("[diff ]with]", new[] { 4 })]
         [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
         [TestCase("[Diff in title]", new int[] { })]
-        [TestCase("[Diff in diff]", new int[] { 6 })]
+        [TestCase("[Diff in diff]", new[] { 6 })]
         [TestCase("diff=Diff", new[] { 0, 1, 3, 4, 6 })]
         [TestCase("diff=Diff1", new[] { 0 })]
         [TestCase("diff=\"Diff\"", new[] { 3, 4, 6 })]

From 93147a5998efda1c9bf94aa4ae85aec35ff641c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:00:48 +0900
Subject: [PATCH 1995/2100] Change slider tail tick to only hold back judgement
 on ticks/repeats

---
 .../Objects/Drawables/DrawableSliderTail.cs                 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index df55f3e73f..73ee8a18a5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System.Diagnostics;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -129,11 +130,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered)
                 return;
 
-            // Ensure the tail can only activate after all previous ticks already have.
+            // Ensure the tail can only activate after all previous ticks/repeats already have.
             //
             // This covers the edge case where the lenience may allow the tail to activate before
             // the last tick, changing ordering of score/combo awarding.
-            if (DrawableSlider.NestedHitObjects.Count > 1 && !DrawableSlider.NestedHitObjects[^2].Judged)
+            var lastTick = DrawableSlider.NestedHitObjects.LastOrDefault(o => o.HitObject is SliderTick || o.HitObject is SliderRepeat);
+            if (lastTick?.Judged == false)
                 return;
 
             // The player needs to have engaged in tracking at any point after the tail leniency cutoff.

From 176cb0dd28b4847bbe59c8ffc1911af0e6f14906 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:33:35 +0900
Subject: [PATCH 1996/2100] Remove unused variable

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 2dea05da2f..be6c322668 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using System.Diagnostics;
-using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
@@ -15,9 +14,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public new SliderHeadCircle HitObject => (SliderHeadCircle)base.HitObject;
 
-        [CanBeNull]
-        public Slider Slider => DrawableSlider?.HitObject;
-
         public DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
 
         public override bool DisplayResult => HitObject?.JudgeAsNormalHitCircle ?? base.DisplayResult;

From 5eefc5323d8adc308352f46f17a81a3554b22d9b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:36:45 +0900
Subject: [PATCH 1997/2100] Standardise `DrawableSliderRepeat` /
 `DrawableSliderTick` judgement implementations

---
 .../Objects/Drawables/DrawableSliderRepeat.cs             | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 0be571c229..07e1b8af8c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -17,7 +17,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public partial class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking
+    public partial class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking, IRequireTracking
     {
         public new SliderRepeat HitObject => (SliderRepeat)base.HitObject;
 
@@ -36,6 +36,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => false;
 
+        public bool Tracking { get; set; }
+
         public DrawableSliderRepeat()
             : base(null)
         {
@@ -85,8 +87,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (HitObject.StartTime <= Time.Current)
-                ApplyResult(r => r.Type = DrawableSlider.Tracking.Value ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            if (timeOffset >= 0)
+                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
         protected override void UpdateInitialTransforms()

From 550340790759db6f29c2a18613922503770239fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:40:12 +0900
Subject: [PATCH 1998/2100] Force miss head when a tick or repeat is
 successfully judged

---
 .../Objects/Drawables/DrawableSliderRepeat.cs             | 8 ++++++++
 .../Objects/Drawables/DrawableSliderTail.cs               | 5 +++++
 .../Objects/Drawables/DrawableSliderTick.cs               | 8 ++++++++
 3 files changed, 21 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 07e1b8af8c..7589afccb8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -87,8 +87,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
+            // shared implementation with DrawableSliderTick.
             if (timeOffset >= 0)
+            {
+                // Attempt to preserve correct ordering of judgements as best we can by forcing
+                // an un-judged head to be missed when the user has clearly skipped it.
+                if (Tracking && !DrawableSlider.HeadCircle.Judged)
+                    DrawableSlider.HeadCircle.MissForcefully();
+
                 ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            }
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 73ee8a18a5..4872119b35 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -138,6 +138,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (lastTick?.Judged == false)
                 return;
 
+            // Attempt to preserve correct ordering of judgements as best we can by forcing
+            // an un-judged head to be missed when the user has clearly skipped it.
+            if (Tracking && !DrawableSlider.HeadCircle.Judged)
+                DrawableSlider.HeadCircle.MissForcefully();
+
             // The player needs to have engaged in tracking at any point after the tail leniency cutoff.
             // An actual tick miss should only occur if reaching the tick itself.
             if (timeOffset >= SliderEventGenerator.TAIL_LENIENCY && Tracking)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index a947580d2f..15e99618f9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -75,8 +75,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
+            // shared implementation with DrawableSliderRepeat.
             if (timeOffset >= 0)
+            {
+                // Attempt to preserve correct ordering of judgements as best we can by forcing
+                // an un-judged head to be missed when the user has clearly skipped it.
+                if (Tracking && !DrawableSlider.HeadCircle.Judged)
+                    DrawableSlider.HeadCircle.MissForcefully();
+
                 ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            }
         }
 
         protected override void UpdateInitialTransforms()

From e79aeea3b04b709a2dcfa362455695318550bbec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:50:28 +0900
Subject: [PATCH 1999/2100] Add test coverage

---
 .../TestSceneSliderInput.cs                   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 247aa4f445..f718a5069f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -38,6 +38,42 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
+        [TestCase(30, 0)]
+        [TestCase(30, 1)]
+        [TestCase(40, 0)]
+        [TestCase(40, 1)]
+        [TestCase(50, 1)]
+        [TestCase(60, 1)]
+        [TestCase(70, 1)]
+        [TestCase(80, 1)]
+        [TestCase(80, 0)]
+        [TestCase(80, 10)]
+        [TestCase(90, 1)]
+        [Ignore("headless test doesn't run at high enough precision for this to always enter a tracking state in time.")]
+        public void TestVeryShortSliderMissHead(float sliderLength, int repeatCount)
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = new Vector2(50, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start - 10 },
+                new OsuReplayFrame { Position = new Vector2(50, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 2000 },
+            }, new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 10f,
+                RepeatCount = repeatCount,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(sliderLength, 0),
+                }),
+            }, 240, 1);
+
+            AddAssert("Head judgement is first", () => judgementResults[0].HitObject is SliderHeadCircle);
+            AddAssert("Tail judgement is second last", () => judgementResults[^2].HitObject is SliderTailCircle);
+            AddAssert("Slider judgement is last", () => judgementResults[^1].HitObject is Slider);
+        }
+
         // Making these too short causes breakage from frames not being processed fast enough.
         // To keep things simple, these tests are crafted to always be >16ms length.
         // If sliders shorter than this are ever used in gameplay it will probably break things and we can revisit.
@@ -76,6 +112,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             assertAllMaxJudgements();
 
+            AddAssert("Head judgement is first", () => judgementResults.First().HitObject is SliderHeadCircle);
+
             // Even if the last tick is hit early, the slider should always execute its final judgement at its endtime.
             // If not, hitsounds will not play on time.
             AddAssert("Judgement offset is zero", () => judgementResults.Last().TimeOffset == 0);
@@ -121,6 +159,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             else
                 AddAssert("Tracking dropped", assertMidSliderJudgementFail);
 
+            AddAssert("Head judgement is first", () => judgementResults.First().HitObject is SliderHeadCircle);
+
             // Even if the last tick is hit early, the slider should always execute its final judgement at its endtime.
             // If not, hitsounds will not play on time.
             AddAssert("Judgement offset is zero", () => judgementResults.Last().TimeOffset == 0);

From cd8b068f4c42097daa53e3fb19fd4d35eb6b65a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 13:01:23 +0900
Subject: [PATCH 2000/2100] Add fallback case to `CountryExtensions.GetAcronym`

---
 osu.Game.Tournament/CountryExtensions.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/CountryExtensions.cs b/osu.Game.Tournament/CountryExtensions.cs
index f2a583c8a5..b47c3f18ce 100644
--- a/osu.Game.Tournament/CountryExtensions.cs
+++ b/osu.Game.Tournament/CountryExtensions.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.Game.Users;
 
 namespace osu.Game.Tournament
@@ -763,7 +762,7 @@ namespace osu.Game.Tournament
                     return "MOZ";
 
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(country));
+                    return country.ToString();
             }
         }
     }

From d9ec030cc8a2fca7b121d9d5353ea707064af876 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 13:02:15 +0900
Subject: [PATCH 2001/2100] Remove missing country

---
 osu.Game.Tournament/CountryExtensions.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Tournament/CountryExtensions.cs b/osu.Game.Tournament/CountryExtensions.cs
index b47c3f18ce..c66727bc77 100644
--- a/osu.Game.Tournament/CountryExtensions.cs
+++ b/osu.Game.Tournament/CountryExtensions.cs
@@ -518,9 +518,6 @@ namespace osu.Game.Tournament
                 case CountryCode.KE:
                     return "KEN";
 
-                case CountryCode.SS:
-                    return "SSD";
-
                 case CountryCode.SR:
                     return "SUR";
 

From da07066a744c6808d00fdaa82e0e0b141e34f9fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 13:03:03 +0900
Subject: [PATCH 2002/2100] Add note about `CountryCode` being at parity with
 `osu_countries`

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

diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs
index e56cdf0dfd..edaa1562c7 100644
--- a/osu.Game/Users/CountryCode.cs
+++ b/osu.Game/Users/CountryCode.cs
@@ -8,6 +8,9 @@ using Newtonsoft.Json.Converters;
 
 namespace osu.Game.Users
 {
+    /// <summary>
+    /// Matches `osu_countries` database table.
+    /// </summary>
     [JsonConverter(typeof(StringEnumConverter))]
     [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
     public enum CountryCode

From 121fa6f165f504df061b0dc0350fb9e85da78221 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 13:53:20 +0900
Subject: [PATCH 2003/2100] Simplify pre-checks in `HitObjectApplied` delegate

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 19aa5d31f3..45c59e970b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -109,11 +109,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private void onHitObjectApplied(DrawableHitObject? drawableObject = null)
         {
-            if (drawableObject != null && drawableObject is not DrawableSlider)
-                return;
-
-            ballAnimation.ClearFrames();
-
             double frameDelay;
 
             if (drawableObject?.HitObject != null)
@@ -127,6 +122,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             else
                 frameDelay = LegacySkinExtensions.SIXTY_FRAME_TIME;
 
+            ballAnimation.ClearFrames();
             foreach (var texture in ballTextures)
                 ballAnimation.AddFrame(texture, frameDelay);
         }

From 74f794a549f2f8b30a1fa1af8a7f9fc24ea9b92d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 14:01:55 +0900
Subject: [PATCH 2004/2100] Fix repeat circles on sliders not correctly getting
 dimmed

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index b682d14879..cdfe888c99 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             HeadCircle,
             TailCircle,
+            repeatContainer,
             Body,
         };
 

From 2886d2d4c27a536690dcc5095709112cec117e54 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 14:20:43 +0900
Subject: [PATCH 2005/2100] Apply same changes to "argon" osu!taiko barline
 design that were applied to osu!mania

---
 .../Skinning/Argon/ArgonBarLine.cs            | 85 +++++++++----------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonBarLine.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonBarLine.cs
index 32afb8e6ac..6cb55f1111 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonBarLine.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -14,53 +15,54 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
     public partial class ArgonBarLine : CompositeDrawable
     {
-        private Container majorEdgeContainer = null!;
-
         private Bindable<bool> major = null!;
 
+        private Box mainLine = null!;
+        private Drawable topAnchor = null!;
+        private Drawable bottomAnchor = null!;
+
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject)
         {
             RelativeSizeAxes = Axes.Both;
 
-            const float line_offset = 8;
-            var majorPieceSize = new Vector2(6, 20);
+            // Avoid flickering due to no anti-aliasing of boxes by default.
+            var edgeSmoothness = new Vector2(0.3f);
 
-            InternalChildren = new Drawable[]
+            AddInternal(mainLine = new Box
             {
-                line = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    EdgeSmoothness = new Vector2(0.5f, 0),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-                majorEdgeContainer = new Container
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new[]
-                    {
-                        new Circle
-                        {
-                            Name = "Top line",
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.BottomCentre,
-                            Size = majorPieceSize,
-                            Y = -line_offset,
-                        },
-                        new Circle
-                        {
-                            Name = "Bottom line",
-                            Anchor = Anchor.BottomCentre,
-                            Origin = Anchor.TopCentre,
-                            Size = majorPieceSize,
-                            Y = line_offset,
-                        },
-                    }
-                }
-            };
+                Name = "Bar line",
+                EdgeSmoothness = edgeSmoothness,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+            });
+
+            const float major_extension = 10;
+
+            AddInternal(topAnchor = new Box
+            {
+                Name = "Top anchor",
+                EdgeSmoothness = edgeSmoothness,
+                Blending = BlendingParameters.Additive,
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.BottomCentre,
+                Height = major_extension,
+                RelativeSizeAxes = Axes.X,
+                Colour = ColourInfo.GradientVertical(Colour4.Transparent, Colour4.White),
+            });
+
+            AddInternal(bottomAnchor = new Box
+            {
+                Name = "Bottom anchor",
+                EdgeSmoothness = edgeSmoothness,
+                Blending = BlendingParameters.Additive,
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.TopCentre,
+                Height = major_extension,
+                RelativeSizeAxes = Axes.X,
+                Colour = ColourInfo.GradientVertical(Colour4.White, Colour4.Transparent),
+            });
 
             major = ((DrawableBarLine)drawableHitObject).Major.GetBoundCopy();
         }
@@ -71,13 +73,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
             major.BindValueChanged(updateMajor, true);
         }
 
-        private Box line = null!;
-
         private void updateMajor(ValueChangedEvent<bool> major)
         {
-            line.Alpha = major.NewValue ? 1f : 0.5f;
-            line.Width = major.NewValue ? 1 : 0.5f;
-            majorEdgeContainer.Alpha = major.NewValue ? 1 : 0;
+            mainLine.Alpha = major.NewValue ? 1f : 0.5f;
+            topAnchor.Alpha = bottomAnchor.Alpha = major.NewValue ? mainLine.Alpha * 0.3f : 0;
         }
     }
 }

From 6934e045df2525eeeab800b4c9b543eed8d38256 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 14:33:06 +0900
Subject: [PATCH 2006/2100] Fix editor not prompting before saving beatmap for
 export

---
 .../Editing/TestSceneEditorTestGameplay.cs    |  4 +--
 osu.Game/Screens/Edit/Editor.cs               | 35 ++++++++++++-------
 ...stDialog.cs => SaveRequiredPopupDialog.cs} | 12 +++----
 3 files changed, 31 insertions(+), 20 deletions(-)
 rename osu.Game/Screens/Edit/{GameplayTest/SaveBeforeGameplayTestDialog.cs => SaveRequiredPopupDialog.cs} (60%)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
index 007716bd6c..bbd7123f20 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Tests.Visual.Editing
                 InputManager.MoveMouseTo(button);
                 InputManager.Click(MouseButton.Left);
             });
-            AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveBeforeGameplayTestDialog);
+            AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveRequiredPopupDialog);
 
             AddStep("dismiss prompt", () =>
             {
@@ -165,7 +165,7 @@ namespace osu.Game.Tests.Visual.Editing
                 InputManager.MoveMouseTo(button);
                 InputManager.Click(MouseButton.Left);
             });
-            AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveBeforeGameplayTestDialog);
+            AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveRequiredPopupDialog);
 
             AddStep("save changes", () => DialogOverlay.CurrentDialog.PerformOkAction());
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 899a782755..91c3c98f01 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -425,7 +425,7 @@ namespace osu.Game.Screens.Edit
         {
             if (HasUnsavedChanges)
             {
-                dialogOverlay.Push(new SaveBeforeGameplayTestDialog(() =>
+                dialogOverlay.Push(new SaveRequiredPopupDialog("The beatmap will be saved in order to test it.", () =>
                 {
                     if (!Save()) return;
 
@@ -1018,25 +1018,36 @@ namespace osu.Game.Screens.Edit
         {
             var exportItems = new List<MenuItem>
             {
-                new EditorMenuItem(EditorStrings.ExportForEditing, MenuItemType.Standard, exportBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
-                new EditorMenuItem(EditorStrings.ExportForCompatibility, MenuItemType.Standard, exportLegacyBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+                new EditorMenuItem(EditorStrings.ExportForEditing, MenuItemType.Standard, () => exportBeatmap(false)) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+                new EditorMenuItem(EditorStrings.ExportForCompatibility, MenuItemType.Standard, () => exportBeatmap(true)) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
             };
 
             return new EditorMenuItem(CommonStrings.Export) { Items = exportItems };
         }
 
-        private void exportBeatmap()
+        private void exportBeatmap(bool legacy)
         {
-            if (!Save()) return;
+            if (HasUnsavedChanges)
+            {
+                dialogOverlay.Push(new SaveRequiredPopupDialog("The beatmap will be saved in order to export it.", () =>
+                {
+                    if (!Save()) return;
 
-            beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
-        }
+                    runExport();
+                }));
+            }
+            else
+            {
+                runExport();
+            }
 
-        private void exportLegacyBeatmap()
-        {
-            if (!Save()) return;
-
-            beatmapManager.ExportLegacy(Beatmap.Value.BeatmapSetInfo);
+            void runExport()
+            {
+                if (legacy)
+                    beatmapManager.ExportLegacy(Beatmap.Value.BeatmapSetInfo);
+                else
+                    beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/GameplayTest/SaveBeforeGameplayTestDialog.cs b/osu.Game/Screens/Edit/SaveRequiredPopupDialog.cs
similarity index 60%
rename from osu.Game/Screens/Edit/GameplayTest/SaveBeforeGameplayTestDialog.cs
rename to osu.Game/Screens/Edit/SaveRequiredPopupDialog.cs
index eb1df43ddd..3ca92876f1 100644
--- a/osu.Game/Screens/Edit/GameplayTest/SaveBeforeGameplayTestDialog.cs
+++ b/osu.Game/Screens/Edit/SaveRequiredPopupDialog.cs
@@ -1,17 +1,17 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (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.Screens.Edit.GameplayTest
+namespace osu.Game.Screens.Edit
 {
-    public partial class SaveBeforeGameplayTestDialog : PopupDialog
+    public partial class SaveRequiredPopupDialog : PopupDialog
     {
-        public SaveBeforeGameplayTestDialog(Action saveAndPreview)
+        public SaveRequiredPopupDialog(string headerText, Action saveAndAction)
         {
-            HeaderText = "The beatmap will be saved in order to test it.";
+            HeaderText = headerText;
 
             Icon = FontAwesome.Regular.Save;
 
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Edit.GameplayTest
                 new PopupDialogOkButton
                 {
                     Text = "Sounds good, let's go!",
-                    Action = saveAndPreview
+                    Action = saveAndAction
                 },
                 new PopupDialogCancelButton
                 {

From 6eafb66fdfedac1cae4e0568f81d75bd47ec41d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 15:44:42 +0900
Subject: [PATCH 2007/2100] Fix `DrawableSliderTail` potentially forcing miss
 on head too early

---
 .../Objects/Drawables/DrawableSliderTail.cs                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 4872119b35..9e8ff6ae52 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -138,6 +138,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (lastTick?.Judged == false)
                 return;
 
+            if (timeOffset < SliderEventGenerator.TAIL_LENIENCY)
+                return;
+
             // Attempt to preserve correct ordering of judgements as best we can by forcing
             // an un-judged head to be missed when the user has clearly skipped it.
             if (Tracking && !DrawableSlider.HeadCircle.Judged)
@@ -145,7 +148,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             // The player needs to have engaged in tracking at any point after the tail leniency cutoff.
             // An actual tick miss should only occur if reaching the tick itself.
-            if (timeOffset >= SliderEventGenerator.TAIL_LENIENCY && Tracking)
+            if (Tracking)
                 ApplyResult(r => r.Type = r.Judgement.MaxResult);
             else if (timeOffset > 0)
                 ApplyResult(r => r.Type = r.Judgement.MinResult);

From 2f95e7a284b0c014c37d41da5a69c01ac0bd4547 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 15:44:51 +0900
Subject: [PATCH 2008/2100] Add note about implementation being shared

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs | 2 ++
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs   | 2 ++
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 7589afccb8..cdfd96514e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -92,6 +92,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 // Attempt to preserve correct ordering of judgements as best we can by forcing
                 // an un-judged head to be missed when the user has clearly skipped it.
+                //
+                // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
                 if (Tracking && !DrawableSlider.HeadCircle.Judged)
                     DrawableSlider.HeadCircle.MissForcefully();
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 9e8ff6ae52..e3ed12a648 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -143,6 +143,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             // Attempt to preserve correct ordering of judgements as best we can by forcing
             // an un-judged head to be missed when the user has clearly skipped it.
+            //
+            // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
             if (Tracking && !DrawableSlider.HeadCircle.Judged)
                 DrawableSlider.HeadCircle.MissForcefully();
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 15e99618f9..172dca356e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -80,6 +80,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 // Attempt to preserve correct ordering of judgements as best we can by forcing
                 // an un-judged head to be missed when the user has clearly skipped it.
+                //
+                // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
                 if (Tracking && !DrawableSlider.HeadCircle.Judged)
                     DrawableSlider.HeadCircle.MissForcefully();
 

From 7dd11fc5bff3c4d4078a746c14941d5ec0ea43c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 17:55:55 +0900
Subject: [PATCH 2009/2100] Fix null check

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index 9582ee491b..421a32b9eb 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 RelativeSizeAxes = Axes.Both,
                 Size = new Vector2(0.8f),
-                Child = new MovingCursorInputManager { Child = createContent?.Invoke() }
+                Child = new MovingCursorInputManager { Child = createContent() }
             });
         });
 

From 2ba02416c22b9bcd0283b79e28dcb65a41f414e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 09:14:59 +0200
Subject: [PATCH 2010/2100] Revert test changes fully to clean up diff

---
 .../Visual/Playlists/TestScenePlaylistsResultsScreen.cs  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 4d82631fc9..cb422d8c06 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -262,10 +262,9 @@ namespace osu.Game.Tests.Visual.Playlists
 
             for (int i = 1; i <= scores_per_result; i++)
             {
-                int nextLowest = getNextLowestScoreId();
                 multiplayerUserScore.ScoresAround.Lower.Scores.Add(new MultiplayerScore
                 {
-                    ID = nextLowest,
+                    ID = getNextLowestScoreId(),
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -278,10 +277,9 @@ namespace osu.Game.Tests.Visual.Playlists
                     },
                 });
 
-                int nextHighest = getNextHighestScoreId();
                 multiplayerUserScore.ScoresAround.Higher.Scores.Add(new MultiplayerScore
                 {
-                    ID = nextHighest,
+                    ID = getNextHighestScoreId(),
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -311,10 +309,9 @@ namespace osu.Game.Tests.Visual.Playlists
 
             for (int i = 1; i <= scores_per_result; i++)
             {
-                int id = sort == "score_asc" ? getNextHighestScoreId() : getNextLowestScoreId();
                 result.Scores.Add(new MultiplayerScore
                 {
-                    ID = id,
+                    ID = sort == "score_asc" ? getNextHighestScoreId() : getNextLowestScoreId(),
                     Accuracy = 1,
                     Passed = true,
                     Rank = ScoreRank.X,

From e949b1f613a3015c4a8ae91a76e87e2229711570 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 10:36:57 +0300
Subject: [PATCH 2011/2100] Fix failing tests

---
 osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
index baaa24959f..5ad268a77b 100644
--- a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     Child = piece = new TestLegacyMainCirclePiece(priorityLookup),
                 };
 
-                var sprites = this.ChildrenOfType<Sprite>().Where(s => !string.IsNullOrEmpty(s.Texture.AssetName)).DistinctBy(s => s.Texture.AssetName).ToArray();
+                var sprites = this.ChildrenOfType<Sprite>().Where(s => !string.IsNullOrEmpty(s.Texture?.AssetName)).DistinctBy(s => s.Texture.AssetName).ToArray();
                 Debug.Assert(sprites.Length <= 2);
             });
 
@@ -103,8 +103,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private partial class TestLegacyMainCirclePiece : LegacyMainCirclePiece
         {
-            public new Sprite? CircleSprite => base.CircleSprite.ChildrenOfType<Sprite>().DistinctBy(s => s.Texture.AssetName).SingleOrDefault();
-            public new Sprite? OverlaySprite => base.OverlaySprite.ChildrenOfType<Sprite>().DistinctBy(s => s.Texture.AssetName).SingleOrDefault();
+            public new Sprite? CircleSprite => base.CircleSprite.ChildrenOfType<Sprite>().Where(s => !string.IsNullOrEmpty(s.Texture?.AssetName)).DistinctBy(s => s.Texture.AssetName).SingleOrDefault();
+            public new Sprite? OverlaySprite => base.OverlaySprite.ChildrenOfType<Sprite>().Where(s => !string.IsNullOrEmpty(s.Texture?.AssetName)).DistinctBy(s => s.Texture.AssetName).SingleOrDefault();
 
             public TestLegacyMainCirclePiece(string? priorityLookupPrefix)
                 : base(priorityLookupPrefix, false)

From 84102cd51ef34f1cf81b2ae41783807a5f2ebb2d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 10:46:04 +0300
Subject: [PATCH 2012/2100] Use current date as default value for tournament
 date text box

---
 osu.Game.Tournament/Components/DateTextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index d87c091f77..ab643a5cb5 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tournament.Components
 {
     public partial class DateTextBox : SettingsTextBox
     {
-        private readonly BindableWithCurrent<DateTimeOffset> current = new BindableWithCurrent<DateTimeOffset>();
+        private readonly BindableWithCurrent<DateTimeOffset> current = new BindableWithCurrent<DateTimeOffset>(DateTimeOffset.Now);
 
         public new Bindable<DateTimeOffset>? Current
         {

From 4cca70ee1939118d719d5cbecd5b2d109fd07c94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Oct 2023 17:42:28 +0900
Subject: [PATCH 2013/2100] Fix iOS AOT compilation failure due to
 SharpCompress library upgrade

---
 osu.Game/osu.Game.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 848e17af1a..bf0a1fcbad 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -39,7 +39,8 @@
     <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1023.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
-    <PackageReference Include="SharpCompress" Version="0.34.1" />
+    <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
+    <PackageReference Include="SharpCompress" Version="0.33.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.6" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 910d74fdda85433e2cf6b1f62daa3edc4a75f816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 11:59:38 +0200
Subject: [PATCH 2014/2100] Add failing test coverage for double-click on
 disabled sliders

---
 .../UserInterface/TestSceneRoundedSliderBar.cs  | 17 +++++++++++++++++
 .../UserInterface/TestSceneShearedSliderBar.cs  | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
index 419e88137c..ae52c26fd2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
@@ -55,5 +55,22 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddAssert("slider is default", () => slider.Current.IsDefault);
         }
+
+        [Test]
+        public void TestNubDoubleClickOnDisabledSliderDoesNothing()
+        {
+            AddStep("set slider to 1", () => slider.Current.Value = 1);
+            AddStep("disable slider", () => slider.Current.Disabled = true);
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(slider.ChildrenOfType<Nub>().Single()));
+
+            AddStep("double click nub", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("slider is still at 1", () => slider.Current.Value, () => Is.EqualTo(1));
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
index d459a2c701..334fc4563a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
@@ -55,5 +55,22 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddAssert("slider is default", () => slider.Current.IsDefault);
         }
+
+        [Test]
+        public void TestNubDoubleClickOnDisabledSliderDoesNothing()
+        {
+            AddStep("set slider to 1", () => slider.Current.Value = 1);
+            AddStep("disable slider", () => slider.Current.Disabled = true);
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(slider.ChildrenOfType<ShearedNub>().Single()));
+
+            AddStep("double click nub", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("slider is still at 1", () => slider.Current.Value, () => Is.EqualTo(1));
+        }
     }
 }

From 96437c4518a394c2354853b95c5f07853c6340d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 12:03:35 +0200
Subject: [PATCH 2015/2100] Fix tests specifying float precision for double
 bindable

Would cause assignments to `.Value` to become imprecise even if the
underlying bindable could represent the value 100% accurately.
---
 .../Visual/UserInterface/TestSceneRoundedSliderBar.cs           | 2 +-
 .../Visual/UserInterface/TestSceneShearedSliderBar.cs           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
index ae52c26fd2..311034d595 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly BindableDouble current = new BindableDouble(5)
         {
-            Precision = 0.1f,
+            Precision = 0.1,
             MinValue = 0,
             MaxValue = 15
         };
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
index 334fc4563a..a5072b4e60 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly BindableDouble current = new BindableDouble(5)
         {
-            Precision = 0.1f,
+            Precision = 0.1,
             MinValue = 0,
             MaxValue = 15
         };

From 89fec95b016364d2a97a30a1d6cbbbf6e46e19a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 12:11:25 +0200
Subject: [PATCH 2016/2100] Fix cross-test data dependency by recreating slider
 every time

---
 .../TestSceneRoundedSliderBar.cs              | 22 +++++++++----------
 .../TestSceneShearedSliderBar.cs              | 22 +++++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
index 311034d595..66d54c8562 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
@@ -18,26 +18,24 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private readonly BindableDouble current = new BindableDouble(5)
-        {
-            Precision = 0.1,
-            MinValue = 0,
-            MaxValue = 15
-        };
-
         private RoundedSliderBar<double> slider = null!;
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [SetUpSteps]
+        public void SetUpSteps()
         {
-            Child = slider = new RoundedSliderBar<double>
+            AddStep("create slider", () => Child = slider = new RoundedSliderBar<double>
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Current = current,
+                Current = new BindableDouble(5)
+                {
+                    Precision = 0.1,
+                    MinValue = 0,
+                    MaxValue = 15
+                },
                 RelativeSizeAxes = Axes.X,
                 Width = 0.4f
-            };
+            });
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
index a5072b4e60..c3038ddb3d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
@@ -18,26 +18,24 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private readonly BindableDouble current = new BindableDouble(5)
-        {
-            Precision = 0.1,
-            MinValue = 0,
-            MaxValue = 15
-        };
-
         private ShearedSliderBar<double> slider = null!;
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [SetUpSteps]
+        public void SetUpSteps()
         {
-            Child = slider = new ShearedSliderBar<double>
+            AddStep("create slider", () => Child = slider = new ShearedSliderBar<double>
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Current = current,
+                Current = new BindableDouble(5)
+                {
+                    Precision = 0.1,
+                    MinValue = 0,
+                    MaxValue = 15
+                },
                 RelativeSizeAxes = Axes.X,
                 Width = 0.4f
-            };
+            });
         }
 
         [Test]

From 3b9c4c9d530eeee26f29a920299b0b363cd7348c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 12:04:27 +0200
Subject: [PATCH 2017/2100] Do not revert to default value when double-clicking
 disabled slider

Closes https://github.com/ppy/osu/issues/25228.
---
 osu.Game/Graphics/UserInterface/RoundedSliderBar.cs | 6 +++++-
 osu.Game/Graphics/UserInterface/ShearedSliderBar.cs | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
index e5976fe893..0981881ead 100644
--- a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
@@ -98,7 +98,11 @@ namespace osu.Game.Graphics.UserInterface
                         Origin = Anchor.TopCentre,
                         RelativePositionAxes = Axes.X,
                         Current = { Value = true },
-                        OnDoubleClicked = () => Current.SetDefault(),
+                        OnDoubleClicked = () =>
+                        {
+                            if (!Current.Disabled)
+                                Current.SetDefault();
+                        },
                     },
                 },
                 hoverClickSounds = new HoverClickSounds()
diff --git a/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs b/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
index 9ef5f3073a..60a6670492 100644
--- a/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
@@ -101,7 +101,11 @@ namespace osu.Game.Graphics.UserInterface
                         Origin = Anchor.TopCentre,
                         RelativePositionAxes = Axes.X,
                         Current = { Value = true },
-                        OnDoubleClicked = () => Current.SetDefault(),
+                        OnDoubleClicked = () =>
+                        {
+                            if (!Current.Disabled)
+                                Current.SetDefault();
+                        },
                     },
                 },
                 hoverClickSounds = new HoverClickSounds()

From dbb69419e6d49e6661d31eb22f2445e499e5e742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 12:39:07 +0200
Subject: [PATCH 2018/2100] Add test coverage for parsing new online ID

---
 .../Beatmaps/Formats/LegacyScoreDecoderTest.cs   |  14 ++++++++++++++
 .../Replays/taiko-replay-with-new-online-id.osr  | Bin 0 -> 1531 bytes
 2 files changed, 14 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/Replays/taiko-replay-with-new-online-id.osr

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
index c7fd3ba098..ab88be1511 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
@@ -101,6 +101,20 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestDecodeNewOnlineID()
+        {
+            var decoder = new TestLegacyScoreDecoder();
+
+            using (var resourceStream = TestResources.OpenResource("Replays/taiko-replay-with-new-online-id.osr"))
+            {
+                var score = decoder.Parse(resourceStream);
+
+                Assert.That(score.ScoreInfo.OnlineID, Is.EqualTo(258));
+                Assert.That(score.ScoreInfo.LegacyOnlineID, Is.EqualTo(-1));
+            }
+        }
+
         [TestCase(3, true)]
         [TestCase(6, false)]
         [TestCase(LegacyBeatmapDecoder.LATEST_VERSION, false)]
diff --git a/osu.Game.Tests/Resources/Replays/taiko-replay-with-new-online-id.osr b/osu.Game.Tests/Resources/Replays/taiko-replay-with-new-online-id.osr
new file mode 100644
index 0000000000000000000000000000000000000000..63e05f5fcdbda51e8f7c3322def87f4fc74f8da4
GIT binary patch
literal 1531
zcmV<X1qAv5gu}@J3m{`=HezODVK+51Gh#JiH8o{0Gcz`0V>vTrHZVD6F=Go4b8ul}
zWo=<@Utx4?VRJGIAU8K+FfnCiFg9f~Ic8-uIb%6xWnyJxW-~W5FgY}2Hc0>o00001
z0000000e#v08sz|000003jk|tWgGt0+X(9f003P803ZOTO#lD@000007K}rXlJKRA
z7M`&HOhZfu53FrP?1?N(Ce<_OIe53onYYKWQKjB!yy__GNTqRxRs4t|7d^=w?^a2;
z=;p=RN*NtHSfdZ7KM{`CJ^MjsRn>7amAkGdpDK+x=PDo#tk4aBL?k%f)$Ebh0t%Nn
zphxu;)QK_xDZ_`29#Sl<RhTPf=QajyFj9h54_k=pqBh6p$E&d%pEBAHNq~zC*dua$
zireaj)+hZVHmk$h1F^<FD<|WTztGx-;AshoV+E`18Gt&J)F^O<?cd*UZ8hd@9z!xb
zF;N9%E4A&TS=)p%l&r}vAE>z$-BsTX6oS*tEpL9Ev7g9I5ScQ++9#K`PS+Bg7YLtZ
zZhi6@^BMY%^-@>8#b8diGT>rK8W$eYWM@f+i3@MI*x2jwMoDv7i9dcH+Blva=xLAQ
zQ+tf$l}n5c>1hLZYL!1qq`!()(I1Bi(teRO5k6sX_aTq*mVFs>aNFfP7<L<4=&sD0
zU1I0nJ+?mI29b%hGlM_}u@@6ga?B+*WHR3Kdw0V&%_uvn5Q1(YY!3lzQQZ#|jX#aR
z<hY}g8}F#oW(BU#Q8ov)`=6{S*xozU*<>QeOX;b~w1IAj)Te-(%eMdm^#T`gS4`h=
z`(YRBu5x52OkrvA<c&q3>E;$$5Ka1rR+V@w)I!3+SveB0rxD~l$s=FEk0DPJXI01(
zX<*T#vp20$0MeFEDmFU3$xU;pcASo<?WMR**(C{*tX72%YRXivZ7U&VGJ(jSBZ32~
zb9o4B^z3(LYHaN3X%c1z0qheGx{5sEM?%8LN@$^VZUXy=nyS5D4;o=+Rd$kT>(q2)
zN#UlWQX+|aTA<j`k`qem#<8nJ9x@{-?d?n!ETm_@erp7-vxq9@-95hPu7n%rlV(z%
zp^jon16u`Hhi$|2RzUmJ*0Rvho(h|Ii1%B>rDrD&&we-Q#@5I>P@U#aZ7E_WVu}QZ
z{u?U)bPE60zy8;&*@>H#nKF^r<z?~40z{4I>iT4w%Ra_eUgCD(pFv%H+A(z{%SB~Z
zD*JNyOplwu9x#_r<KfAw6@FS+I4FrwA0NA8_g+~rn2ib%4)Y6Lnf*tfVrZL}zJOX_
z%m<$+DQ45Qeo_rb_d)94&c%|)^i2u71i7#5tXNa+=7A@vPKr25*{1Nv@1~TN`L<bx
zH(5d+z|x8)q@W8BVo{EZ;>abI#%4~0{9EZmm)IZ%cF!fh>HiAX@d}Izf*u8yw}?8+
zNnZ9YLWQcYNC*QlO6tVSziS_G!(qvFc@44`+vV{%9koFdUqvujoNp;)_jO1RN`{^0
zg=z?MuejP`10NKa5$Cxp-Se8FTJyl!tovh4wVKlspX4~-i8~TINGZ^#);*P#i)SE8
zzW1JsdM+A;?~>4&l@303`MAkXiv{_WIWc4$HYYGgMxnMFNGc{X2NX~R?2b@ZRs9cq
z$!to>PZGzdmXRl&AW$UR-r`TGqkjmloZEFshw0Jkawz&1Ok4MmYz+~Jhh=obE&;f{
z+ZS(WELeZ_C2m3BkbxZ&DAUVh89w}bvS8+#qHjecQMK`PKw!@~opfX|DAuPffrNhq
z<qvxEz0bC$>DizxF1oWO4uo1ML<2%wPOFapwVrJdCB~~#Tt?D*NdN!;|NsC0|Ahbm
z09^n8AOPI}000000000zf`AtsFAk^B)WLFNAyG7WV$N8-!j+hPu8$we_e;|#*+iNK
z$kRN=q&Sl0(d`|*oEU1|*~5eG@dH3Miy0i*F=j=X+_a<6T3%2U@VpmXv8`-JhNX1!
hacf^hACxf}U(1HP^l0fR;XoK|ePzq5Xz7uby&!FJ#7qDH

literal 0
HcmV?d00001


From 8b9b085ef5422976b6ec9ef8cd11406c235209fc Mon Sep 17 00:00:00 2001
From: Termincc <112787855+Termincc@users.noreply.github.com>
Date: Thu, 26 Oct 2023 22:15:10 +1000
Subject: [PATCH 2019/2100] Address mod incompatibilities

Makes FreezeFrame and Transform mods incompatible.
---
 osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
index 0a1aab9ef1..89a00d6c32 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => "Burn the notes into your memory.";
 
         //Alters the transforms of the approach circles, breaking the effects of these mods.
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModApproachDifferent) };
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModApproachDifferent), typeof(OsuModTransform) }).ToArray(); 
 
         public override ModType Type => ModType.Fun;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
index 2354cd50ae..92a499e735 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.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.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Fun;
         public override LocalisableString Description => "Everything rotates. EVERYTHING.";
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModWiggle), typeof(OsuModMagnetised), typeof(OsuModRepel) };
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModWiggle), typeof(OsuModMagnetised), typeof(OsuModRepel), typeof(OsuModFreezeFrame) }).ToArray();
 
         private float theta;
 

From 238e8175ae3b2ddb8e8b86dc969ddba2225e693f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Oct 2023 21:26:26 +0900
Subject: [PATCH 2020/2100] Add ability to quick retry using Ctrl-R

Matches osu!stable
---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 20220d88cd..947cd5f54f 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -149,6 +149,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene),
             new KeyBinding(InputKey.ExtraMouseButton2, GlobalAction.SkipCutscene),
             new KeyBinding(InputKey.Tilde, GlobalAction.QuickRetry),
+            new KeyBinding(new[] { InputKey.Control, InputKey.R }, GlobalAction.QuickRetry),
             new KeyBinding(new[] { InputKey.Control, InputKey.Tilde }, GlobalAction.QuickExit),
             new KeyBinding(new[] { InputKey.F3 }, GlobalAction.DecreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.F4 }, GlobalAction.IncreaseScrollSpeed),

From 526ee6e14070a2ba0d09ad544353be52796e698c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 14:46:24 +0200
Subject: [PATCH 2021/2100] Remove `IScoreInfo : IHasNamedFiles` inheritance

---
 osu.Game/Database/IHasRealmFiles.cs | 6 ++++--
 osu.Game/Scoring/IScoreInfo.cs      | 2 +-
 osu.Game/Scoring/ScoreInfo.cs       | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/IHasRealmFiles.cs b/osu.Game/Database/IHasRealmFiles.cs
index 79ea719583..b301bb04de 100644
--- a/osu.Game/Database/IHasRealmFiles.cs
+++ b/osu.Game/Database/IHasRealmFiles.cs
@@ -10,13 +10,15 @@ namespace osu.Game.Database
     /// <summary>
     /// A model that contains a list of files it is responsible for.
     /// </summary>
-    public interface IHasRealmFiles
+    public interface IHasRealmFiles : IHasNamedFiles
     {
         /// <summary>
         /// Available files in this model, with locally filenames.
         /// When performing lookups, consider using <see cref="BeatmapSetInfoExtensions.GetFile"/> or <see cref="BeatmapSetInfoExtensions.GetPathForFile"/> to do case-insensitive lookups.
         /// </summary>
-        IList<RealmNamedFileUsage> Files { get; }
+        new IList<RealmNamedFileUsage> Files { get; }
+
+        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
 
         /// <summary>
         /// A combined hash representing the model, based on the files it contains.
diff --git a/osu.Game/Scoring/IScoreInfo.cs b/osu.Game/Scoring/IScoreInfo.cs
index 4083d57fa0..cde48c3be3 100644
--- a/osu.Game/Scoring/IScoreInfo.cs
+++ b/osu.Game/Scoring/IScoreInfo.cs
@@ -9,7 +9,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Scoring
 {
-    public interface IScoreInfo : IHasOnlineID<long>, IHasNamedFiles
+    public interface IScoreInfo : IHasOnlineID<long>
     {
         IUser User { get; }
 
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 6b03e876c4..722d83cac8 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -187,7 +187,6 @@ namespace osu.Game.Scoring
         IRulesetInfo IScoreInfo.Ruleset => Ruleset;
         IBeatmapInfo? IScoreInfo.Beatmap => BeatmapInfo;
         IUser IScoreInfo.User => User;
-        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
 
         #region Properties required to make things work with existing usages
 

From 900530080ff7f4c33a19b6107214c80ff4f0f997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 14:56:22 +0200
Subject: [PATCH 2022/2100] Make `SoloScoreInfo` implement `IScoreInfo`

---
 .../API/Requests/Responses/SoloScoreInfo.cs    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index 783522220b..0e31f11dc1 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -7,16 +7,16 @@ using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
     [Serializable]
-    public class SoloScoreInfo : IHasOnlineID<long>
+    public class SoloScoreInfo : IScoreInfo
     {
         [JsonProperty("beatmap_id")]
         public int BeatmapID { get; set; }
@@ -138,6 +138,18 @@ namespace osu.Game.Online.API.Requests.Responses
 
         #endregion
 
+        #region IScoreInfo
+
+        public long OnlineID => (long?)ID ?? -1;
+
+        IUser IScoreInfo.User => User!;
+        DateTimeOffset IScoreInfo.Date => EndedAt;
+        long IScoreInfo.LegacyOnlineID => (long?)LegacyScoreId ?? -1;
+        IBeatmapInfo IScoreInfo.Beatmap => Beatmap!;
+        IRulesetInfo IScoreInfo.Ruleset => Beatmap!.Ruleset;
+
+        #endregion
+
         public override string ToString() => $"score_id: {ID} user_id: {UserID}";
 
         /// <summary>
@@ -223,7 +235,5 @@ namespace osu.Game.Online.API.Requests.Responses
             Statistics = score.Statistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
             MaximumStatistics = score.MaximumStatistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
         };
-
-        public long OnlineID => (long?)ID ?? -1;
     }
 }

From c3e9f5184f504f119867c3745af730c6fafe02de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 15:09:34 +0200
Subject: [PATCH 2023/2100] Fix `SoloScoreInfo` not copying over legacy score
 ID when converting to `ScoreInfo`

---
 osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index 0e31f11dc1..ac2d8152b1 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -190,6 +190,7 @@ namespace osu.Game.Online.API.Requests.Responses
             var score = new ScoreInfo
             {
                 OnlineID = OnlineID,
+                LegacyOnlineID = (long?)LegacyScoreId ?? -1,
                 User = User ?? new APIUser { Id = UserID },
                 BeatmapInfo = new BeatmapInfo { OnlineID = BeatmapID },
                 Ruleset = new RulesetInfo { OnlineID = RulesetID },

From cbb2a0dd70ddce70e2e156be7bac632bbc9b6480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 15:09:59 +0200
Subject: [PATCH 2024/2100] Use both score ID types to deduplicate score on
 solo results screen

---
 osu.Game/Screens/Ranking/SoloResultsScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index f187b8a302..da08a26a58 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
+using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Solo;
@@ -67,7 +68,7 @@ namespace osu.Game.Screens.Ranking
                 return null;
 
             getScoreRequest = new GetScoresRequest(Score.BeatmapInfo, Score.Ruleset);
-            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineID != Score.OnlineID).Select(s => s.ToScoreInfo(rulesets, Beatmap.Value.BeatmapInfo)));
+            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => !s.MatchesOnlineID(Score)).Select(s => s.ToScoreInfo(rulesets, Beatmap.Value.BeatmapInfo)));
             return getScoreRequest;
         }
 

From 359ae3120494d0b9d3b61599d6f50f5abe0330ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 15:40:46 +0200
Subject: [PATCH 2025/2100] Fix catch distance snap grid not moving

Regressed in https://github.com/ppy/osu/pull/25154.
Specifically, in 013b5fa916d819ec7a8a93b1692d4aa027934a67
and 74b86349d58e5169e52bbdc70cef3dec81579a74.

A simple case of too-much-code-deleted-itis.
---
 .../Edit/CatchHitObjectComposer.cs            | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 6f0ee260ab..4172720ada 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
@@ -179,5 +180,33 @@ namespace osu.Game.Rulesets.Catch.Edit
                     return null;
             }
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            updateDistanceSnapGrid();
+        }
+
+        private void updateDistanceSnapGrid()
+        {
+            if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True)
+            {
+                distanceSnapGrid.Hide();
+                return;
+            }
+
+            var sourceHitObject = getDistanceSnapGridSourceHitObject();
+
+            if (sourceHitObject == null)
+            {
+                distanceSnapGrid.Hide();
+                return;
+            }
+
+            distanceSnapGrid.Show();
+            distanceSnapGrid.StartTime = sourceHitObject.GetEndTime();
+            distanceSnapGrid.StartX = sourceHitObject.EffectiveX;
+        }
     }
 }

From 79910df9593b8478419b4eb2f4be12b0cfd1dbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 15:46:32 +0200
Subject: [PATCH 2026/2100] Fix catch distance snap provider not hiding slider
 properly

Regressed in https://github.com/ppy/osu/pull/25171.

The old code was kinda dependent on correct order of setting `Disabled`.
`CatchHitObjectComposer` would disable distance spacing in its BDL, and
then via the base `DistancedHitObjectComposer.LoadComplete()`, the
slider would be faded out. The switch to composition broke that
ordering.

To fix, stop relying on ordering and just respond to changes as they
come. That's what bindables are for.
---
 osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
index 0b1809e7d9..ddf539771d 100644
--- a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
@@ -98,12 +98,6 @@ namespace osu.Game.Rulesets.Edit
                 }
             });
 
-            if (DistanceSpacingMultiplier.Disabled)
-            {
-                distanceSpacingSlider.Hide();
-                return;
-            }
-
             DistanceSpacingMultiplier.Value = editorBeatmap.BeatmapInfo.DistanceSpacing;
             DistanceSpacingMultiplier.BindValueChanged(multiplier =>
             {
@@ -116,6 +110,8 @@ namespace osu.Game.Rulesets.Edit
                 editorBeatmap.BeatmapInfo.DistanceSpacing = multiplier.NewValue;
             }, true);
 
+            DistanceSpacingMultiplier.BindDisabledChanged(disabled => distanceSpacingSlider.Alpha = disabled ? 0 : 1, true);
+
             // Manual binding to handle enabling distance spacing when the slider is interacted with.
             distanceSpacingSlider.Current.BindValueChanged(spacing =>
             {

From 5d6a58d443cf6467bcc72b8db4d36875acbab7bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 16:19:53 +0200
Subject: [PATCH 2027/2100] Add failing test scene for scroll handling in song
 select

---
 .../Navigation/TestSceneScreenNavigation.cs   | 38 +++++++++++++++++++
 osu.Game/Screens/Select/SongSelect.cs         |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index fa1ebf5c56..a6d4fb0b52 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -7,6 +7,7 @@ using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -16,6 +17,7 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Configuration;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.Leaderboards;
@@ -34,6 +36,7 @@ using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Screens.Select.Options;
 using osu.Game.Tests.Beatmaps.IO;
@@ -165,6 +168,41 @@ namespace osu.Game.Tests.Visual.Navigation
             ConfirmAtMainMenu();
         }
 
+        [Test]
+        public void TestSongSelectScrollHandling()
+        {
+            TestPlaySongSelect songSelect = null;
+            double scrollPosition = 0;
+
+            AddStep("set game volume to max", () => Game.Dependencies.Get<FrameworkConfigManager>().SetValue(FrameworkSetting.VolumeUniversal, 1d));
+            AddUntilStep("wait for volume overlay to hide", () => Game.ChildrenOfType<VolumeOverlay>().Single().State.Value, () => Is.EqualTo(Visibility.Hidden));
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
+            AddUntilStep("wait for song select", () => songSelect.BeatmapSetsLoaded);
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("store scroll position", () => scrollPosition = getCarouselScrollPosition());
+
+            AddStep("move to left side", () => InputManager.MoveMouseTo(
+                songSelect.ChildrenOfType<Screens.Select.SongSelect.LeftSideInteractionContainer>().Single().ScreenSpaceDrawQuad.TopLeft + new Vector2(1)));
+            AddStep("scroll down", () => InputManager.ScrollVerticalBy(-1));
+            AddAssert("carousel didn't move", getCarouselScrollPosition, () => Is.EqualTo(scrollPosition));
+
+            AddRepeatStep("alt-scroll down", () =>
+            {
+                InputManager.PressKey(Key.AltLeft);
+                InputManager.ScrollVerticalBy(-1);
+                InputManager.ReleaseKey(Key.AltLeft);
+            }, 5);
+            AddAssert("game volume decreased", () => Game.Dependencies.Get<FrameworkConfigManager>().Get<double>(FrameworkSetting.VolumeUniversal), () => Is.LessThan(1));
+
+            AddStep("move to carousel", () => InputManager.MoveMouseTo(songSelect.ChildrenOfType<BeatmapCarousel>().Single()));
+            AddStep("scroll down", () => InputManager.ScrollVerticalBy(-1));
+            AddAssert("carousel moved", getCarouselScrollPosition, () => Is.Not.EqualTo(scrollPosition));
+
+            double getCarouselScrollPosition() => Game.ChildrenOfType<UserTrackingScrollContainer<DrawableCarouselItem>>().Single().Current;
+        }
+
         /// <summary>
         /// This tests that the F1 key will open the mod select overlay, and not be handled / blocked by the music controller (which has the same default binding
         /// but should be handled *after* song select).
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d5ec94ad71..827884f971 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -1019,7 +1019,7 @@ namespace osu.Game.Screens.Select
         /// <summary>
         /// Handles mouse interactions required when moving away from the carousel.
         /// </summary>
-        private partial class LeftSideInteractionContainer : Container
+        internal partial class LeftSideInteractionContainer : Container
         {
             private readonly Action? resetCarouselPosition;
 

From 2fa221738184c9ded7f091cea16bf40f4e02765d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 16:26:31 +0200
Subject: [PATCH 2028/2100] Fix left side of carousel blocking volume adjust
 hotkeys

Closes https://github.com/ppy/osu/issues/25234.

A little ad-hoc, but probably fine...?
---
 osu.Game/Screens/Select/SongSelect.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 827884f971..dfea4e3794 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -1028,7 +1028,10 @@ namespace osu.Game.Screens.Select
                 this.resetCarouselPosition = resetCarouselPosition;
             }
 
-            protected override bool OnScroll(ScrollEvent e) => true;
+            // we want to block plain scrolls on the left side so that they don't scroll the carousel,
+            // but also we *don't* want to handle scrolls when they're combined with keyboard modifiers
+            // as those will usually correspond to other interactions like adjusting volume.
+            protected override bool OnScroll(ScrollEvent e) => !e.ControlPressed && !e.AltPressed && !e.ShiftPressed && !e.SuperPressed;
 
             protected override bool OnMouseDown(MouseDownEvent e) => true;
 

From 0482c05d7c031132a17e5e0fa3e4b605051cd2b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 19:27:05 +0200
Subject: [PATCH 2029/2100] Add failing test case

---
 .../TestSceneMasterGameplayClockContainer.cs  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
index 393217f371..1368b42a3c 100644
--- a/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
@@ -108,6 +108,28 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("gameplay clock time = 10000", () => gameplayClockContainer.CurrentTime, () => Is.EqualTo(10000).Within(10f));
         }
 
+        [Test]
+        public void TestStopUsingBeatmapClock()
+        {
+            ClockBackedTestWorkingBeatmap working = null;
+            MasterGameplayClockContainer gameplayClockContainer = null;
+            BindableDouble frequencyAdjustment = new BindableDouble(2);
+
+            AddStep("create container", () =>
+            {
+                working = new ClockBackedTestWorkingBeatmap(new OsuRuleset().RulesetInfo, new FramedClock(new ManualClock()), Audio);
+                Child = gameplayClockContainer = new MasterGameplayClockContainer(working, 0);
+
+                gameplayClockContainer.Reset(startClock: true);
+            });
+
+            AddStep("apply frequency adjustment", () => gameplayClockContainer.AdjustmentsFromMods.AddAdjustment(AdjustableProperty.Frequency, frequencyAdjustment));
+            AddAssert("track frequency changed", () => working.Track.AggregateFrequency.Value, () => Is.EqualTo(2));
+
+            AddStep("stop using beatmap clock", () => gameplayClockContainer.StopUsingBeatmapClock());
+            AddAssert("frequency adjustment unapplied", () => working.Track.AggregateFrequency.Value, () => Is.EqualTo(1));
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             localConfig?.Dispose();

From 565ae99e0dfddbecef6bc24828ba6c39c837f5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 19:27:50 +0200
Subject: [PATCH 2030/2100] Fix `StopUsingBeatmapClock()` applying adjustments
 to track it was supposed to stop using

- Closes https://github.com/ppy/osu/issues/25248
- Possibly also closes https://github.com/ppy/osu/issues/20475

Regressed in e33486a766044c17c2f254f5e8df6d72b29c341e.

`StopUsingBeatmapClock()` intends to, as the name says, stop operating
on the working beatmap clock to yield its usage to other components on
exit. As part of that it tries to unapply audio adjustments so that
other screens can apply theirs freely instead.

However, the aforementioned commit introduced a bug in this. Previously
to it, `track` was an alias for the `SourceClock`, which could be
mutated in an indirect way via `ChangeSource()` calls. The
aforementioned commit made `track` a `readonly` field, initialised in
constructor, which would _never_ change value. In particular, it would
_always_ be the beatmap track, which meant that
`StopUsingBeatmapClock()` would remove the adjustments from the beatmap
track, but then at the end of the method, _apply them onto that same
track again_.

This was only saved by the fact that clock adjustments are removed again
on disposal of the `MasterGameplayClockContainer()`. This - due to async
disposal pressure - could explain infrequently reported cases wherein
the track would just continue to speed up ad infinitum.

To fix, fully substitute the beatmap track for a virtual track at the
point of calling `StopUsingBeatmapClock()`.
---
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 70d9ecd3e7..6e07b01b5f 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play
 
         private readonly WorkingBeatmap beatmap;
 
-        private readonly Track track;
+        private Track track;
 
         private readonly double skipTargetTime;
 
@@ -188,11 +188,11 @@ namespace osu.Game.Screens.Play
         {
             removeSourceClockAdjustments();
 
-            var virtualTrack = new TrackVirtual(beatmap.Track.Length);
-            virtualTrack.Seek(CurrentTime);
+            track = new TrackVirtual(beatmap.Track.Length);
+            track.Seek(CurrentTime);
             if (IsRunning)
-                virtualTrack.Start();
-            ChangeSource(virtualTrack);
+                track.Start();
+            ChangeSource(track);
 
             addSourceClockAdjustments();
         }

From fdb81bfa4ca2d9819bb0c252059b7b84919af583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 19:38:41 +0200
Subject: [PATCH 2031/2100] Rename methods to not mention "source clock"
 anymore

---
 .../Screens/Play/MasterGameplayClockContainer.cs     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 6e07b01b5f..1c860e9d4b 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Screens.Play
 
         protected override void StartGameplayClock()
         {
-            addSourceClockAdjustments();
+            addAdjustmentsToTrack();
 
             base.StartGameplayClock();
 
@@ -186,7 +186,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public void StopUsingBeatmapClock()
         {
-            removeSourceClockAdjustments();
+            removeAdjustmentsFromTrack();
 
             track = new TrackVirtual(beatmap.Track.Length);
             track.Seek(CurrentTime);
@@ -194,12 +194,12 @@ namespace osu.Game.Screens.Play
                 track.Start();
             ChangeSource(track);
 
-            addSourceClockAdjustments();
+            addAdjustmentsToTrack();
         }
 
         private bool speedAdjustmentsApplied;
 
-        private void addSourceClockAdjustments()
+        private void addAdjustmentsToTrack()
         {
             if (speedAdjustmentsApplied)
                 return;
@@ -213,7 +213,7 @@ namespace osu.Game.Screens.Play
             speedAdjustmentsApplied = true;
         }
 
-        private void removeSourceClockAdjustments()
+        private void removeAdjustmentsFromTrack()
         {
             if (!speedAdjustmentsApplied)
                 return;
@@ -228,7 +228,7 @@ namespace osu.Game.Screens.Play
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            removeSourceClockAdjustments();
+            removeAdjustmentsFromTrack();
         }
 
         ControlPointInfo IBeatSyncProvider.ControlPoints => beatmap.Beatmap.ControlPointInfo;

From 24b1d1e9558badb2f1a6cb5dc30a5aa6fc79f41d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Oct 2023 18:18:07 +0900
Subject: [PATCH 2032/2100] Fix code quality fail

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
index 89a00d6c32..f1197ce0cd 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => "Burn the notes into your memory.";
 
         //Alters the transforms of the approach circles, breaking the effects of these mods.
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModApproachDifferent), typeof(OsuModTransform) }).ToArray(); 
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModApproachDifferent), typeof(OsuModTransform) }).ToArray();
 
         public override ModType Type => ModType.Fun;
 

From f931f4c324f96063a3964fc660daf06d99e657d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Oct 2023 18:19:44 +0900
Subject: [PATCH 2033/2100] Remove reundant interface specification

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

diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index c2b80b7ead..9763d3b57e 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Skinning
 {
     [MapTo("Skin")]
     [JsonObject(MemberSerialization.OptIn)]
-    public class SkinInfo : RealmObject, IHasRealmFiles, IEquatable<SkinInfo>, IHasGuidPrimaryKey, ISoftDelete, IHasNamedFiles
+    public class SkinInfo : RealmObject, IHasRealmFiles, IEquatable<SkinInfo>, IHasGuidPrimaryKey, ISoftDelete
     {
         internal static readonly Guid TRIANGLES_SKIN = new Guid("2991CFD8-2140-469A-BCB9-2EC23FBCE4AD");
         internal static readonly Guid ARGON_SKIN = new Guid("CFFA69DE-B3E3-4DEE-8563-3C4F425C05D0");

From 7140eee870bab0d86ab25c15f3d56dce1b68d627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 11:38:10 +0200
Subject: [PATCH 2034/2100] Add failing test coverage for quick retry after
 completion not changing rank

---
 osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index a6d4fb0b52..2f378917e6 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -259,6 +259,7 @@ namespace osu.Game.Tests.Visual.Navigation
             var getOriginalPlayer = playToCompletion();
 
             AddStep("attempt to retry", () => getOriginalPlayer().ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddAssert("original play isn't failed", () => getOriginalPlayer().Score.ScoreInfo.Rank, () => Is.Not.EqualTo(ScoreRank.F));
             AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen != getOriginalPlayer() && Game.ScreenStack.CurrentScreen is Player);
         }
 

From 86a8ab6db6548d211e5f0e5ff1a4feb4b7a506c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 11:39:43 +0200
Subject: [PATCH 2035/2100] Fix quick retry immediately after completion
 marking score as failed

Closes https://github.com/ppy/osu/issues/25247.

The scenario involved here is as follows:

1. User completes beatmap by hitting all notes.
2. `checkScoreCompleted()` determines completion, and calls
   `progressToResults(withDelay: true)`.
3. `progressToResults()` schedules `resultsDisplayDelegate`, which
   includes a call to `prepareAndImportScoreAsync()`, a second in the
   future.
4. User presses quick retry hotkey.
   This calls `Player.Restart(quickRestart: true)`,
   which invokes `Player.RestartRequested`,
   which in turn calls `PlayerLoader.restartRequested(true)`,
   which in turn causes `PlayerLoader` to make itself current,
   which means that `Player.OnExiting()` will get called.
5. `Player.OnExiting()` sees that `prepareScoreForDisplayTask` is null
   (because `prepareAndImportScoreAsync()` - which sets it -
   is scheduled to happen in the future), and as such assumes that
   the score did not complete. Thus, it marks the score as failed.
6. `Player.Restart()` after invoking `RestartRequested` calls
   `PerformExit(false)`, which then will unconditionally call
   `prepareAndImportScoreAsync()`. But the score has already been marked
   as failed.

The flow above can be described as "convoluted", but I'm not sure I have
it in me right now to try and refactor it again. Therefore, to fix,
switch the `prepareScoreForDisplayTask` null check in
`Player.OnExiting()` to check `GameplayState.HasPassed` instead, as it
is not susceptible to the same out-of-order read issue.
---
 osu.Game/Screens/Play/Player.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 97bfa35d49..18d0a65d7a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1115,8 +1115,7 @@ namespace osu.Game.Screens.Play
                 if (!GameplayState.HasPassed && !GameplayState.HasFailed)
                     GameplayState.HasQuit = true;
 
-                // if arriving here and the results screen preparation task hasn't run, it's safe to say the user has not completed the beatmap.
-                if (prepareScoreForDisplayTask == null && DrawableRuleset.ReplayScore == null)
+                if (!GameplayState.HasPassed && DrawableRuleset.ReplayScore == null)
                     ScoreProcessor.FailScore(Score.ScoreInfo);
             }
 

From 3944b045ed4582b233066dc714be6075b47482f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 11:58:02 +0200
Subject: [PATCH 2036/2100] Add extra test coverage for marking score as failed

---
 osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 2f378917e6..7fa4f8c836 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -247,6 +247,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("end spectator before retry", () => Game.SpectatorClient.EndPlaying(player.GameplayState));
 
             AddStep("attempt to retry", () => player.ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddAssert("old player score marked failed", () => player.Score.ScoreInfo.Rank, () => Is.EqualTo(ScoreRank.F));
             AddUntilStep("wait for old player gone", () => Game.ScreenStack.CurrentScreen != player);
 
             AddUntilStep("get new player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);

From 96d784e06bd6068f09620eaaa45c4766d0da900d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 12:39:54 +0200
Subject: [PATCH 2037/2100] Delete `ScoreInfo.HasReplay` as no longer needed

---
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs | 2 +-
 osu.Game/Scoring/IScoreInfo.cs                                  | 2 --
 osu.Game/Scoring/ScoreInfo.cs                                   | 2 --
 osu.Game/Screens/Ranking/ReplayDownloadButton.cs                | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
index 6ccf73d8ff..5b32f380b9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
@@ -213,7 +213,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             OnlineID = hasOnlineId ? online_score_id : 0,
             Ruleset = new OsuRuleset().RulesetInfo,
             BeatmapInfo = beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps.First(),
-            Hash = replayAvailable ? "online" : string.Empty,
+            HasOnlineReplay = replayAvailable,
             User = new APIUser
             {
                 Id = 39828,
diff --git a/osu.Game/Scoring/IScoreInfo.cs b/osu.Game/Scoring/IScoreInfo.cs
index cde48c3be3..a1d076b8c2 100644
--- a/osu.Game/Scoring/IScoreInfo.cs
+++ b/osu.Game/Scoring/IScoreInfo.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Scoring
 
         double Accuracy { get; }
 
-        bool HasReplay { get; }
-
         long LegacyOnlineID { get; }
 
         DateTimeOffset Date { get; }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 722d83cac8..d712702331 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -94,8 +94,6 @@ namespace osu.Game.Scoring
 
         public double Accuracy { get; set; }
 
-        public bool HasReplay => !string.IsNullOrEmpty(Hash) || HasOnlineReplay;
-
         [Ignored]
         public bool HasOnlineReplay { get; set; }
 
diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index b6166e97f6..df5f9c7a8a 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Ranking
                 if (State.Value == DownloadState.LocallyAvailable)
                     return ReplayAvailability.Local;
 
-                if (Score.Value?.HasReplay == true)
+                if (Score.Value?.HasOnlineReplay == true)
                     return ReplayAvailability.Online;
 
                 return ReplayAvailability.NotAvailable;

From 32fc19ea0d2515aeab4e84248f6cf67ec7d7de98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 13:22:17 +0200
Subject: [PATCH 2038/2100] Fix results screen test failure

---
 osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 146482e6fb..ab2e867255 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -362,7 +362,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     var score = TestResources.CreateTestScoreInfo();
                     score.TotalScore += 10 - i;
-                    score.Hash = $"test{i}";
+                    score.HasOnlineReplay = true;
                     scores.Add(score);
                 }
 

From 2d5b1711f6ffc233ca308153a665d18dcbbccea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 13:27:48 +0200
Subject: [PATCH 2039/2100] Share `!HasPassed` condition

---
 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 18d0a65d7a..a1ec0b3167 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1110,12 +1110,12 @@ namespace osu.Game.Screens.Play
             failAnimationContainer?.Stop();
             PauseOverlay?.StopAllSamples();
 
-            if (LoadedBeatmapSuccessfully)
+            if (LoadedBeatmapSuccessfully && !GameplayState.HasPassed)
             {
-                if (!GameplayState.HasPassed && !GameplayState.HasFailed)
+                if (!GameplayState.HasFailed)
                     GameplayState.HasQuit = true;
 
-                if (!GameplayState.HasPassed && DrawableRuleset.ReplayScore == null)
+                if (DrawableRuleset.ReplayScore == null)
                     ScoreProcessor.FailScore(Score.ScoreInfo);
             }
 

From dc7f5cd6edc94275a56b3b5cdb5766c76c84181c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 13:30:51 +0200
Subject: [PATCH 2040/2100] Add preventive assertions concerning submission
 flow state

---
 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 a1ec0b3167..58c8c3389a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1112,6 +1112,8 @@ namespace osu.Game.Screens.Play
 
             if (LoadedBeatmapSuccessfully && !GameplayState.HasPassed)
             {
+                Debug.Assert(resultsDisplayDelegate == null && prepareScoreForDisplayTask == null);
+
                 if (!GameplayState.HasFailed)
                     GameplayState.HasQuit = true;
 

From 6789a522d6d79d6fd1d4f8c15b9c83b119ab61b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 14:15:30 +0200
Subject: [PATCH 2041/2100] Rename test to distinguish it from test-to-come

---
 .../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 88904bf85b..d08d53f747 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Navigation
         private SkinEditor skinEditor => Game.ChildrenOfType<SkinEditor>().FirstOrDefault();
 
         [Test]
-        public void TestEditComponentDuringGameplay()
+        public void TestEditComponentFromGameplayScene()
         {
             advanceToSongSelect();
             openSkinEditor();

From b5cb5380045b0d8be6031cbdffb4a799ac402bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 14:23:41 +0200
Subject: [PATCH 2042/2100] Add failing test case for skin editor freeze

---
 .../TestSceneSkinEditorNavigation.cs          | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index d08d53f747..c17a9ddf5f 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -5,6 +5,7 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
@@ -18,6 +19,7 @@ using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
+using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps.IO;
 using osuTK;
 using osuTK.Input;
@@ -69,6 +71,28 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("value is less than default", () => hitErrorMeter.JudgementLineThickness.Value < hitErrorMeter.JudgementLineThickness.Default);
         }
 
+        [Test]
+        public void TestMutateProtectedSkinDuringGameplay()
+        {
+            advanceToSongSelect();
+            AddStep("set default skin", () => Game.Dependencies.Get<SkinManager>().CurrentSkinInfo.SetDefault());
+
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("enable NF", () => Game.SelectedMods.Value = new[] { new OsuModNoFail() });
+            AddStep("enter gameplay", () => InputManager.Key(Key.Enter));
+
+            AddUntilStep("wait for player", () =>
+            {
+                DismissAnyNotifications();
+                return Game.ScreenStack.CurrentScreen is Player;
+            });
+
+            openSkinEditor();
+            AddUntilStep("current skin is mutable", () => !Game.Dependencies.Get<SkinManager>().CurrentSkin.Value.SkinInfo.Value.Protected);
+        }
+
         [Test]
         public void TestComponentsDeselectedOnSkinEditorHide()
         {

From 5ad962070c0448b81c8457b8816818b6e6041502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 14:34:30 +0200
Subject: [PATCH 2043/2100] Fix skin editor freezing game if opened during
 active gameplay

---
 osu.Game/Database/ImportParameters.cs          | 6 ++++++
 osu.Game/Database/RealmArchiveModelImporter.cs | 6 +++---
 osu.Game/Skinning/SkinManager.cs               | 5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/ImportParameters.cs b/osu.Game/Database/ImportParameters.cs
index 83ca0ac694..8d37597afc 100644
--- a/osu.Game/Database/ImportParameters.cs
+++ b/osu.Game/Database/ImportParameters.cs
@@ -21,5 +21,11 @@ namespace osu.Game.Database
         /// Whether this import should use hard links rather than file copy operations if available.
         /// </summary>
         public bool PreferHardLinks { get; set; }
+
+        /// <summary>
+        /// If set to <see langword="true"/>, this import will not respect <see cref="RealmArchiveModelImporter{TModel}.PauseImports"/>.
+        /// This is useful for cases where an import <em>must</em> complete even if gameplay is in progress.
+        /// </summary>
+        public bool ImportImmediately { get; set; }
     }
 }
diff --git a/osu.Game/Database/RealmArchiveModelImporter.cs b/osu.Game/Database/RealmArchiveModelImporter.cs
index 730465e1b0..5383040eb4 100644
--- a/osu.Game/Database/RealmArchiveModelImporter.cs
+++ b/osu.Game/Database/RealmArchiveModelImporter.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Database
         /// <param name="cancellationToken">An optional cancellation token.</param>
         public virtual Live<TModel>? ImportModel(TModel item, ArchiveReader? archive = null, ImportParameters parameters = default, CancellationToken cancellationToken = default) => Realm.Run(realm =>
         {
-            pauseIfNecessary(cancellationToken);
+            pauseIfNecessary(parameters, cancellationToken);
 
             TModel? existing;
 
@@ -560,9 +560,9 @@ namespace osu.Game.Database
         /// <returns>Whether to perform deletion.</returns>
         protected virtual bool ShouldDeleteArchive(string path) => false;
 
-        private void pauseIfNecessary(CancellationToken cancellationToken)
+        private void pauseIfNecessary(ImportParameters importParameters, CancellationToken cancellationToken)
         {
-            if (!PauseImports)
+            if (!PauseImports || importParameters.ImportImmediately)
                 return;
 
             Logger.Log($@"{GetType().Name} is being paused.");
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index ca46d3af0c..59c2a8bca0 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -182,7 +182,10 @@ namespace osu.Game.Skinning
                     Name = NamingUtils.GetNextBestName(existingSkinNames, $@"{s.Name} (modified)")
                 };
 
-                var result = skinImporter.ImportModel(skinInfo);
+                var result = skinImporter.ImportModel(skinInfo, parameters: new ImportParameters
+                {
+                    ImportImmediately = true // to avoid possible deadlocks when editing skin during gameplay.
+                });
 
                 if (result != null)
                 {

From 35f30d6135b29b73b68d861bb68564cc951f1a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 14:39:58 +0200
Subject: [PATCH 2044/2100] Scale back debug assertion

The import preparation task can actually be non-null when exiting even
if the player hasn't passed:

- fail beatmap
- click import button to import the failed replay
---
 osu.Game/Screens/Play/Player.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 58c8c3389a..2392fd9f76 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1112,7 +1112,7 @@ namespace osu.Game.Screens.Play
 
             if (LoadedBeatmapSuccessfully && !GameplayState.HasPassed)
             {
-                Debug.Assert(resultsDisplayDelegate == null && prepareScoreForDisplayTask == null);
+                Debug.Assert(resultsDisplayDelegate == null);
 
                 if (!GameplayState.HasFailed)
                     GameplayState.HasQuit = true;

From 7a5f3b856f41d3288b2d7940cb9009dabf8d8770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 19:43:49 +0200
Subject: [PATCH 2045/2100] Add visual test coverage for displaying hitcircles
 with high combo index

---
 .../Resources/special-skin/display-0@2x.png      | Bin 0 -> 5085 bytes
 .../Resources/special-skin/display-1@2x.png      | Bin 0 -> 1262 bytes
 .../Resources/special-skin/display-2@2x.png      | Bin 0 -> 3534 bytes
 .../Resources/special-skin/display-3@2x.png      | Bin 0 -> 3456 bytes
 .../Resources/special-skin/display-4@2x.png      | Bin 0 -> 3213 bytes
 .../Resources/special-skin/display-5@2x.png      | Bin 0 -> 3647 bytes
 .../Resources/special-skin/display-6@2x.png      | Bin 0 -> 4954 bytes
 .../Resources/special-skin/display-7@2x.png      | Bin 0 -> 2503 bytes
 .../Resources/special-skin/display-8@2x.png      | Bin 0 -> 5710 bytes
 .../Resources/special-skin/display-9@2x.png      | Bin 0 -> 5195 bytes
 .../Resources/special-skin/skin.ini              |   1 +
 .../TestSceneHitCircle.cs                        |  10 ++++++----
 12 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-0@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-1@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-2@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-3@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-4@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-5@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-6@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-7@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-8@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-9@2x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-0@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-0@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..67d2e2cf04a71c59957a79a69ef6de8e02a6bbb2
GIT binary patch
literal 5085
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-1@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-1@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2df10655efabdb9eefbad32abd4be42deef4fb02
GIT binary patch
literal 1262
zcmeAS@N?(olHy`uVBq!ia0vp^IzXJo!3HFcw{9)~QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XBc7rhE@gG;rfNGjOT^vIy;@-}&_Lp`PXb?Yi*oMiei6eZX
zfU1z7(2@mSQC`1P_AA)8sp&2}q+9ADa#Dn?(LsUB;Y2`!gFxIQQK=JW?)7fIcf0!C
z+nap9Jtu!%`@YQnSn+i03$r45E<f95s-~`P@9>#T>A1DjarutZbLY;Te{PxcT!RyJ
zZO@dCM0Z@jaos^q!A~K~@t5^`#;ikmY5SiP?ezEKPxkls-&0#x$Cs07uar}t)w!Uu
zs=9jmgQrTVyJY_t9yB^|rf8PqHP*QodX>47&wet>5R2UIy8PBp6|Ul0KG&Kf4p$ti
zef#RwEFu0^FJ2@#J3HqjBs6?)y?E`}&JQe??!9~R=G(VvckkTU@cQ*@tDF1w?bFQ=
zdvWA5M|oM9-$OH56C<NT%a$*{dE`jTdY-SR-%sXwxLtnJ-o0nNmI_(h*pyVuC~<a6
z%E`;8fByVACoiw>yP%1t=SibYQ|{=?Z{M`((6s5(Zyr0wcHgbw9}rk2`tx>gYPtU;
z^W-Xl=i(nZl(jMs<p=Flee%y@)2Ghfik8`tVnESV&41LUMmxRZpDg<OsrS4NcZ(P5
zCNm>h?(<J_wK?RWoZ{+X7StBHX;aG`p`!X*n>vgRw^U5fQT9IZw=nhS-=x$TCxXIM
zJj4RIy4it_X}L2$WLlr|pA^CVf(!l`ULYyXvj!7e*YtSV1+^XR=gyp>BV>8FMKkha
z#jNns&f2Hja!N|R$eO%QTyB$h+41h(yF7W8H}Bq+-5+jiVX<QC)1sO8OCBGnSj=z!
z|IZ8+8CltlckjlQ6*cjn`k(SpaSN00%SVrr*tgprQkW%f+*4RudX)Xn?c1x5{`+Sq
zzCJ|D=5%v&v&|$WuE{#*c+EeQ9$IKxQ(u4H&);A2j>G2z>dZZ7&-#Yxh(#_8c(DHb
z`SU;j?dsU1#gsi`0{g_<n>QQBNo6Yb>nm|RUf(A7WbUDqjcdbJzxnuaV*YETetl)G
zcqa?d_d>4I3<{?T99Pde6fpnC>II=Ylyn^bG~H;@X6cX7JHB}N^5r~%NB@R4FLj)t
z6BK^<-Q<@_N6b4|UH>%fFj4hp@vQc<I%DF(`1EPR_HKdwKl}77R^(ZBu$)wqduY+o
zJZnXwXlH9?fR*88B@Z!Al{J&5=1+LE=vPa~r_S_=`jwfF&GVEVx}8+IWjbeD$&HFA
zQyso_)l)mF_)KEk4twYx-sSSQWs7moi)qd>Ta4~-2&K=+=#)~E3KRos__o(YBFc2m
zR-H)}hnM}Y{-!)}gV(mytR1RGYbI@#{HC~-C;jN@vm4$S$A)Y%o?{v%DVF(bHOoaI
zQy-H>I&pct>8)kF>Aj+6Bq855_J1#&y5qI<&~zbTV`Jl-va)IV>V917w#7zACj&D`
zUca;5{BV8YzNYyfZrqTNmXo^{CD!=brQqk$j~_SQew^TPLuJ#4`ua;BmkOUdedfT=
zf;hjJ#PgRrdBDs!_5!<0=N!F0iKYIjhm3<&w|-q<-OBExIz4|`-`mdZZe_Mq1eQ?@
Mp00i_>zopr0AYwh{{R30

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-2@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-2@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..eeb8ec0edf1953c6a8b036e6e33207bb99f84bf6
GIT binary patch
literal 3534
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
IM6N<$f*~28E&u=k

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-3@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-3@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ee73f503aa11548b1dc44347629007b288ceefb
GIT binary patch
literal 3456
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-4@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-4@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..eab26e36a0ff5c205b47d5ada6aeb28e4fa4d4bf
GIT binary patch
literal 3213
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-5@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-5@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8056248a4b34ca98047c3342539f2a4ed978e206
GIT binary patch
literal 3647
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
RUbX-L002ovPDHLkV1o42t)Tz_

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-6@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-6@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7ca3de273a41466b8bc1b774d99a233df2c5a9d
GIT binary patch
literal 4954
zcmV-g6Q%5lP)<h;3K|Lk000e1NJLTq00372003<W1^@s6)G7U^00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY67NYwK~#8N?Va0`
zRK*>~8xeFDWaYjKa#vO^LgXSKAVGv!3Y1n^QYjwtVk+U$yyY*T@{&}1h)KnVT#8Cj
zl>(Ir1#(wJ1Q9RDMNkB}BR7Es1kCT#(><K&Ik%b9XLgt3Th-M&XU@!-^Etos>tFx6
z`>eXFyK0x}VCtG`?AWn0rRpQ)e!Zdgx+>+=r=Nbhq3|*v)fBEkog~%IrA(00B&AMD
zYv>0l-%438fd8qt<e-|tHDDJ=nbWy*=TU6?>8GElBI{eXZt2=8X@6T=+0RGqS6^TM
zFRA{Kmj&Nr>Rc57`+QpgYwAH#a8J1?ceoDN;cQDd;aY)34@k+)@8=4)jf2fyx%u2m
zz;^4_O*J$$sQd1_PrnXRhYpqfR3QKO<B#g{<;&{QrAzAS)vM}<A85yJt4o(IJEeLp
zuSP8wxRroyYHCuCJ@%M-<dH|z0}pVQ-j)UGg1zUS(i_g*@A~!Y>e#Vk>g%t+*5%BZ
zGr9!D@w;~I+P>gc0=9qu{%XpUDQecNS!(Fep{lN~t_a8ibivu$%H58I9yoA7z5DLF
z>cbB|RG)qJS@C#Q_I2KHz53j?1or*+-;V`rd~=HwIuyCc8{F0e+tSjajvhU#HgDdn
z-hA^-wQ18P_2rjeCV@rArJO4K>0drAm!20Lgqnjrc<`WFyLPR5>#esm;C=h{C4!Yk
zbhlJH^6Ee!FL1?bvDn!HHnxM17g*fD%9ShC`t|G8kt0Xaf?XqJqu!8{N`HA3GVb6N
zDRTvGV{3rLzv2c^99V&RLjDBoyHYla)o$axyj1$@D^$SG&KI!5+Bn#Q@+U4}tw3F>
z-^f{6-GcSAkzk2q+W=Us^=&C{)Cw#rJ&Out{Oqp<?5rrT4?g&ynmTo=nmc!HtALd_
zwx({tRTj(rnUvvCV5x@;8KTCIAKzMFaRdL8@^^vyhgyS0Rlzk@JEc>nP6K!y26oV(
zL2AN;32MZM5v>7szf?7M1FkBDYZ|d<q%`w73~axC{nQgrJfX&o8>f2o=ure!L$L2i
zS=t)b8dNowOCvT_tTr_4>fXJ(hH4wI`uckPUNvCR*|TTW#~**J^91b)EUE~uaR;*n
z?1(V12zOxpY*w)33U=?_tv>qbBb_He?FB5V)N*4RvEIFVtC1r|YCr1(EJ+x^e)ZK?
zdRuz}i%QQhM#gFv-Fxr7GkEQSC7z@Kn>TNsnl^2kZp5;J#m|z2iOUrT*mF{0)?1|<
zk`k8Xs>x8gtJ1TKk-%Ln)k1+gAPnr_!GqPa&pxYtEj_Yo!SXrs10-U|7bN6kNfum^
za@y24rG$yp;#nyNr0kQjzZRfN&on{;mPs713fOsJV0-rLsXGf;Exxu(moECfYQSE(
zaz(xO-g`QANFpW*EXPIe?}^*LSFc`lDo#o{EG2i)9Zemp#>U29NcD_BXymnfg80~{
zpMIK)kQppt7gqbpC!eSb7cS`ctlZ<eKy7X1?tl66<*ss!MyZ?ScMg$FBczO!^BW_j
z*U6J7>CJglTDS|Pnk)dix<9yY-@fX}C!f@oE0&?RRRb2CIB`P9vXuS%X`^n-J+2GX
z)>cXTU%GUut3Ym)x>?){^A{eL^KAABIT5aD$mVzK*m1P`gHdyHvxfWVqmL>H(aON3
z1&h@Z&(eT>@WBUqn^h7hTU({w-_`=SLCRnQd9VO(l5#^JAJsclsnRnKk!{EXg6`@D
z!QyLY&z`Mbdg&$g&_fTEflCXP*No1tUcFkEty^jM3nFf2*!}+dljm;mJwzJk&!1O&
z_wLo(lE7L8UpF;1VYwvJGlh1gXYa^1WCCFxuY+LG@ZrPN3opE&ql745Yvpbaf<=c9
zAJ)Eh@nWu}QlmzV(r$*hneMb$mELYYXXPG;ISP!YefQmW>fE_=+HV7!-d!57RsuM4
z{<rj(ITE<Pk!q2g&{!8NKWN5`8S3SiUse+*PSo36fL88y7cBbz`|s5kUwonV?AfDX
zkgg>17(IHlhTOSxXR~L#_+5M#^A@PNBaR<Gt}h<jcx`)oC=9HX0M3-MET!N`;Qmpn
zUrNzYf)ziAB>0>;bJYC#^VNU>12Ta{_+0V`fJG#Ha656caMFtJ1?)H9e4`6i%w!RP
zW%h_ywQeG^K{GDlc`4)d1|xf=X~>8Ws4akM!6F*NZr!@6K7IP=!t5J~tIfOFL~oJr
z<hL@jM;a^r-P{e|e#<o7c!{g&BfqDo{MlJPdp>PL7YSFsM8~%LsW*r$SZ>ovlP0OB
zo_b2>6HpegwG^OfB<V%s$GM1HSOI4C2$ulvDf@PlKQGF@TMAp_6$e+xwo-IUV!=`m
z95_(J9W!Q(zWVJ2Y*3^|ac9Ko5@x2dVq?J_gw3@yv2Z9{*ChnOA{rT70{MjY2-b@5
z4nwKLie(?teK!Q~sU-Ih3RgbJXah;{fi76wz~hfUt|J6m^q|@k*q~f1=JyiHg-NWp
zs{m##$Au*K5CwOZRMQ2hcBnzXTxo{NtxK?KuVAf$R?NKK8#ivm0q&i~Jw(B!%S-TD
z%q7^GxwO_LShaVsL1D#27IZ!szl(AaY1~7BLO{mfJ}fZH#>hA*-CX%X{Tkg#V6B)E
zK*FD}ElScc0m4)%xX)0P!4<K(rH2canmClsLsa(bP5^6V8*RePC<$OvmJ^IYmMIJ_
z84|tt&IL>Yg<ex|9>Sdn7SUMKwlLT#@XXdwVcvS$tgA4%4N~gDEEl-=q&pp~RT}po
z>MKRh;c!*fpxMSuV3ssy_*p`*$&)8*_fQM49GBz^gO%h17^q~Vf<op?T5a8p<xa{=
zoa?n~*L33+*2yrT*>&O5;zkZ7aBb(|=FOYqgJ2P9KYC>Vwjo#^VCC3Fpxd@>)8lCr
zhS(YUA)`gHusPw=r%&tfiQknb?^}uZJ~|jg4J4ONohqN@FL2>_TJ~92*iujlT%oT!
z54UdJ8pvx476F%;G&p+X8!S+Pw0-+_J@wv>NbK6ROAk~6n@kp2Eoz2=fK14QC9{pp
z7s+z0%_n4BA#2zU9Xh0s<4UZzK>(i<ekTMl!~0q;Tvn4$6Sz%5u!y)8$3AS>uw1|b
z52$O_tkD*`ZrwVag9SKp?<6b6-2hJd@Z!ab+FfuPV{Jh3CGHF^VpN(^;IhzdchEJs
zaG6mvNlupK`bCi_XGDN5FWp4s8|<o8t29tXBe(^T3)BVcz9uP-yTE!W#O1yK<8rt&
zxPTnTmB76$)n57S#e8qU1Y-nPTmqd3YLo}qjT<*=HxLCh32acflnom;s1++#Xsh-i
zLNi=quxILst61`8sO91ocnw%Yf7?z84dxTF$OXG&#||%Gt(djLF<7eV%YyOc)_U#T
zWo4p<GeN%_X}K0GCqk$rA1n?+`VeDTL;zT88nE)CPfOV&WvBEK_n7gmSn=J=fnYS*
z4j*L^){9#t-j7fZDaGeExNvm`A_z7QVNpyC<)qWN0-#E@O3GiQyk_eE2;fagkZ}=P
zwrtUZpFTv&H3lvLcQH(H;o>v&{o|gXPcdM~yaN1T6i{kzF)753EPVcpwA6YLw5fk5
z+g_LQKLN}zc%%rQfa}A0aW83IOcAclhDjJxmJLI`8Zo}}^UpumA&nj4c8^CbP!ku7
z$TsE^ydmXn0bDx&DWIJ@ck1K$uwL39Tth;>K`Usvk=Zbx!q;N8#IPvrcm`~$1tSJJ
z`@9op!E^w8SZ@lyTT~EkWHyZ6j*s~Rh!~OE6swH@iw|X{OX@iS0l*ugd@$B)a}rra
z)R2aU>vKa-m@i|Jh7aLq31`BNW5k?UrVyn9Yi0IdD}~R8%1#WamCE3v;0ZIvAM8M6
z5iWt-(<VP$uwu1Gq}nQ=s+yZ+KDSk@m+vVPU1{zb9}Qa?C0Z`N1+XN^vkI3$a33=%
zj;zS8!k<-(&zEOcL;_zQ--l~RqgcyD_!c@4KC(<$E;A3qz#3n>vs$aQGM}fT5$bz6
zKBX3lwA?&ISCotu3ONpETuj$x6n-~!*p`Hj{SA35)N-u=;48ij$^~m)v*M<75k&Pm
zCZ+UQSFNB(xIqBE0Ec}~hz0u)%cib~Yq(N)**c2#xi-g;mmILf*vXN3Ix%^$UK-HC
zGR{^~q|dcr@liaok4$`4(Ky<MF~nla@}U_-+*p`g(TWPS++bFWF)D&@1`V@{$s{B_
zLckKHF@t5C^w}AG&MJnw8S*ZZ&)#N|%HX=`MiScO0T`>wD&pmYq{mPxB<!n}xj5s@
z#VS)JS*@&!^|`jjdVN?fC&eNXI~(1V0AYY`O10K2pDTILhAS>A7njUdEfj>y%I+2y
zEH!Z<F{%$SizT5e4VY&PsMIq1b5UkSSuGcpi|fuS&PzeKbog1>U1qt!Wp)cA2w8>I
zFg(wAT$l_Pa?1<S0uF$EUOqoeZwwI^m5ZBIjG?9Jh!o*Uw~;j8frf?#?OZKbM52TK
zI3oyIm0}bXzyM;|Kq6oVZ0LkI#Kq*IW_1a$AU}btOp@z!>3*IIf<?@3v5Vw<2)F_z
z(t42rHDAgrvTvvlHrsjB;ruwT$SxSn>Jl(A;F1JNk_(s1K{vE03mUMb3w_91FDD!)
zW5IK!EE155rTj|DOjEOtbrJ8I{UXImPv+Wk%&fBc=rnTS>PD^b=WVcrXEqn>BWggL
zC@0K`$4S67N?|9KZv9rutEOJacHWo2BgKk(rhzioHmlX*637SJDOMpWdDyWFx2#dK
zaW89fxgC7D22PX{=EMPzB!M_U3hUx#QS-X+PPF*mnKNhVCz$wX$Wpij*cGQimdv<e
zrbuIB<HWkUx*;tsEnVFX1qpLTC0OR^L&Uwzh9S%&65)p@Nuric=FeF928)=)!d#26
znT{rZyjj5it+1usa*@u3x?riTYw!^@SaIS207R0DNUJ=+rf>=5k4whyN-P(N<+8qY
z<drK|nuA~w^P{j{tSv5-s#Mm3?J7q4|8m=#cPkSYh~g70V#*csgqhbCCi&glrFzHC
z6GLTit!t>SuOA|S%hsVWZw$b+^ggG{1DLKUs~8z+rttk~AWP(+*T?Y?BUaz=_${Ac
zv0A_~Z#eAtgt-J1ngy31s~=)<>eMNnVQ~TTbdZG$7pm#gr|Z|g#mO*%gTh<`#=J;<
zy28TkMd4xtlukm{sK6DI`IanMqLwXNX10_{;L^gqo)#|M&sPO**>l7YOH;9u1q&8<
zwGdZ8riBJ>Sa*}uA#n2mYDHYTbm>xUxlvJqz+EBLpXB|L=aWT_-<TkMp}2|S6Y#8f
z&F%N%i!Z9@o_j906Kid8ad|4=^5x6*l7cV^SVEj70`~WXEw>dGEm-OC|1hwKgZZ4A
z*%rmQagI@7jUwk-lr?BpVzIlWVbc#ZW3>v~T+lq5fF<<YmfW6ql5hvidgobZL`h*X
zR=ZNH_RobarHX`$1TN!Hg9YwT7cAnSjOa4H=5ujJYYVWfr(pdXAy||o{Nl}(7-C^d
zsbb+8>unP2?Js~shYxrrf$y~ktttF0i&a>%MU)UFv07%kFLNV=pkm=7fqO$L9^TMT
z02iK|=7?_VodOt3r4hp=L`lFB*D~XMnHXT?#Ir=Wd{_W8{yzZsP}o|o_6`_}1uPFl
zW*KbQGE^%uG^VTmSFCn*VN19Y;UeoE<V%|baO8g*ZLfgwvA6;(7O*TUh>}<>{&jhr
zJFrRx7a8|ZCxCkj;K=!;0Ot8Hb{NF>I$YnfjTb%^R}g2h0+wX~E2WS_NSue78m@5<
z%o^^T1eivSCG_Ne=~?++hwDSu4FHs=Ag=L3#?SJ|!GDX@rkeGh8ZN2?u<WZRIRn|I
zDBFq^2i*X1Y+SfymDbM&RS{fN31GzY5CDudlMf~V(^`;&)=I8`8Y4)OSS|kubVV9J
z8&t(`QKf)60fvbf@5d+C8nT57P@(}=_AsiDBwT^9SQ0ZEIdA<&N@bdOJNEXRfjP&I
zAJ_jPF^w2fC)v(}<nu}u0+fszE`SjPE-s@efK4OQc;)wS;xsaVdA8PUDWe2(>}YII
z@>xB_$WG9s@S4W2QrH$I=}CrSxI-v3s=O9JX3t~^STFxEB{N(r0fhxK32v$Y=6PEc
z3DB$@q5#*z#&smgx*G~`2?HsW0JRdZ#Ic#5SB|{FMUE8@7s!dj-%+x#)6AtM+^ZI*
zl|UuKg~fXNuYX?QS{W;5p6wJVL$g56TLvmQSswAfOQ2?2suff&aIM-h<UFBT<qFp-
z0GWt_$7=Phq~Y@=0ZK26z?LQR_|{yYTGa%ul|W|Tli7$&*?CwBtF<ZJ^MGw&vUrd#
zBBky9SE)Q?K$Br(VF)u!ENmZ>A%g#+i%A+-Yuo*QXn89D+eep;Ne(rKc~^IJCrGLP
Y0}Si?p@f|xQvd(}07*qoM6N<$f<sJf00000

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-7@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-7@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..49541c422833a70bad7dea18b22c2b6c76cf4132
GIT binary patch
literal 2503
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
RiXs32002ovPDHLkV1fweeP{px

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-8@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-8@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..343b60f4755f84746ad32a7ca25961be48ba31d2
GIT binary patch
literal 5710
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
A#sB~S

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-9@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-9@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..53b687fdea4d84005a44887e130fff5044936aa1
GIT binary patch
literal 5195
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
FV1j9g503x<

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/skin.ini
index 49ac2cf80d..9d16267d73 100644
--- a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/skin.ini
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/skin.ini
@@ -1,3 +1,4 @@
 [General]
 Version: latest
 HitCircleOverlayAboveNumber: 0
+HitCirclePrefix: display
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index af02087d1a..30b0451a3b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("Hit Big Stream", () => SetContents(_ => testStream(2, true)));
             AddStep("Hit Medium Stream", () => SetContents(_ => testStream(5, true)));
             AddStep("Hit Small Stream", () => SetContents(_ => testStream(7, true)));
+            AddStep("High combo index", () => SetContents(_ => testSingle(2, true, comboIndex: 15)));
         }
 
         [Test]
@@ -66,12 +67,12 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("Hit Big Single", () => SetContents(_ => testSingle(2, true)));
         }
 
-        private Drawable testSingle(float circleSize, bool auto = false, double timeOffset = 0, Vector2? positionOffset = null)
+        private Drawable testSingle(float circleSize, bool auto = false, double timeOffset = 0, Vector2? positionOffset = null, int comboIndex = 0)
         {
             var playfield = new TestOsuPlayfield();
 
             for (double t = timeOffset; t < timeOffset + 60000; t += 2000)
-                playfield.Add(createSingle(circleSize, auto, t, positionOffset));
+                playfield.Add(createSingle(circleSize, auto, t, positionOffset, comboIndex: comboIndex));
 
             return playfield;
         }
@@ -84,14 +85,14 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             for (int i = 0; i <= 1000; i += 100)
             {
-                playfield.Add(createSingle(circleSize, auto, i, pos, hitOffset));
+                playfield.Add(createSingle(circleSize, auto, i, pos, hitOffset, i / 100 - 1));
                 pos.X += 50;
             }
 
             return playfield;
         }
 
-        private TestDrawableHitCircle createSingle(float circleSize, bool auto, double timeOffset, Vector2? positionOffset, double hitOffset = 0)
+        private TestDrawableHitCircle createSingle(float circleSize, bool auto, double timeOffset, Vector2? positionOffset, double hitOffset = 0, int comboIndex = 0)
         {
             positionOffset ??= Vector2.Zero;
 
@@ -99,6 +100,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + 1000 + timeOffset,
                 Position = OsuPlayfield.BASE_SIZE / 4 + positionOffset.Value,
+                IndexInCurrentCombo = comboIndex,
             };
 
             circle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });

From c9cb0561f7a2ac5117d9add6792e02b53014c1a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 19:48:10 +0200
Subject: [PATCH 2046/2100] Move `maxSizePerGlyph` optional ctor param to
 init-only property

I'm doing this as I'm about to add more similar properties to
`LegacySpriteText` and I don't want to create a twenty-argument
constructor monstrosity.
---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs           | 3 ++-
 osu.Game/Skinning/LegacySpriteText.cs                     | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 1de8fefaae..c01d28c8e1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -145,10 +145,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                             return null;
 
                         const float hitcircle_text_scale = 0.8f;
-                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS * 2 / hitcircle_text_scale)
+                        return new LegacySpriteText(LegacyFont.HitCircle)
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
                             Scale = new Vector2(hitcircle_text_scale),
+                            MaxSizePerGlyph = OsuHitObject.OBJECT_DIMENSIONS * 2 / hitcircle_text_scale,
                         };
 
                     case OsuSkinComponents.SpinnerBody:
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index 7eb92126fa..a803ef8747 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -12,8 +12,9 @@ namespace osu.Game.Skinning
 {
     public sealed partial class LegacySpriteText : OsuSpriteText
     {
+        public Vector2? MaxSizePerGlyph { get; init; }
+
         private readonly LegacyFont font;
-        private readonly Vector2? maxSizePerGlyph;
 
         private LegacyGlyphStore glyphStore = null!;
 
@@ -21,10 +22,9 @@ namespace osu.Game.Skinning
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(LegacyFont font, Vector2? maxSizePerGlyph = null)
+        public LegacySpriteText(LegacyFont font)
         {
             this.font = font;
-            this.maxSizePerGlyph = maxSizePerGlyph;
 
             Shadow = false;
             UseFullGlyphHeight = false;
@@ -36,7 +36,7 @@ namespace osu.Game.Skinning
             Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
 
-            glyphStore = new LegacyGlyphStore(skin, maxSizePerGlyph);
+            glyphStore = new LegacyGlyphStore(skin, MaxSizePerGlyph);
         }
 
         protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);

From 99e590c8dd645c58b2fa6197e2f9bd7b003b9e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 20:10:36 +0200
Subject: [PATCH 2047/2100] Fix legacy sprite texts not matching stable with
 respect to fixed width

stable's `pSpriteText` has a `TextConstantSpacing` flag, that is
selectively enabled for some usages. In particular, these are:

- mania combo counter (not yet implemented)
- taiko combo counter (not yet implemented)
- score counter
- accuracy counter
- scoreboard entries (not yet implemented)

Everything else uses non-fixed-width fonts.

Hilariously, `LegacySpinner` _tried_ to account for this by changing
`Font` to have `fixedWidth: false` specified, only to fail to notice
that `LegacySpriteText` changes `Font` in its BDL, making the property
set do precisely nothing. For this reason, attempting to set `Font`
on a `LegacySpriteText` will now throw.
---
 .../Skinning/Legacy/LegacySpinner.cs                |  4 ++--
 osu.Game/Skinning/LegacyAccuracyCounter.cs          |  1 +
 osu.Game/Skinning/LegacyScoreCounter.cs             |  1 +
 osu.Game/Skinning/LegacySpriteText.cs               | 13 ++++++++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 28acb4a996..5a95eac0f1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Origin = Anchor.Centre,
                         Scale = new Vector2(SPRITE_SCALE),
                         Y = SPINNER_TOP_OFFSET + 299,
-                    }.With(s => s.Font = s.Font.With(fixedWidth: false)),
+                    },
                     spmBackground = new Sprite
                     {
                         Anchor = Anchor.TopCentre,
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Origin = Anchor.TopRight,
                         Scale = new Vector2(SPRITE_SCALE * 0.9f),
                         Position = new Vector2(80, 448 + spm_hide_offset),
-                    }.With(s => s.Font = s.Font.With(fixedWidth: false)),
+                    },
                 }
             });
         }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 326257c25f..ed12292eb3 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Skinning
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
+            FixedWidth = true,
         };
     }
 }
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index d238369be1..a86f122836 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Skinning
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
+            FixedWidth = true,
         };
     }
 }
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index a803ef8747..041a32e8de 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.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.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
@@ -13,6 +14,7 @@ namespace osu.Game.Skinning
     public sealed partial class LegacySpriteText : OsuSpriteText
     {
         public Vector2? MaxSizePerGlyph { get; init; }
+        public bool FixedWidth { get; init; }
 
         private readonly LegacyFont font;
 
@@ -22,6 +24,15 @@ namespace osu.Game.Skinning
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
+        // ReSharper disable once UnusedMember.Global
+        // being unused is the point here
+        public new FontUsage Font
+        {
+            get => base.Font;
+            set => throw new InvalidOperationException(@"Attempting to use this setter will not work correctly. "
+                                                       + $@"Use specific init-only properties exposed by {nameof(LegacySpriteText)} instead.");
+        }
+
         public LegacySpriteText(LegacyFont font)
         {
             this.font = font;
@@ -33,7 +44,7 @@ namespace osu.Game.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
+            base.Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: FixedWidth);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
 
             glyphStore = new LegacyGlyphStore(skin, MaxSizePerGlyph);

From 2f9b50172e0b0f261a94585d2c525405a77eaa48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 22:09:33 +0200
Subject: [PATCH 2048/2100] Add failing test coverage for video events
 affecting storyboard time bounds

---
 .../Formats/LegacyStoryboardDecoderTest.cs    | 21 +++++++++++++++++++
 .../video-background-events-ignored.osb       |  5 +++++
 2 files changed, 26 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/video-background-events-ignored.osb

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 34ff8bfd84..647c0aed75 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -287,5 +287,26 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(manyTimes.EndTime, Is.EqualTo(9000 + loop_duration));
             }
         }
+
+        [Test]
+        public void TestVideoAndBackgroundEventsDoNotAffectStoryboardBounds()
+        {
+            var decoder = new LegacyStoryboardDecoder();
+
+            using var resStream = TestResources.OpenResource("video-background-events-ignored.osb");
+            using var stream = new LineBufferedReader(resStream);
+
+            var storyboard = decoder.Decode(stream);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(storyboard.GetLayer(@"Video").Elements, Has.Count.EqualTo(1));
+                Assert.That(storyboard.GetLayer(@"Video").Elements.Single(), Is.InstanceOf<StoryboardVideo>());
+                Assert.That(storyboard.GetLayer(@"Video").Elements.Single().StartTime, Is.EqualTo(-5678));
+
+                Assert.That(storyboard.EarliestEventTime, Is.Null);
+                Assert.That(storyboard.LatestEventTime, Is.Null);
+            });
+        }
     }
 }
diff --git a/osu.Game.Tests/Resources/video-background-events-ignored.osb b/osu.Game.Tests/Resources/video-background-events-ignored.osb
new file mode 100644
index 0000000000..7525b1fee9
--- /dev/null
+++ b/osu.Game.Tests/Resources/video-background-events-ignored.osb
@@ -0,0 +1,5 @@
+osu file format v14
+
+[Events]
+0,-1234,"BG.jpg",0,0
+Video,-5678,"Video.avi",0,0
\ No newline at end of file

From 9ce2c1f49c37e63d3d6c18b8fb854ee3b4766adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 22:10:03 +0200
Subject: [PATCH 2049/2100] Exclude video events from being accounted for when
 calculating storyboard time bounds

Closes https://github.com/ppy/osu/issues/25263.

In some circumstances, stable allows skipping twice if a particularly
long storyboarded intro is being displayed:

    https://github.com/peppy/osu-stable-reference/blob/master/osu!/GameModes/Play/Player.cs#L1728-L1736

`AllowDoubleSkip` is calculated thus:

    https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/GameModes/Play/Player.cs#L1761-L1770

and `leadInTime` is calculated thus:

    https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/GameModes/Play/Player.cs#L1342-L1351

The key to watch out for here is `{first,last}EventTime`. `EventManager`
will calculate it on-the-fly as it adds storyboard elements:

    https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/GameplayElements/Events/EventManager.cs#L253-L256

However, this pathway is only used for sprite, animation, sample,
and break events. Video and background events use the following pathway:

    https://github.com/peppy/osu-stable-reference/blob/master/osu!/GameplayElements/Events/EventManager.cs#L368

Note that this particular overload does not mutate either bound.
Which means that for the purposes of determining where a storyboard
starts and ends temporally, a video event's start time is essentially
ignored.

To reflect that, add a clause that excludes video events from
calculations of `{Earliest,Latest}EventTime`.
---
 osu.Game/Storyboards/Storyboard.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 21342831b0..a3137fe1b1 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -30,8 +30,11 @@ namespace osu.Game.Storyboards
         /// </summary>
         /// <remarks>
         /// This iterates all elements and as such should be used sparingly or stored locally.
+        /// Video and background events are not included to match stable.
         /// </remarks>
-        public double? EarliestEventTime => Layers.SelectMany(l => l.Elements).MinBy(e => e.StartTime)?.StartTime;
+        public double? EarliestEventTime => Layers.SelectMany(l => l.Elements)
+                                                  .Where(e => e is not StoryboardVideo)
+                                                  .MinBy(e => e.StartTime)?.StartTime;
 
         /// <summary>
         /// Across all layers, find the latest point in time that a storyboard element ends at.
@@ -39,9 +42,12 @@ namespace osu.Game.Storyboards
         /// </summary>
         /// <remarks>
         /// This iterates all elements and as such should be used sparingly or stored locally.
-        /// Videos and samples return StartTime as their EndTIme.
+        /// Samples return StartTime as their EndTIme.
+        /// Video and background events are not included to match stable.
         /// </remarks>
-        public double? LatestEventTime => Layers.SelectMany(l => l.Elements).MaxBy(e => e.GetEndTime())?.GetEndTime();
+        public double? LatestEventTime => Layers.SelectMany(l => l.Elements)
+                                                .Where(e => e is not StoryboardVideo)
+                                                .MaxBy(e => e.GetEndTime())?.GetEndTime();
 
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.

From bac306879a4c2965b780c8588f97e95c24e354d0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 03:18:13 +0300
Subject: [PATCH 2050/2100] Minor reword on documentation

---
 osu.Game/Storyboards/Storyboard.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index a3137fe1b1..8c43b99702 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Storyboards
         /// </summary>
         /// <remarks>
         /// This iterates all elements and as such should be used sparingly or stored locally.
+        /// Sample events use their start time as "end time" during this calculation.
         /// Video and background events are not included to match stable.
         /// </remarks>
         public double? EarliestEventTime => Layers.SelectMany(l => l.Elements)
@@ -42,7 +43,7 @@ namespace osu.Game.Storyboards
         /// </summary>
         /// <remarks>
         /// This iterates all elements and as such should be used sparingly or stored locally.
-        /// Samples return StartTime as their EndTIme.
+        /// Sample events use their start time as "end time" during this calculation.
         /// Video and background events are not included to match stable.
         /// </remarks>
         public double? LatestEventTime => Layers.SelectMany(l => l.Elements)

From 51b7c97cabd8944cc7dfd840ae4a247d42efeca7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 06:07:49 +0300
Subject: [PATCH 2051/2100] Fix `TestScenePlayerMaxDimensions` bottlenecking CI

---
 .../Gameplay/TestScenePlayerMaxDimensions.cs  | 68 +++----------------
 1 file changed, 10 insertions(+), 58 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index 68443b234b..741fc7d789 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -72,66 +72,18 @@ namespace osu.Game.Tests.Visual.Gameplay
                 remove { }
             }
 
+            public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            {
+                var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
+
+                if (texture != null)
+                    texture.ScaleAdjust /= scale_factor;
+
+                return texture;
+            }
+
             public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => this;
             public IEnumerable<ISkin> AllSources => new[] { this };
-
-            protected override IResourceStore<TextureUpload> CreateTextureLoaderStore(IStorageResourceProvider resources, IResourceStore<byte[]> storage)
-                => new UpscaledTextureLoaderStore(base.CreateTextureLoaderStore(resources, storage));
-
-            private class UpscaledTextureLoaderStore : IResourceStore<TextureUpload>
-            {
-                private readonly IResourceStore<TextureUpload>? textureStore;
-
-                public UpscaledTextureLoaderStore(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 upscale(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(() => upscale(textureUpload), cancellationToken).ConfigureAwait(false);
-                }
-
-                private TextureUpload upscale(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();
-
-                    image.Mutate(i => i.Resize(new Size(textureUpload.Width, textureUpload.Height) * scale_factor));
-                    return new TextureUpload(image);
-                }
-
-                public Stream? GetStream(string name) => textureStore?.GetStream(name);
-
-                public IEnumerable<string> GetAvailableResources() => textureStore?.GetAvailableResources() ?? Array.Empty<string>();
-            }
         }
     }
 }

From a53c0adae077847112830952a025df3de4cdfe68 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 06:56:12 +0300
Subject: [PATCH 2052/2100] Remove unused using directive

---
 .../Visual/Gameplay/TestScenePlayerMaxDimensions.cs         | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index 741fc7d789..6665295e99 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -3,20 +3,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {

From 28e331deed1c27de3f6177b3fe779bf673cc4b97 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 08:29:46 +0300
Subject: [PATCH 2053/2100] Support displaying team seed in `TeamDisplay`

---
 .../TestSceneDrawableTournamentTeam.cs        |  5 +--
 .../TournamentTestScene.cs                    |  3 +-
 .../Gameplay/Components/TeamDisplay.cs        | 34 ++++++++++++++++---
 .../Gameplay/Components/TeamScoreDisplay.cs   |  5 ++-
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
index a809d0747a..8a50cbbe13 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Tournament.Tests.Components
             {
                 FlagName = { Value = "AU" },
                 FullName = { Value = "Australia" },
+                Seed = { Value = "#5" },
                 Players =
                 {
                     new TournamentUser { Username = "ASecretBox" },
@@ -30,7 +31,7 @@ namespace osu.Game.Tournament.Tests.Components
                     new TournamentUser { Username = "Parkes" },
                     new TournamentUser { Username = "Shiroha" },
                     new TournamentUser { Username = "Jordan The Bear" },
-                }
+                },
             };
 
             var match = new TournamentMatch { Team1 = { Value = team } };
@@ -100,7 +101,7 @@ namespace osu.Game.Tournament.Tests.Components
             Cell(i).AddRange(new Drawable[]
             {
                 new TournamentSpriteText { Text = "TeamDisplay" },
-                new TeamDisplay(team, TeamColour.Red, new Bindable<int?>(2), 6)
+                new TeamDisplay(team, TeamColour.Red, new Bindable<int?>(2), 6, true)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index f24fc61d85..4106556ee1 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Tournament.Tests
                     FlagName = { Value = "JP" },
                     FullName = { Value = "Japan" },
                     LastYearPlacing = { Value = 10 },
-                    Seed = { Value = "Low" },
+                    Seed = { Value = "#12" },
                     SeedingResults =
                     {
                         new SeedingResult
@@ -140,6 +140,7 @@ namespace osu.Game.Tournament.Tests
                     Acronym = { Value = "USA" },
                     FlagName = { Value = "US" },
                     FullName = { Value = "United States" },
+                    Seed = { Value = "#3" },
                     Players =
                     {
                         new TournamentUser { Username = "Hello" },
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 3fdbbb5973..7e63b5b8db 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -14,9 +14,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
     {
         private readonly TeamScore score;
 
-        private readonly TournamentSpriteTextWithBackground teamText;
+        private readonly TournamentSpriteTextWithBackground teamNameText;
+        private readonly TournamentSpriteTextWithBackground teamSeedText;
 
         private readonly Bindable<string> teamName = new Bindable<string>("???");
+        private readonly Bindable<string> teamSeed = new Bindable<string>();
 
         private bool showScore;
 
@@ -35,7 +37,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             }
         }
 
-        public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
+        public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin, bool displaySeed)
             : base(team)
         {
             AutoSizeAxes = Axes.Both;
@@ -95,11 +97,29 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                                             }
                                         }
                                     },
-                                    teamText = new TournamentSpriteTextWithBackground
+                                    new FillFlowContainer
                                     {
-                                        Scale = new Vector2(0.5f),
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(5),
                                         Origin = anchor,
                                         Anchor = anchor,
+                                        Children = new Drawable[]
+                                        {
+                                            teamNameText = new TournamentSpriteTextWithBackground
+                                            {
+                                                Scale = new Vector2(0.5f),
+                                                Origin = anchor,
+                                                Anchor = anchor,
+                                            },
+                                            teamSeedText = new TournamentSpriteTextWithBackground
+                                            {
+                                                Scale = new Vector2(0.5f),
+                                                Origin = anchor,
+                                                Anchor = anchor,
+                                                Alpha = displaySeed ? 1 : 0,
+                                            }
+                                        }
                                     },
                                 }
                             },
@@ -117,9 +137,13 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             FinishTransforms(true);
 
             if (Team != null)
+            {
                 teamName.BindTo(Team.FullName);
+                teamSeed.BindTo(Team.Seed);
+            }
 
-            teamName.BindValueChanged(name => teamText.Text.Text = name.NewValue, true);
+            teamName.BindValueChanged(name => teamNameText.Text.Text = name.NewValue, true);
+            teamSeed.BindValueChanged(seed => teamSeedText.Text.Text = seed.NewValue, true);
         }
 
         private void updateDisplay()
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
index c7fcfae602..9c2922d030 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private TeamDisplay? teamDisplay;
 
+        public readonly BindableBool DisplaySeed = new BindableBool();
+
         public bool ShowScore
         {
             get => teamDisplay?.ShowScore ?? false;
@@ -48,6 +50,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             currentMatch.BindValueChanged(matchChanged);
 
             currentTeam.BindValueChanged(teamChanged);
+            DisplaySeed.BindValueChanged(_ => currentTeam.TriggerChange());
 
             updateMatch();
         }
@@ -101,7 +104,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
             InternalChildren = new Drawable[]
             {
-                teamDisplay = new TeamDisplay(team.NewValue, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0),
+                teamDisplay = new TeamDisplay(team.NewValue, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0, DisplaySeed.Value),
             };
 
             teamDisplay.ShowScore = wasShowingScores;

From e2788a22b153ac5763c9d47a3534f719b4fde497 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 08:30:33 +0300
Subject: [PATCH 2054/2100] Add setting to configure team seed display

---
 osu.Game.Tournament/Models/LadderInfo.cs             |  2 ++
 .../Screens/Gameplay/Components/MatchHeader.cs       |  5 +++++
 .../Screens/Gameplay/GameplayScreen.cs               | 12 +++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index 219a2a7bfb..f96dae8044 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);
+
+        public Bindable<bool> DisplayTeamSeeds = new BindableBool();
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index 69f150c8ac..edf1d810ed 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.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.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Tournament.Components;
@@ -16,6 +17,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private TeamScoreDisplay teamDisplay2 = null!;
         private DrawableTournamentHeaderLogo logo = null!;
 
+        public readonly BindableBool DisplaySeeds = new BindableBool();
+
         private bool showScores = true;
 
         public bool ShowScores
@@ -88,11 +91,13 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 {
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
+                    DisplaySeed = { BindTarget = DisplaySeeds },
                 },
                 teamDisplay2 = new TeamScoreDisplay(TeamColour.Blue)
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
+                    DisplaySeed = { BindTarget = DisplaySeeds },
                 },
             };
         }
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 20188cc5dc..76d7f27421 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private Drawable chroma = null!;
 
         [BackgroundDependencyLoader]
-        private void load(LadderInfo ladder, MatchIPCInfo ipc)
+        private void load(MatchIPCInfo ipc)
         {
             this.ipc = ipc;
 
@@ -118,12 +118,18 @@ namespace osu.Game.Tournament.Screens.Gameplay
                             LabelText = "Players per team",
                             Current = LadderInfo.PlayersPerTeam,
                             KeyboardStep = 1,
-                        }
+                        },
+                        new SettingsCheckbox
+                        {
+                            LabelText = "Display team seeds",
+                            Current = LadderInfo.DisplayTeamSeeds,
+                        },
                     }
                 }
             });
 
-            ladder.ChromaKeyWidth.BindValueChanged(width => chroma.Width = width.NewValue, true);
+            LadderInfo.ChromaKeyWidth.BindValueChanged(width => chroma.Width = width.NewValue, true);
+            LadderInfo.DisplayTeamSeeds.BindValueChanged(v => header.DisplaySeeds.Value = v.NewValue, true);
 
             warmup.BindValueChanged(w =>
             {

From 832e30c31a3e68891c23a5f22ad156a3a6224fc4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 08:30:59 +0300
Subject: [PATCH 2055/2100] Adjust horizontal padding in tournament sprite text

---
 .../Components/TournamentSpriteTextWithBackground.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
index 97cb610021..ce118727cd 100644
--- a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
+++ b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Tournament.Components
                 {
                     Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR,
                     Font = OsuFont.Torus.With(weight: FontWeight.SemiBold, size: 50),
-                    Padding = new MarginPadding { Left = 10, Right = 20 },
-                    Text = text
+                    Padding = new MarginPadding { Horizontal = 10 },
+                    Text = text,
                 }
             };
         }

From 4371a1ab57a5bfb9549d948121bb15f5b1237ecd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 08:42:29 +0300
Subject: [PATCH 2056/2100] Move team seed setting from gameplay screen

---
 osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs | 9 ++-------
 osu.Game.Tournament/Screens/Setup/SetupScreen.cs       | 6 ++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 76d7f27421..3e5ba90c52 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -49,7 +49,8 @@ namespace osu.Game.Tournament.Screens.Gameplay
                 },
                 header = new MatchHeader
                 {
-                    ShowLogo = false
+                    ShowLogo = false,
+                    DisplaySeeds = { BindTarget = LadderInfo.DisplayTeamSeeds },
                 },
                 new Container
                 {
@@ -119,17 +120,11 @@ namespace osu.Game.Tournament.Screens.Gameplay
                             Current = LadderInfo.PlayersPerTeam,
                             KeyboardStep = 1,
                         },
-                        new SettingsCheckbox
-                        {
-                            LabelText = "Display team seeds",
-                            Current = LadderInfo.DisplayTeamSeeds,
-                        },
                     }
                 }
             });
 
             LadderInfo.ChromaKeyWidth.BindValueChanged(width => chroma.Width = width.NewValue, true);
-            LadderInfo.DisplayTeamSeeds.BindValueChanged(v => header.DisplaySeeds.Value = v.NewValue, true);
 
             warmup.BindValueChanged(w =>
             {
diff --git a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
index df1ce69c33..fed9d625ee 100644
--- a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
@@ -140,6 +140,12 @@ namespace osu.Game.Tournament.Screens.Setup
                     Description = "Screens will progress automatically from gameplay -> results -> map pool",
                     Current = LadderInfo.AutoProgressScreens,
                 },
+                new LabelledSwitchButton
+                {
+                    Label = "Display team seeds",
+                    Description = "Team seeds will display alongside each team at the top in gameplay/map pool screens.",
+                    Current = LadderInfo.DisplayTeamSeeds,
+                },
             };
         }
 

From 81c1634d4453ad31acceaacd48c5d59a868b73a7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 08:42:40 +0300
Subject: [PATCH 2057/2100] Display team seeds in map pool screen as well

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index f80f43bb77..15c6fdb2ae 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                 new MatchHeader
                 {
                     ShowScores = true,
+                    DisplaySeeds = { BindTarget = LadderInfo.DisplayTeamSeeds },
                 },
                 mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
                 {

From 7083c04c5923a9f4494bcdaadfc70de656a33c4d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 09:25:55 +0300
Subject: [PATCH 2058/2100] Refactor logic slightly to display team seed
 everywhere

This change makes the team seed display in "team intro" screen as well.
---
 .../TestSceneDrawableTournamentTeam.cs        |  2 +-
 .../Components/DrawableTeamSeed.cs            | 39 +++++++++++++++++++
 .../Components/DrawableTeamTitleWithHeader.cs | 12 +++++-
 .../Gameplay/Components/MatchHeader.cs        |  5 ---
 .../Gameplay/Components/TeamDisplay.cs        | 13 ++-----
 .../Gameplay/Components/TeamScoreDisplay.cs   |  5 +--
 .../Screens/Gameplay/GameplayScreen.cs        |  1 -
 .../Screens/MapPool/MapPoolScreen.cs          |  1 -
 8 files changed, 55 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game.Tournament/Components/DrawableTeamSeed.cs

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
index 8a50cbbe13..a6eb482d02 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Tournament.Tests.Components
             Cell(i).AddRange(new Drawable[]
             {
                 new TournamentSpriteText { Text = "TeamDisplay" },
-                new TeamDisplay(team, TeamColour.Red, new Bindable<int?>(2), 6, true)
+                new TeamDisplay(team, TeamColour.Red, new Bindable<int?>(2), 6)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tournament/Components/DrawableTeamSeed.cs b/osu.Game.Tournament/Components/DrawableTeamSeed.cs
new file mode 100644
index 0000000000..a79c63e979
--- /dev/null
+++ b/osu.Game.Tournament/Components/DrawableTeamSeed.cs
@@ -0,0 +1,39 @@
+// Copyright (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.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Components
+{
+    public partial class DrawableTeamSeed : TournamentSpriteTextWithBackground
+    {
+        private readonly TournamentTeam? team;
+
+        private IBindable<string> seed = null!;
+        private Bindable<bool> displaySeed = null!;
+
+        public DrawableTeamSeed(TournamentTeam? team)
+        {
+            this.team = team;
+        }
+
+        [Resolved]
+        private LadderInfo ladder { get; set; } = null!;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (team == null)
+                return;
+
+            seed = team.Seed.GetBoundCopy();
+            seed.BindValueChanged(s => Text.Text = s.NewValue, true);
+
+            displaySeed = ladder.DisplayTeamSeeds.GetBoundCopy();
+            displaySeed.BindValueChanged(v => Alpha = v.NewValue ? 1 : 0, true);
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
index 89f45fc1d3..fc4037d4e1 100644
--- a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
@@ -22,7 +22,17 @@ namespace osu.Game.Tournament.Components
                 Children = new Drawable[]
                 {
                     new DrawableTeamHeader(colour),
-                    new DrawableTeamTitle(team),
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(5),
+                        Children = new Drawable[]
+                        {
+                            new DrawableTeamTitle(team),
+                            new DrawableTeamSeed(team),
+                        }
+                    }
                 }
             };
         }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index edf1d810ed..69f150c8ac 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Tournament.Components;
@@ -17,8 +16,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private TeamScoreDisplay teamDisplay2 = null!;
         private DrawableTournamentHeaderLogo logo = null!;
 
-        public readonly BindableBool DisplaySeeds = new BindableBool();
-
         private bool showScores = true;
 
         public bool ShowScores
@@ -91,13 +88,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 {
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
-                    DisplaySeed = { BindTarget = DisplaySeeds },
                 },
                 teamDisplay2 = new TeamScoreDisplay(TeamColour.Blue)
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    DisplaySeed = { BindTarget = DisplaySeeds },
                 },
             };
         }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 7e63b5b8db..49fbc64397 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -15,10 +15,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private readonly TeamScore score;
 
         private readonly TournamentSpriteTextWithBackground teamNameText;
-        private readonly TournamentSpriteTextWithBackground teamSeedText;
 
         private readonly Bindable<string> teamName = new Bindable<string>("???");
-        private readonly Bindable<string> teamSeed = new Bindable<string>();
 
         private bool showScore;
 
@@ -37,7 +35,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             }
         }
 
-        public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin, bool displaySeed)
+        public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
             : base(team)
         {
             AutoSizeAxes = Axes.Both;
@@ -112,13 +110,12 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                                                 Origin = anchor,
                                                 Anchor = anchor,
                                             },
-                                            teamSeedText = new TournamentSpriteTextWithBackground
+                                            new DrawableTeamSeed(Team)
                                             {
                                                 Scale = new Vector2(0.5f),
                                                 Origin = anchor,
                                                 Anchor = anchor,
-                                                Alpha = displaySeed ? 1 : 0,
-                                            }
+                                            },
                                         }
                                     },
                                 }
@@ -137,13 +134,9 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             FinishTransforms(true);
 
             if (Team != null)
-            {
                 teamName.BindTo(Team.FullName);
-                teamSeed.BindTo(Team.Seed);
-            }
 
             teamName.BindValueChanged(name => teamNameText.Text.Text = name.NewValue, true);
-            teamSeed.BindValueChanged(seed => teamSeedText.Text.Text = seed.NewValue, true);
         }
 
         private void updateDisplay()
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
index 9c2922d030..c7fcfae602 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private TeamDisplay? teamDisplay;
 
-        public readonly BindableBool DisplaySeed = new BindableBool();
-
         public bool ShowScore
         {
             get => teamDisplay?.ShowScore ?? false;
@@ -50,7 +48,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             currentMatch.BindValueChanged(matchChanged);
 
             currentTeam.BindValueChanged(teamChanged);
-            DisplaySeed.BindValueChanged(_ => currentTeam.TriggerChange());
 
             updateMatch();
         }
@@ -104,7 +101,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
             InternalChildren = new Drawable[]
             {
-                teamDisplay = new TeamDisplay(team.NewValue, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0, DisplaySeed.Value),
+                teamDisplay = new TeamDisplay(team.NewValue, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0),
             };
 
             teamDisplay.ShowScore = wasShowingScores;
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 3e5ba90c52..b2152eaf3d 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -50,7 +50,6 @@ namespace osu.Game.Tournament.Screens.Gameplay
                 header = new MatchHeader
                 {
                     ShowLogo = false,
-                    DisplaySeeds = { BindTarget = LadderInfo.DisplayTeamSeeds },
                 },
                 new Container
                 {
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 15c6fdb2ae..f80f43bb77 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -50,7 +50,6 @@ namespace osu.Game.Tournament.Screens.MapPool
                 new MatchHeader
                 {
                     ShowScores = true,
-                    DisplaySeeds = { BindTarget = LadderInfo.DisplayTeamSeeds },
                 },
                 mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
                 {

From e76a5f9419276d8eaa8bea22c899fd1aa651c80b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 10:18:15 +0300
Subject: [PATCH 2059/2100] Fix failing tests

---
 .../Components/TestSceneDrawableTournamentTeam.cs           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
index a6eb482d02..43adcc61bf 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Tests.Visual;
@@ -14,9 +15,14 @@ namespace osu.Game.Tournament.Tests.Components
 {
     public partial class TestSceneDrawableTournamentTeam : OsuGridTestScene
     {
+        [Cached]
+        protected LadderInfo Ladder { get; private set; } = new LadderInfo();
+
         public TestSceneDrawableTournamentTeam()
             : base(4, 3)
         {
+            AddToggleStep("toggle seed view", v => Ladder.DisplayTeamSeeds.Value = v);
+
             var team = new TournamentTeam
             {
                 FlagName = { Value = "AU" },

From cfc0520481df18553b7252f1f63149ee89e4c9e9 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Sat, 28 Oct 2023 12:13:13 +0200
Subject: [PATCH 2060/2100] Add failing test

---
 .../SongSelect/TestScenePlaySongSelect.cs      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 6737ec9739..7313bde8fe 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -13,6 +13,7 @@ using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
@@ -1111,6 +1112,23 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("0 matching shown", () => songSelect.ChildrenOfType<FilterControl>().Single().InformationalText == "0 matches");
         }
 
+        [Test]
+        public void TestCutInFilterTextBox()
+        {
+            createSongSelect();
+
+            AddStep("set filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
+            AddStep("select all", () => InputManager.Keys(PlatformAction.SelectAll));
+            AddStep("press ctrl-x", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.X);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+
+            AddAssert("filter text cleared", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text, () => Is.Empty);
+        }
+
         private void waitForInitialSelection()
         {
             AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);

From 366e41f11182c1220b2c8e33bc74172fa7543986 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Sat, 28 Oct 2023 12:23:23 +0200
Subject: [PATCH 2061/2100] Use local workaround instead of disabling clipboard
 entirely

---
 osu.Game/Screens/Select/FilterControl.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index b7dc18e46a..c15bd76ef8 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Collections;
@@ -23,6 +24,7 @@ using osu.Game.Rulesets;
 using osu.Game.Screens.Select.Filter;
 using osuTK;
 using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Select
 {
@@ -254,9 +256,6 @@ namespace osu.Game.Screens.Select
 
             public OsuSpriteText FilterText { get; private set; }
 
-            // clipboard is disabled because one of the "cut" platform key bindings (shift-delete) conflicts with the beatmap deletion action.
-            protected override bool AllowClipboardExport => false;
-
             public FilterControlTextBox()
             {
                 Height += filter_text_size;
@@ -277,6 +276,15 @@ namespace osu.Game.Screens.Select
                     Colour = colours.Yellow
                 });
             }
+
+            public override bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
+            {
+                // the "cut" platform key binding (shift-delete) conflicts with the beatmap deletion action.
+                if (e.Action == PlatformAction.Cut && e.ShiftPressed && e.CurrentState.Keyboard.Keys.IsPressed(Key.Delete))
+                    return false;
+
+                return base.OnPressed(e);
+            }
         }
     }
 }

From c38c8e933ab0aba67d7a36ccff1413cde465dd8e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 16:52:33 +0300
Subject: [PATCH 2062/2100] Change tournament date text box parsing to use
 invariant culture info

---
 osu.Game.Tournament/Components/DateTextBox.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index ab643a5cb5..dd70d5856d 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Globalization;
 using osu.Framework.Bindables;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
@@ -23,13 +24,13 @@ namespace osu.Game.Tournament.Components
             base.Current = new Bindable<string>(string.Empty);
 
             current.BindValueChanged(dto =>
-                base.Current.Value = dto.NewValue.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"), true);
+                base.Current.Value = dto.NewValue.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ", DateTimeFormatInfo.InvariantInfo), true);
 
             ((OsuTextBox)Control).OnCommit += (sender, _) =>
             {
                 try
                 {
-                    current.Value = DateTimeOffset.Parse(sender.Text);
+                    current.Value = DateTimeOffset.Parse(sender.Text, DateTimeFormatInfo.InvariantInfo);
                 }
                 catch
                 {

From d877536dc0ec8d1f8f1889be73740a58ef29f869 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 29 Oct 2023 01:03:38 +0300
Subject: [PATCH 2063/2100] Select all text content in `SearchTextBox` on focus

---
 osu.Game/Graphics/UserInterface/SearchTextBox.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index a2e0ab6482..b554c2bbd8 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -18,6 +18,12 @@ namespace osu.Game.Graphics.UserInterface
             PlaceholderText = HomeStrings.SearchPlaceholder;
         }
 
+        protected override void OnFocus(FocusEvent e)
+        {
+            base.OnFocus(e);
+            SelectAll();
+        }
+
         public override bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
         {
             switch (e.Action)

From 31c6973bb646272b3ddcb2b3405d1802c8bf770c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 29 Oct 2023 01:03:45 +0300
Subject: [PATCH 2064/2100] Add test coverage

---
 .../UserInterface/TestSceneSearchTextBox.cs   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs
new file mode 100644
index 0000000000..153525d24a
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public partial class TestSceneSearchTextBox : OsuTestScene
+    {
+        private SearchTextBox textBox = null!;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = textBox = new SearchTextBox
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Width = 400,
+                Scale = new Vector2(2f),
+                HoldFocus = true,
+            };
+        });
+
+        [Test]
+        public void TestSelectionOnFocus()
+        {
+            AddStep("set text", () => textBox.Text = "some text");
+            AddAssert("no text selected", () => textBox.SelectedText == string.Empty);
+            AddStep("hide text box", () => textBox.Hide());
+            AddStep("show text box", () => textBox.Show());
+            AddAssert("search text selected", () => textBox.SelectedText == textBox.Text);
+        }
+    }
+}

From ec9ae12bbd880f2f9a1c31adca3d09e516d0dbb4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 29 Oct 2023 01:43:49 +0300
Subject: [PATCH 2065/2100] Update API response model to accept array of
 tournament banners

---
 .../Online/TestSceneUserProfileOverlay.cs     | 27 +++++++++++++++----
 .../Online/API/Requests/Responses/APIUser.cs  |  5 ++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index b57b0b7312..a321a194a9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -121,12 +121,29 @@ namespace osu.Game.Tests.Visual.Online
                     Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
                 },
             },
-            TournamentBanner = new TournamentBanner
+            TournamentBanners = new[]
             {
-                Id = 13926,
-                TournamentId = 35,
-                ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2022/profile/winner_US.jpg",
-                Image = "https://assets.ppy.sh/tournament-banners/official/owc2022/profile/winner_US@2x.jpg",
+                new TournamentBanner
+                {
+                    Id = 15588,
+                    TournamentId = 41,
+                    ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CN.jpg",
+                    Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CN@2x.jpg"
+                },
+                new TournamentBanner
+                {
+                    Id = 15589,
+                    TournamentId = 41,
+                    ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PH.jpg",
+                    Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PH@2x.jpg"
+                },
+                new TournamentBanner
+                {
+                    Id = 15590,
+                    TournamentId = 41,
+                    ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CL.jpg",
+                    Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CL@2x.jpg"
+                }
             },
             Badges = new[]
             {
diff --git a/osu.Game/Online/API/Requests/Responses/APIUser.cs b/osu.Game/Online/API/Requests/Responses/APIUser.cs
index d9208d0662..7c4093006d 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUser.cs
@@ -234,9 +234,8 @@ namespace osu.Game.Online.API.Requests.Responses
             set => Statistics.RankHistory = value;
         }
 
-        [JsonProperty(@"active_tournament_banner")]
-        [CanBeNull]
-        public TournamentBanner TournamentBanner;
+        [JsonProperty(@"active_tournament_banners")]
+        public TournamentBanner[] TournamentBanners;
 
         [JsonProperty("badges")]
         public Badge[] Badges;

From 922ad80cfc9faf6fd63a0a5f01a266247924c4f8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 29 Oct 2023 01:44:21 +0300
Subject: [PATCH 2066/2100] Update user profile overlay to show more than one
 tournament banner

---
 .../Profile/Header/BannerHeaderContainer.cs       | 15 ++++++++-------
 .../Header/Components/DrawableTournamentBanner.cs |  9 ++++++++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs
index 8e6648dc4b..7ed58200ec 100644
--- a/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.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.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,7 +12,7 @@ using osu.Game.Overlays.Profile.Header.Components;
 
 namespace osu.Game.Overlays.Profile.Header
 {
-    public partial class BannerHeaderContainer : CompositeDrawable
+    public partial class BannerHeaderContainer : FillFlowContainer
     {
         public readonly Bindable<UserProfileData?> User = new Bindable<UserProfileData?>();
 
@@ -19,9 +20,9 @@ namespace osu.Game.Overlays.Profile.Header
         private void load()
         {
             Alpha = 0;
-            RelativeSizeAxes = Axes.Both;
-            FillMode = FillMode.Fit;
-            FillAspectRatio = 1000 / 60f;
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
         }
 
         protected override void LoadComplete()
@@ -40,13 +41,13 @@ namespace osu.Game.Overlays.Profile.Header
 
             ClearInternal();
 
-            var banner = user?.TournamentBanner;
+            var banners = user?.TournamentBanners;
 
-            if (banner != null)
+            if (banners?.Length > 0)
             {
                 Show();
 
-                LoadComponentAsync(new DrawableTournamentBanner(banner), AddInternal, cancellationTokenSource.Token);
+                LoadComponentsAsync(banners.Select(b => new DrawableTournamentBanner(b)), AddRangeInternal, cancellationTokenSource.Token);
             }
             else
             {
diff --git a/osu.Game/Overlays/Profile/Header/Components/DrawableTournamentBanner.cs b/osu.Game/Overlays/Profile/Header/Components/DrawableTournamentBanner.cs
index 26d333ff95..c099009ca4 100644
--- a/osu.Game/Overlays/Profile/Header/Components/DrawableTournamentBanner.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/DrawableTournamentBanner.cs
@@ -15,12 +15,13 @@ namespace osu.Game.Overlays.Profile.Header.Components
     [LongRunningLoad]
     public partial class DrawableTournamentBanner : OsuClickableContainer
     {
+        private const float banner_aspect_ratio = 60 / 1000f;
         private readonly TournamentBanner banner;
 
         public DrawableTournamentBanner(TournamentBanner banner)
         {
             this.banner = banner;
-            RelativeSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
         }
 
         [BackgroundDependencyLoader]
@@ -41,6 +42,12 @@ namespace osu.Game.Overlays.Profile.Header.Components
             this.FadeInFromZero(200);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            Height = DrawWidth * banner_aspect_ratio;
+        }
+
         public override LocalisableString TooltipText => "view in browser";
     }
 }

From 204ebfade7ecaf5a426bfc21a6b89cfa6393fed8 Mon Sep 17 00:00:00 2001
From: Rowe Wilson Frederisk Holme <frederisk@outlook.com>
Date: Sun, 29 Oct 2023 21:25:15 +0800
Subject: [PATCH 2067/2100] Small update to README of Templates

---
 Templates/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/README.md b/Templates/README.md
index cf25a89273..28aaee3290 100644
--- a/Templates/README.md
+++ b/Templates/README.md
@@ -7,7 +7,7 @@ Templates for use when creating osu! dependent projects. Create a fully-testable
 ```bash
 # install (or update) templates package.
 # this only needs to be done once
-dotnet new -i ppy.osu.Game.Templates
+dotnet new install ppy.osu.Game.Templates
 
 # create an empty freeform ruleset
 dotnet new ruleset -n MyCoolRuleset

From af10dbb76c4b2ab6217655f7b0eeee124acc3635 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 30 Oct 2023 06:19:52 +0300
Subject: [PATCH 2068/2100] Add test case with many tournament banners

---
 .../Online/TestSceneUserProfileHeader.cs      | 266 +++++++++++++++++-
 1 file changed, 265 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
index 4f28baa849..c9e5a3315c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
@@ -5,8 +5,10 @@ using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
+using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Profile;
@@ -28,7 +30,14 @@ namespace osu.Game.Tests.Visual.Online
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("create header", () => Child = header = new ProfileHeader());
+            AddStep("create header", () =>
+            {
+                Child = new OsuScrollContainer(Direction.Vertical)
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = header = new ProfileHeader()
+                };
+            });
         }
 
         [Test]
@@ -136,5 +145,260 @@ namespace osu.Game.Tests.Visual.Online
                 PreviousUsernames = new[] { "tsrk.", "quoicoubeh", "apagnan", "epita" }
             }, new OsuRuleset().RulesetInfo));
         }
+
+        [Test]
+        public void TestManyTournamentBanners()
+        {
+            AddStep("Show user w/ many tournament banners", () => header.User.Value = new UserProfileData(new APIUser
+            {
+                Id = 728,
+                Username = "Certain Guy",
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c2.jpg",
+                Statistics = new UserStatistics
+                {
+                    IsRanked = false,
+                    // web will sometimes return non-empty rank history even for unranked users.
+                    RankHistory = new APIRankHistory
+                    {
+                        Mode = @"osu",
+                        Data = Enumerable.Range(2345, 85).ToArray()
+                    },
+                },
+                TournamentBanners = new[]
+                {
+                    new TournamentBanner
+                    {
+                        Id = 15329,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_HK.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_HK@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15588,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CN.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CN@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15589,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PH.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PH@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15590,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CL.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CL@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15591,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_JP.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_JP@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15592,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_RU.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_RU@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15593,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_KR.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_KR@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15594,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NZ.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NZ@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15595,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_TH.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_TH@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15596,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_TW.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_TW@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15603,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_ID.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_ID@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15604,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_KZ.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_KZ@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15605,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_AR.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_AR@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15606,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_BR.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_BR@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15607,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PL.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PL@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15639,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_MX.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_MX@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15640,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_AU.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_AU@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15641,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_IT.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_IT@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15642,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_UA.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_UA@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15643,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NL.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NL@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15644,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_FI.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_FI@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15645,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_RO.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_RO@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15646,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_SG.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_SG@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15647,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_DE.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_DE@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15648,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_ES.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_ES@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15649,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_SE.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_SE@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15650,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CA.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CA@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15651,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NO.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NO@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15652,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_GB.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_GB@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15653,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_US.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_US@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15654,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PL.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PL@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15655,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_FR.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_FR@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15686,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_HK.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_HK@2x.jpg"
+                    }
+                }
+            }, new OsuRuleset().RulesetInfo));
+        }
     }
 }

From 984c30ded662bc6091c980dc6d6fcf1da880479e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 30 Oct 2023 06:20:13 +0300
Subject: [PATCH 2069/2100] Load each tournament banner as soon as it is loaded

---
 .../Overlays/Profile/Header/BannerHeaderContainer.cs  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs
index 7ed58200ec..424ab4a529 100644
--- a/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.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.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -47,7 +46,15 @@ namespace osu.Game.Overlays.Profile.Header
             {
                 Show();
 
-                LoadComponentsAsync(banners.Select(b => new DrawableTournamentBanner(b)), AddRangeInternal, cancellationTokenSource.Token);
+                for (int index = 0; index < banners.Length; index++)
+                {
+                    int displayIndex = index;
+                    LoadComponentAsync(new DrawableTournamentBanner(banners[index]), asyncBanner =>
+                    {
+                        // load in stable order regardless of async load order.
+                        Insert(displayIndex, asyncBanner);
+                    }, cancellationTokenSource.Token);
+                }
             }
             else
             {

From c7bc8e686543e4fe6e823d06b5d79be144d8ad6e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 30 Oct 2023 06:41:01 +0300
Subject: [PATCH 2070/2100] Move behaviour to settings search text box only

---
 .../Visual/Settings/TestSceneSettingsPanel.cs  | 11 +++++++++++
 .../Graphics/UserInterface/SearchTextBox.cs    |  6 ------
 osu.Game/Overlays/SettingsPanel.cs             |  2 +-
 osu.Game/Overlays/SettingsSearchTextBox.cs     | 18 ++++++++++++++++++
 4 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Overlays/SettingsSearchTextBox.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
index 24c2eee783..69e489b247 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
@@ -140,6 +140,17 @@ namespace osu.Game.Tests.Visual.Settings
             AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<FocusedTextBox>().FirstOrDefault()?.HasFocus == true);
         }
 
+        [Test]
+        public void TestSearchTextBoxSelectedOnShow()
+        {
+            SearchTextBox searchTextBox = null!;
+
+            AddStep("set text", () => (searchTextBox = settings.SectionsContainer.ChildrenOfType<SearchTextBox>().First()).Current.Value = "some text");
+            AddAssert("no text selected", () => searchTextBox.SelectedText == string.Empty);
+            AddRepeatStep("toggle visibility", () => settings.ToggleVisibility(), 2);
+            AddAssert("search text selected", () => searchTextBox.SelectedText == searchTextBox.Current.Value);
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index b554c2bbd8..a2e0ab6482 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -18,12 +18,6 @@ namespace osu.Game.Graphics.UserInterface
             PlaceholderText = HomeStrings.SearchPlaceholder;
         }
 
-        protected override void OnFocus(FocusEvent e)
-        {
-            base.OnFocus(e);
-            SelectAll();
-        }
-
         public override bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
         {
             switch (e.Action)
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 2517a58491..3bac6c400f 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Overlays
                         },
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
-                        Child = searchTextBox = new SeekLimitedSearchTextBox
+                        Child = searchTextBox = new SettingsSearchTextBox
                         {
                             RelativeSizeAxes = Axes.X,
                             Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/SettingsSearchTextBox.cs b/osu.Game/Overlays/SettingsSearchTextBox.cs
new file mode 100644
index 0000000000..bafa6e26eb
--- /dev/null
+++ b/osu.Game/Overlays/SettingsSearchTextBox.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.
+
+#nullable disable
+using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays
+{
+    public partial class SettingsSearchTextBox : SeekLimitedSearchTextBox
+    {
+        protected override void OnFocus(FocusEvent e)
+        {
+            base.OnFocus(e);
+            SelectAll();
+        }
+    }
+}

From d90f29a5ff4a4618955b7ac7c4e743d39b4aa03a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 15:07:26 +0900
Subject: [PATCH 2071/2100] Improve log output surrounding score submission

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 5fa6508a31..a75546f835 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -188,7 +188,10 @@ namespace osu.Game.Screens.Play
         {
             // token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
             if (token == null)
+            {
+                Logger.Log("No token, skipping score submission");
                 return Task.CompletedTask;
+            }
 
             if (scoreSubmissionSource != null)
                 return scoreSubmissionSource.Task;
@@ -197,6 +200,8 @@ namespace osu.Game.Screens.Play
             if (!score.ScoreInfo.Statistics.Any(s => s.Key.IsHit() && s.Value > 0))
                 return Task.CompletedTask;
 
+            Logger.Log($"Beginning score submission (token:{token.Value})...");
+
             scoreSubmissionSource = new TaskCompletionSource<bool>();
             var request = CreateSubmissionRequest(score, token.Value);
 
@@ -206,11 +211,12 @@ namespace osu.Game.Screens.Play
                 score.ScoreInfo.Position = s.Position;
 
                 scoreSubmissionSource.SetResult(true);
+                Logger.Log($"Score submission completed! (token:{token.Value} id:{s.ID})");
             };
 
             request.Failure += e =>
             {
-                Logger.Error(e, $"Failed to submit score ({e.Message})");
+                Logger.Error(e, $"Failed to submit score (token:{token.Value}): {e.Message}");
                 scoreSubmissionSource.SetResult(false);
             };
 

From a8c3f598457ee9079ba97d2f381f75f7774890dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 15:07:35 +0900
Subject: [PATCH 2072/2100] Clean up type display for web requests in logs

---
 osu.Game/Online/API/APIRequest.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index cd6e8df754..6b6b222043 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -7,6 +7,7 @@ using System;
 using System.Globalization;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
 using osu.Game.Extensions;
@@ -46,7 +47,7 @@ namespace osu.Game.Online.API
             if (WebRequest != null)
             {
                 Response = ((OsuJsonWebRequest<T>)WebRequest).ResponseObject;
-                Logger.Log($"{GetType()} finished with response size of {WebRequest.ResponseStream.Length:#,0} bytes", LoggingTarget.Network);
+                Logger.Log($"{GetType().ReadableName()} finished with response size of {WebRequest.ResponseStream.Length:#,0} bytes", LoggingTarget.Network);
             }
         }
 

From a91b704d21df8adeca8068dd448d2ac9424010c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 15:10:10 +0900
Subject: [PATCH 2073/2100] Fix some new nullable inspections

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs                 | 8 ++------
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs            | 2 ++
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs | 2 ++
 osu.Game/Screens/Play/SquareGraph.cs                    | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index c62659d67a..3cb9b96090 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -49,13 +49,9 @@ namespace osu.Game.Rulesets.Osu.Objects
             set
             {
                 path.ControlPoints.Clear();
-                path.ExpectedDistance.Value = null;
+                path.ControlPoints.AddRange(value.ControlPoints.Select(c => new PathControlPoint(c.Position, c.Type)));
 
-                if (value != null)
-                {
-                    path.ControlPoints.AddRange(value.ControlPoints.Select(c => new PathControlPoint(c.Position, c.Type)));
-                    path.ExpectedDistance.Value = value.ExpectedDistance.Value;
-                }
+                path.ExpectedDistance.Value = value.ExpectedDistance.Value;
             }
         }
 
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 158c3c102c..3ed7558bcb 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -51,6 +52,7 @@ namespace osu.Game.Rulesets.Edit
 
         private SelectionState state;
 
+        [CanBeNull]
         public event Action<SelectionState> StateChanged;
 
         public SelectionState State
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 1506b884b4..85ea881006 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -166,6 +166,8 @@ namespace osu.Game.Screens.Backgrounds
 
             public override void Add(Drawable drawable)
             {
+                ArgumentNullException.ThrowIfNull(drawable);
+
                 if (drawable is Background)
                     throw new InvalidOperationException($"Use {nameof(Background)} to set a background.");
 
diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index b53e86a41b..0c7b485755 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -190,6 +191,7 @@ namespace osu.Game.Screens.Play
             private const float padding = 2;
             public const float WIDTH = cube_size + padding;
 
+            [CanBeNull]
             public event Action<ColumnState> StateChanged;
 
             private readonly List<Box> drawableRows = new List<Box>();

From 96dd7b3333014cb5e8e404d129b163de1f72f6e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 15:44:16 +0900
Subject: [PATCH 2074/2100] Update the last played date of a beatmap when
 importing a replay by the local user

---
 osu.Game.Tests/ImportTest.cs                |  4 ++
 osu.Game.Tests/Scores/IO/ImportScoreTest.cs | 59 +++++++++++++++++++++
 osu.Game/Online/API/DummyAPIAccess.cs       |  2 +-
 osu.Game/Scoring/ScoreImporter.cs           |  3 ++
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/ImportTest.cs b/osu.Game.Tests/ImportTest.cs
index 3f0f8a4f14..27b8d3f21e 100644
--- a/osu.Game.Tests/ImportTest.cs
+++ b/osu.Game.Tests/ImportTest.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Platform;
 using osu.Game.Database;
+using osu.Game.Online.API;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests
@@ -46,12 +47,15 @@ namespace osu.Game.Tests
         public partial class TestOsuGameBase : OsuGameBase
         {
             public RealmAccess Realm => Dependencies.Get<RealmAccess>();
+            public new IAPIProvider API => base.API;
 
             private readonly bool withBeatmap;
 
             public TestOsuGameBase(bool withBeatmap)
             {
                 this.withBeatmap = withBeatmap;
+
+                base.API = new DummyAPIAccess();
             }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index 892ceea185..d1bacaaf69 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -12,6 +12,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Platform;
 using osu.Game.IO.Archives;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -67,6 +68,64 @@ namespace osu.Game.Tests.Scores.IO
             }
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestLastPlayedUpdate(bool isLocalUser)
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host, true);
+
+                    if (!isLocalUser)
+                        osu.API.Logout();
+
+                    var beatmap = BeatmapImportHelper.LoadOszIntoOsu(osu, TestResources.GetQuickTestBeatmapForImport()).GetResultSafely();
+                    var beatmapInfo = beatmap.Beatmaps.First();
+
+                    DateTimeOffset replayDate = DateTimeOffset.Now;
+
+                    var toImport = new ScoreInfo
+                    {
+                        Rank = ScoreRank.B,
+                        TotalScore = 987654,
+                        Accuracy = 0.8,
+                        MaxCombo = 500,
+                        Combo = 250,
+                        User = new APIUser
+                        {
+                            Username = "Test user",
+                            Id = DummyAPIAccess.DUMMY_USER_ID,
+                        },
+                        Date = replayDate,
+                        OnlineID = 12345,
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapInfo = beatmapInfo
+                    };
+
+                    var imported = LoadScoreIntoOsu(osu, toImport);
+
+                    Assert.AreEqual(toImport.Rank, imported.Rank);
+                    Assert.AreEqual(toImport.TotalScore, imported.TotalScore);
+                    Assert.AreEqual(toImport.Accuracy, imported.Accuracy);
+                    Assert.AreEqual(toImport.MaxCombo, imported.MaxCombo);
+                    Assert.AreEqual(toImport.User.Username, imported.User.Username);
+                    Assert.AreEqual(toImport.Date, imported.Date);
+                    Assert.AreEqual(toImport.OnlineID, imported.OnlineID);
+
+                    if (isLocalUser)
+                        Assert.That(imported.BeatmapInfo!.LastPlayed, Is.EqualTo(replayDate));
+                    else
+                        Assert.That(imported.BeatmapInfo!.LastPlayed, Is.Null);
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         [Test]
         public void TestImportMods()
         {
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 2764247f5c..d585124db6 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Online.API
             LocalUser.Value = new APIUser
             {
                 Username = username,
-                Id = 1001,
+                Id = DUMMY_USER_ID,
             };
 
             state.Value = APIState.Online;
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 7473d887c3..32a528f218 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -87,6 +87,9 @@ namespace osu.Game.Scoring
             if (!model.Ruleset.IsManaged)
                 model.Ruleset = realm.Find<RulesetInfo>(model.Ruleset.ShortName)!;
 
+            if (api.IsLoggedIn && api.LocalUser.Value.OnlineID == model.UserID && (model.BeatmapInfo.LastPlayed == null || model.Date > model.BeatmapInfo.LastPlayed))
+                model.BeatmapInfo.LastPlayed = model.Date;
+
             // 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.
             ArgumentNullException.ThrowIfNull(model.BeatmapInfo);

From c1c8e2968f1f620851c4e608043051f07b944d8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 15:46:09 +0900
Subject: [PATCH 2075/2100] Move operation to after user population

---
 osu.Game/Scoring/ScoreImporter.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 32a528f218..b216c0897e 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -87,9 +87,6 @@ namespace osu.Game.Scoring
             if (!model.Ruleset.IsManaged)
                 model.Ruleset = realm.Find<RulesetInfo>(model.Ruleset.ShortName)!;
 
-            if (api.IsLoggedIn && api.LocalUser.Value.OnlineID == model.UserID && (model.BeatmapInfo.LastPlayed == null || model.Date > model.BeatmapInfo.LastPlayed))
-                model.BeatmapInfo.LastPlayed = model.Date;
-
             // 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.
             ArgumentNullException.ThrowIfNull(model.BeatmapInfo);
@@ -185,6 +182,12 @@ namespace osu.Game.Scoring
             base.PostImport(model, realm, parameters);
 
             populateUserDetails(model);
+
+            Debug.Assert(model.BeatmapInfo != null);
+
+            // This needs to be run after user detail population to ensure we have a valid user id.
+            if (api.IsLoggedIn && api.LocalUser.Value.OnlineID == model.UserID && (model.BeatmapInfo.LastPlayed == null || model.Date > model.BeatmapInfo.LastPlayed))
+                model.BeatmapInfo.LastPlayed = model.Date;
         }
 
         /// <summary>

From 0dfb41b7966de7823982f3f18b2a5adfa38ac1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 09:28:37 +0100
Subject: [PATCH 2076/2100] Add test coverage for not updating `LastPlayed` due
 to newer plays

---
 osu.Game.Tests/Scores/IO/ImportScoreTest.cs | 54 +++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index d1bacaaf69..dd724d268e 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -11,6 +11,8 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Platform;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
@@ -126,6 +128,58 @@ namespace osu.Game.Tests.Scores.IO
             }
         }
 
+        [Test]
+        public void TestLastPlayedNotUpdatedDueToNewerPlays()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host, true);
+
+                    var beatmap = BeatmapImportHelper.LoadOszIntoOsu(osu, TestResources.GetQuickTestBeatmapForImport()).GetResultSafely();
+                    var beatmapInfo = beatmap.Beatmaps.First();
+
+                    var realmAccess = osu.Dependencies.Get<RealmAccess>();
+                    realmAccess.Write(r => r.Find<BeatmapInfo>(beatmapInfo.ID)!.LastPlayed = new DateTimeOffset(2023, 10, 30, 0, 0, 0, TimeSpan.Zero));
+
+                    var toImport = new ScoreInfo
+                    {
+                        Rank = ScoreRank.B,
+                        TotalScore = 987654,
+                        Accuracy = 0.8,
+                        MaxCombo = 500,
+                        Combo = 250,
+                        User = new APIUser
+                        {
+                            Username = "Test user",
+                            Id = DummyAPIAccess.DUMMY_USER_ID,
+                        },
+                        Date = new DateTimeOffset(2023, 10, 27, 0, 0, 0, TimeSpan.Zero),
+                        OnlineID = 12345,
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapInfo = beatmapInfo
+                    };
+
+                    var imported = LoadScoreIntoOsu(osu, toImport);
+
+                    Assert.AreEqual(toImport.Rank, imported.Rank);
+                    Assert.AreEqual(toImport.TotalScore, imported.TotalScore);
+                    Assert.AreEqual(toImport.Accuracy, imported.Accuracy);
+                    Assert.AreEqual(toImport.MaxCombo, imported.MaxCombo);
+                    Assert.AreEqual(toImport.User.Username, imported.User.Username);
+                    Assert.AreEqual(toImport.Date, imported.Date);
+                    Assert.AreEqual(toImport.OnlineID, imported.OnlineID);
+
+                    Assert.That(imported.BeatmapInfo!.LastPlayed, Is.EqualTo(new DateTimeOffset(2023, 10, 30, 0, 0, 0, TimeSpan.Zero)));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         [Test]
         public void TestImportMods()
         {

From 39abb8e4085d17bc8ff64a80f19e268a3d4a5b7f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 30 Oct 2023 11:54:19 +0300
Subject: [PATCH 2077/2100] Only run "select all on focus" behaviour on desktop
 platforms

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

diff --git a/osu.Game/Overlays/SettingsSearchTextBox.cs b/osu.Game/Overlays/SettingsSearchTextBox.cs
index bafa6e26eb..84cff1b508 100644
--- a/osu.Game/Overlays/SettingsSearchTextBox.cs
+++ b/osu.Game/Overlays/SettingsSearchTextBox.cs
@@ -12,7 +12,11 @@ namespace osu.Game.Overlays
         protected override void OnFocus(FocusEvent e)
         {
             base.OnFocus(e);
-            SelectAll();
+
+            // on mobile platforms, focus is not held by the search text box, and the select all feature
+            // will not make sense on it, and might annoy the user when they try to focus manually.
+            if (HoldFocus)
+                SelectAll();
         }
     }
 }

From 6be02966b9e79dfbb94ad372b932decc78ee65f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 18:06:09 +0900
Subject: [PATCH 2078/2100] Add test coverage of failing context menu display

---
 .../Editing/TestSceneTimelineSelection.cs     | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
index 50eeb9a54b..0051488029 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
@@ -7,8 +7,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+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.Objects;
 using osu.Game.Rulesets.Osu;
@@ -44,6 +46,47 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        [Test]
+        public void TestContextMenuWithObjectBehind()
+        {
+            TimelineHitObjectBlueprint blueprint;
+
+            AddStep("add object", () =>
+            {
+                EditorBeatmap.Add(new HitCircle { StartTime = 3000 });
+            });
+
+            AddStep("enter slider placement", () =>
+            {
+                InputManager.Key(Key.Number3);
+                InputManager.MoveMouseTo(ScreenSpaceDrawQuad.Centre);
+            });
+
+            AddStep("start conflicting slider", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+
+                blueprint = this.ChildrenOfType<TimelineHitObjectBlueprint>().First();
+                InputManager.MoveMouseTo(blueprint.ScreenSpaceDrawQuad.TopLeft - new Vector2(10, 0));
+            });
+
+            AddStep("end conflicting slider", () =>
+            {
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddStep("click object", () =>
+            {
+                InputManager.Key(Key.Number1);
+                blueprint = this.ChildrenOfType<TimelineHitObjectBlueprint>().First();
+                InputManager.MoveMouseTo(blueprint);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
+            AddAssert("context menu open", () => this.ChildrenOfType<OsuContextMenu>().SingleOrDefault()?.State == MenuState.Open);
+        }
+
         [Test]
         public void TestNudgeSelection()
         {

From 57d88a0ac459398a14aafd8923238ce1bc012e7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 17:46:04 +0900
Subject: [PATCH 2079/2100] Fix right clicks on timeline objects potentially
 getting eaten by playfield area

`SelectionHandler` is receiving input from anywhere out of necessity:

https://github.com/ppy/osu/blob/19f892687a0607afbe4e0d010366dc2a66236073/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs#L119-L125

Also important is that `BlueprintContainer` will selectively not block
right clicks to make sure they fall through to the
`ContextMenuContainer`:

https://github.com/ppy/osu/blob/19f892687a0607afbe4e0d010366dc2a66236073/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs#L122-L126

But because the whole editor is sharing a `ContextMenuContainer` and
it's at a higher level than both components, we observe here the
playfield's `SelectionHandler` intercepting the right click before it
can reach the `ContextMenuContainer`.

The fix here is similar to what we're already doing in
`TimelineBlueprintContaienr`.
---
 .../Compose/Components/ComposeBlueprintContainer.cs |  5 ++++-
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs   | 13 +++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index c8cfac454a..ba570a9251 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -40,11 +40,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public PlacementBlueprint CurrentPlacement { get; private set; }
 
+        [Resolved]
+        private EditorScreenWithTimeline editorScreen { get; set; }
+
         /// <remarks>
         /// Positional input must be received outside the container's bounds,
         /// in order to handle composer blueprints which are partially offscreen.
         /// </remarks>
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => editorScreen.MainContent.ReceivePositionalInputAt(screenSpacePos);
 
         public ComposeBlueprintContainer(HitObjectComposer composer)
             : base(composer)
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index ea2790b50a..e1ec1ad4ac 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -11,13 +11,14 @@ using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
 namespace osu.Game.Screens.Edit
 {
+    [Cached]
     public abstract partial class EditorScreenWithTimeline : EditorScreen
     {
         public const float PADDING = 10;
 
-        private Container timelineContainer = null!;
+        public Container TimelineContent = null!;
 
-        private Container mainContent = null!;
+        public Container MainContent = null!;
 
         private LoadingSpinner spinner = null!;
 
@@ -70,7 +71,7 @@ namespace osu.Game.Screens.Edit
                                         {
                                             new Drawable[]
                                             {
-                                                timelineContainer = new Container
+                                                TimelineContent = new Container
                                                 {
                                                     RelativeSizeAxes = Axes.X,
                                                     AutoSizeAxes = Axes.Y,
@@ -93,7 +94,7 @@ namespace osu.Game.Screens.Edit
                     },
                     new Drawable[]
                     {
-                        mainContent = new Container
+                        MainContent = new Container
                         {
                             Name = "Main content",
                             RelativeSizeAxes = Axes.Both,
@@ -116,10 +117,10 @@ namespace osu.Game.Screens.Edit
             {
                 spinner.State.Value = Visibility.Hidden;
 
-                mainContent.Add(content);
+                MainContent.Add(content);
                 content.FadeInFromZero(300, Easing.OutQuint);
 
-                LoadComponentAsync(new TimelineArea(CreateTimelineContent()), timelineContainer.Add);
+                LoadComponentAsync(new TimelineArea(CreateTimelineContent()), TimelineContent.Add);
             });
         }
 

From 63e6eaf53880e326d43a75efec66134bb36bfe30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 17:55:21 +0900
Subject: [PATCH 2080/2100] Fix failing tests

---
 osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs   | 2 +-
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
index 0051488029..d8219ff36e 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("click away", () =>
             {
-                InputManager.MoveMouseTo(Editor.ChildrenOfType<TimelineArea>().Single().ScreenSpaceDrawQuad.TopLeft + Vector2.One);
+                InputManager.MoveMouseTo(Editor.ChildrenOfType<Timeline>().First().ScreenSpaceDrawQuad.TopLeft + new Vector2(5));
                 InputManager.Click(MouseButton.Left);
             });
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index ba570a9251..c7c7c4aa83 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -40,14 +40,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public PlacementBlueprint CurrentPlacement { get; private set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private EditorScreenWithTimeline editorScreen { get; set; }
 
         /// <remarks>
         /// Positional input must be received outside the container's bounds,
         /// in order to handle composer blueprints which are partially offscreen.
         /// </remarks>
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => editorScreen.MainContent.ReceivePositionalInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => editorScreen?.MainContent.ReceivePositionalInputAt(screenSpacePos) ?? base.ReceivePositionalInputAt(screenSpacePos);
 
         public ComposeBlueprintContainer(HitObjectComposer composer)
             : base(composer)

From 0ed5f274f6e45ea22401a50e905e2a1d3406f170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 10:48:31 +0100
Subject: [PATCH 2081/2100] Enable NRT in `TestSceneSliderVelocityAdjust`

---
 .../Editor/TestSceneSliderVelocityAdjust.cs   | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
index bb8c52bdfc..d92c6ebb60 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <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 NUnit.Framework;
@@ -24,15 +22,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public partial class TestSceneSliderVelocityAdjust : OsuGameTestScene
     {
-        private Screens.Edit.Editor editor => Game.ScreenStack.CurrentScreen as Screens.Edit.Editor;
+        private Screens.Edit.Editor? editor => Game.ScreenStack.CurrentScreen as Screens.Edit.Editor;
 
-        private EditorBeatmap editorBeatmap => editor.ChildrenOfType<EditorBeatmap>().FirstOrDefault();
+        private EditorBeatmap editorBeatmap => editor.ChildrenOfType<EditorBeatmap>().FirstOrDefault()!;
 
-        private EditorClock editorClock => editor.ChildrenOfType<EditorClock>().FirstOrDefault();
+        private EditorClock editorClock => editor.ChildrenOfType<EditorClock>().FirstOrDefault()!;
 
-        private Slider slider => editorBeatmap.HitObjects.OfType<Slider>().FirstOrDefault();
+        private Slider? slider => editorBeatmap.HitObjects.OfType<Slider>().FirstOrDefault();
 
-        private TimelineHitObjectBlueprint blueprint => editor.ChildrenOfType<TimelineHitObjectBlueprint>().FirstOrDefault();
+        private TimelineHitObjectBlueprint blueprint => editor.ChildrenOfType<TimelineHitObjectBlueprint>().FirstOrDefault()!;
 
         private DifficultyPointPiece difficultyPointPiece => blueprint.ChildrenOfType<DifficultyPointPiece>().First();
 
@@ -66,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddAssert("ensure one slider placed", () => slider != null);
 
-            AddStep("store velocity", () => velocity = slider.Velocity);
+            AddStep("store velocity", () => velocity = slider!.Velocity);
 
             if (adjustVelocity)
             {
@@ -76,10 +74,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 AddAssert("velocity adjusted", () =>
                 {
                     Debug.Assert(velocity != null);
-                    return Precision.AlmostEquals(velocity.Value * 2, slider.Velocity);
+                    return Precision.AlmostEquals(velocity.Value * 2, slider!.Velocity);
                 });
 
-                AddStep("store velocity", () => velocity = slider.Velocity);
+                AddStep("store velocity", () => velocity = slider!.Velocity);
             }
 
             AddStep("save", () => InputManager.Keys(PlatformAction.Save));
@@ -88,8 +86,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("enter editor (again)", () => Game.ScreenStack.Push(new EditorLoader()));
             AddUntilStep("wait for editor load", () => editor?.ReadyForUse == true);
 
-            AddStep("seek to slider", () => editorClock.Seek(slider.StartTime));
-            AddAssert("slider has correct velocity", () => slider.Velocity == velocity);
+            AddStep("seek to slider", () => editorClock.Seek(slider!.StartTime));
+            AddAssert("slider has correct velocity", () => slider!.Velocity == velocity);
         }
     }
 }

From e1ff0d12c66db4c2f16bc5d88fdb568dd5341bf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 10:55:26 +0100
Subject: [PATCH 2082/2100] Update tests to NUnit-style assertions

---
 .../Editor/TestSceneSliderVelocityAdjust.cs    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
index d92c6ebb60..979801bc41 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.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.Input;
@@ -45,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             double? velocity = null;
 
             AddStep("enter editor", () => Game.ScreenStack.Push(new EditorLoader()));
-            AddUntilStep("wait for editor load", () => editor?.ReadyForUse == true);
+            AddUntilStep("wait for editor load", () => editor?.ReadyForUse, () => Is.True);
 
             AddStep("seek to first control point", () => editorClock.Seek(editorBeatmap.ControlPointInfo.TimingPoints.First().Time));
             AddStep("enter slider placement mode", () => InputManager.Key(Key.Number3));
@@ -58,11 +57,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("exit placement mode", () => InputManager.Key(Key.Number1));
 
-            AddAssert("slider placed", () => slider != null);
+            AddAssert("slider placed", () => slider, () => Is.Not.Null);
 
             AddStep("select slider", () => editorBeatmap.SelectedHitObjects.Add(slider));
 
-            AddAssert("ensure one slider placed", () => slider != null);
+            AddAssert("ensure one slider placed", () => slider, () => Is.Not.Null);
 
             AddStep("store velocity", () => velocity = slider!.Velocity);
 
@@ -71,11 +70,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 AddStep("open velocity adjust panel", () => difficultyPointPiece.TriggerClick());
                 AddStep("change velocity", () => velocityTextBox.Current.Value = 2);
 
-                AddAssert("velocity adjusted", () =>
-                {
-                    Debug.Assert(velocity != null);
-                    return Precision.AlmostEquals(velocity.Value * 2, slider!.Velocity);
-                });
+                AddAssert("velocity adjusted", () => slider!.Velocity,
+                    () => Is.EqualTo(velocity!.Value * 2).Within(Precision.DOUBLE_EPSILON));
 
                 AddStep("store velocity", () => velocity = slider!.Velocity);
             }
@@ -84,10 +80,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("exit", () => InputManager.Key(Key.Escape));
 
             AddStep("enter editor (again)", () => Game.ScreenStack.Push(new EditorLoader()));
-            AddUntilStep("wait for editor load", () => editor?.ReadyForUse == true);
+            AddUntilStep("wait for editor load", () => editor?.ReadyForUse, () => Is.True);
 
             AddStep("seek to slider", () => editorClock.Seek(slider!.StartTime));
-            AddAssert("slider has correct velocity", () => slider!.Velocity == velocity);
+            AddAssert("slider has correct velocity", () => slider!.Velocity, () => Is.EqualTo(velocity));
         }
     }
 }

From b3369dbb7b188d99f226894924a70339478c21b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 10:57:48 +0100
Subject: [PATCH 2083/2100] Add failing test for slider velocity

---
 .../Editor/TestSceneSliderVelocityAdjust.cs   | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
index 979801bc41..175cbeca6e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
@@ -85,5 +85,50 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("seek to slider", () => editorClock.Seek(slider!.StartTime));
             AddAssert("slider has correct velocity", () => slider!.Velocity, () => Is.EqualTo(velocity));
         }
+
+        [Test]
+        public void TestVelocityUndo()
+        {
+            double? velocityBefore = null;
+            double? durationBefore = null;
+
+            AddStep("enter editor", () => Game.ScreenStack.Push(new EditorLoader()));
+            AddUntilStep("wait for editor load", () => editor?.ReadyForUse == true);
+
+            AddStep("seek to first control point", () => editorClock.Seek(editorBeatmap.ControlPointInfo.TimingPoints.First().Time));
+            AddStep("enter slider placement mode", () => InputManager.Key(Key.Number3));
+
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(editor.ChildrenOfType<Playfield>().First().ScreenSpaceDrawQuad.Centre));
+            AddStep("start placement", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("move mouse to bottom right", () => InputManager.MoveMouseTo(editor.ChildrenOfType<Playfield>().First().ScreenSpaceDrawQuad.BottomRight - new Vector2(10)));
+            AddStep("end placement", () => InputManager.Click(MouseButton.Right));
+
+            AddStep("exit placement mode", () => InputManager.Key(Key.Number1));
+
+            AddAssert("slider placed", () => slider, () => Is.Not.Null);
+            AddStep("select slider", () => editorBeatmap.SelectedHitObjects.Add(slider));
+
+            AddStep("store velocity", () =>
+            {
+                velocityBefore = slider!.Velocity;
+                durationBefore = slider.Duration;
+            });
+
+            AddStep("open velocity adjust panel", () => difficultyPointPiece.TriggerClick());
+            AddStep("change velocity", () => velocityTextBox.Current.Value = 2);
+
+            AddAssert("velocity adjusted", () => slider!.Velocity, () => Is.EqualTo(velocityBefore!.Value * 2).Within(Precision.DOUBLE_EPSILON));
+
+            AddStep("undo", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.Z);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+
+            AddAssert("slider has correct velocity", () => slider!.Velocity, () => Is.EqualTo(velocityBefore));
+            AddAssert("slider has correct duration", () => slider!.Duration, () => Is.EqualTo(durationBefore));
+        }
     }
 }

From de89b7e53c305c0bf048b3ee42c028775d2da2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 10:59:02 +0100
Subject: [PATCH 2084/2100] Fix slider velocity changes not being undone
 correctly

Closes https://github.com/ppy/osu/issues/25239.

`LegacyEditorBeatmapPatcher.processHitObjectLocalData()` was already
supposed to be handling changes to hitobjects that will show up neither
when comparing the hitobjects themselves or the timing point with
"legacy" info stripped - so, in other words, changes to slider velocity
and samples.

However, a change to slider velocity requires default application to
take effect, so just resetting the value would visually fix the timeline
marker but not change the actual object. Calling
`EditorBeatmap.Update()` fixes this by way of triggering default
re-application.

This could probably be smarter (by only invoking the update when
strictly necessary, etc.) - but I'm not sure it's worth the hassle. This
is intended to be a quick fix, rather than a complete solution - the
complete solution would indeed likely entail a wholesale restructuring
of the editor's change handling.
---
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index fe0d4a7822..bb9f702cb5 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -123,6 +123,8 @@ namespace osu.Game.Screens.Edit
                     oldWithRepeats.NodeSamples.Clear();
                     oldWithRepeats.NodeSamples.AddRange(newWithRepeats.NodeSamples);
                 }
+
+                editorBeatmap.Update(oldObject);
             }
         }
 

From cea24298cb99c901077c6e8a23bdfa34da3ceafd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 12:42:34 +0100
Subject: [PATCH 2085/2100] Privatise setters

---
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index e1ec1ad4ac..575a66d421 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -16,9 +16,9 @@ namespace osu.Game.Screens.Edit
     {
         public const float PADDING = 10;
 
-        public Container TimelineContent = null!;
+        public Container TimelineContent { get; private set; } = null!;
 
-        public Container MainContent = null!;
+        public Container MainContent { get; private set; } = null!;
 
         private LoadingSpinner spinner = null!;
 

From 88e10dd051d33ca0e63a7cd5f82dac3d9b4e039c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 20:03:44 +0100
Subject: [PATCH 2086/2100] 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 0575817460..2870696c03 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.1012.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1030.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 bf0a1fcbad..60c71a736d 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.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1030.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1023.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index 9b06b4a6a7..f1159f58b9 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.1012.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1030.0" />
   </ItemGroup>
 </Project>

From 06508d08fe1f289404bb20756f43403c209e0d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 20:22:41 +0100
Subject: [PATCH 2087/2100] Delete outdated test

---
 .../UserInterface/TestSceneSearchTextBox.cs   | 38 -------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs
deleted file mode 100644
index 153525d24a..0000000000
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs
+++ /dev/null
@@ -1,38 +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 NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    public partial class TestSceneSearchTextBox : OsuTestScene
-    {
-        private SearchTextBox textBox = null!;
-
-        [SetUp]
-        public void SetUp() => Schedule(() =>
-        {
-            Child = textBox = new SearchTextBox
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Width = 400,
-                Scale = new Vector2(2f),
-                HoldFocus = true,
-            };
-        });
-
-        [Test]
-        public void TestSelectionOnFocus()
-        {
-            AddStep("set text", () => textBox.Text = "some text");
-            AddAssert("no text selected", () => textBox.SelectedText == string.Empty);
-            AddStep("hide text box", () => textBox.Hide());
-            AddStep("show text box", () => textBox.Show());
-            AddAssert("search text selected", () => textBox.SelectedText == textBox.Text);
-        }
-    }
-}

From f2c0bc821802067e8cb9c7e5bbf64215e6e4fc31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 21:15:04 +0100
Subject: [PATCH 2088/2100] Add failing test case

---
 .../TestSceneSpinnerInput.cs                  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index 5a473409a4..a6c15d5a67 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.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,8 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Replays;
@@ -47,6 +50,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void Setup() => Schedule(() =>
         {
             manualClock = null;
+            SelectedMods.Value = Array.Empty<Mod>();
         });
 
         /// <summary>
@@ -102,6 +106,34 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertSpinnerHit(false);
         }
 
+        [Test]
+        public void TestVibrateWithoutSpinningOnCentreWithDoubleTime()
+        {
+            List<ReplayFrame> frames = new List<ReplayFrame>();
+
+            const int rate = 2;
+            // the track clock is going to be playing twice as fast,
+            // so the vibration time in clock time needs to be twice as long
+            // to keep constant speed in real time.
+            const int vibrate_time = 50 * rate;
+
+            int direction = -1;
+
+            for (double i = time_spinner_start; i <= time_spinner_end; i += vibrate_time)
+            {
+                frames.Add(new OsuReplayFrame(i, new Vector2(centre_x + direction * 50, centre_y), OsuAction.LeftButton));
+                frames.Add(new OsuReplayFrame(i + vibrate_time, new Vector2(centre_x - direction * 50, centre_y), OsuAction.LeftButton));
+
+                direction *= -1;
+            }
+
+            AddStep("set DT", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = rate } } });
+            performTest(frames);
+
+            assertTicksHit(0);
+            assertSpinnerHit(false);
+        }
+
         /// <summary>
         /// Spins in a single direction.
         /// </summary>

From e5b51f769ce72e7394131df3b993a7a840115984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 21:15:40 +0100
Subject: [PATCH 2089/2100] Fix incorrect assertion placement in spinner
 rotation tracker

Checking the delta after the application of rate is not correct. The
delta is in screen-space *before* the rate from rate-changing mods were
applied; the point of the application of the rate is to compensate for
the fact that the spinner is still judged in "track time" - but the goal
is to keep the spinner's difficulty *independent* of rate, which means
that with DT active the user's spin is "twice as effective" to
compensate for the fact that the spinner is twice as short in real time.

In another formulation, with DT active, the user gets to record replay
frames "half as often" as in normal gameplay.
---
 .../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 374f3f461b..1d75663fd9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -101,11 +101,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 rotationTransferred = true;
             }
 
+            Debug.Assert(Math.Abs(delta) <= 180);
+
             double rate = gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate;
             delta = (float)(delta * Math.Abs(rate));
 
-            Debug.Assert(Math.Abs(delta) <= 180);
-
             currentRotation += delta;
             drawableSpinner.Result.History.ReportDelta(Time.Current, delta);
         }

From 12ef93ac3b42a86c031c37a9f89e430bf90912b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 21:31:34 +0100
Subject: [PATCH 2090/2100] Remove no-longer-valid assertion

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index a6c15d5a67..75bcd809c8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -130,7 +130,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("set DT", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = rate } } });
             performTest(frames);
 
-            assertTicksHit(0);
             assertSpinnerHit(false);
         }
 

From 87c9df937f85d3f7e9b220c2f21c13caae74b25b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 12:40:21 +0900
Subject: [PATCH 2091/2100] Move team seed to below team name

---
 .../Components/DrawableTeamSeed.cs            |  6 +++++
 .../TournamentSpriteTextWithBackground.cs     |  2 +-
 .../Gameplay/Components/TeamDisplay.cs        | 27 ++++++-------------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tournament/Components/DrawableTeamSeed.cs b/osu.Game.Tournament/Components/DrawableTeamSeed.cs
index a79c63e979..077185f5c0 100644
--- a/osu.Game.Tournament/Components/DrawableTeamSeed.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamSeed.cs
@@ -22,6 +22,12 @@ namespace osu.Game.Tournament.Components
         [Resolved]
         private LadderInfo ladder { get; set; } = null!;
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Text.Font = Text.Font.With(size: 36);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
index ce118727cd..21439482e3 100644
--- a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
+++ b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tournament.Components
                 {
                     Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR,
                     Font = OsuFont.Torus.With(weight: FontWeight.SemiBold, size: 50),
-                    Padding = new MarginPadding { Horizontal = 10 },
+                    Padding = new MarginPadding { Left = 10, Right = 20 },
                     Text = text,
                 }
             };
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 49fbc64397..3eec67c639 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -95,28 +95,17 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                                             }
                                         }
                                     },
-                                    new FillFlowContainer
+                                    teamNameText = new TournamentSpriteTextWithBackground
                                     {
-                                        AutoSizeAxes = Axes.Both,
-                                        Direction = FillDirection.Horizontal,
-                                        Spacing = new Vector2(5),
+                                        Scale = new Vector2(0.5f),
+                                        Origin = anchor,
+                                        Anchor = anchor,
+                                    },
+                                    new DrawableTeamSeed(Team)
+                                    {
+                                        Scale = new Vector2(0.5f),
                                         Origin = anchor,
                                         Anchor = anchor,
-                                        Children = new Drawable[]
-                                        {
-                                            teamNameText = new TournamentSpriteTextWithBackground
-                                            {
-                                                Scale = new Vector2(0.5f),
-                                                Origin = anchor,
-                                                Anchor = anchor,
-                                            },
-                                            new DrawableTeamSeed(Team)
-                                            {
-                                                Scale = new Vector2(0.5f),
-                                                Origin = anchor,
-                                                Anchor = anchor,
-                                            },
-                                        }
                                     },
                                 }
                             },

From feeb95e4c389b85a1e72b1f00d2a79131ecb2652 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 12:44:43 +0900
Subject: [PATCH 2092/2100] Adjust `DrawableTeamTitleWithHeader` to match new
 layout

---
 .../Components/DrawableTeamTitleWithHeader.cs     | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
index fc4037d4e1..7d8fc847d4 100644
--- a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
@@ -18,21 +18,12 @@ namespace osu.Game.Tournament.Components
             {
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 10),
+                Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
                     new DrawableTeamHeader(colour),
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Spacing = new Vector2(5),
-                        Children = new Drawable[]
-                        {
-                            new DrawableTeamTitle(team),
-                            new DrawableTeamSeed(team),
-                        }
-                    }
+                    new DrawableTeamTitle(team),
+                    new DrawableTeamSeed(team),
                 }
             };
         }

From a3dc9a73b19120c0c4ef4ba7199463fb63ad280c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 13:35:15 +0900
Subject: [PATCH 2093/2100] Revert behaviour changes of `MaxDimensions` test
 and ignore instead

---
 .../Gameplay/TestScenePlayerMaxDimensions.cs  | 76 ++++++++++++++++---
 1 file changed, 66 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index 6665295e99..53a4abdd07 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -3,14 +3,21 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Processing;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -21,6 +28,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     /// <remarks>
     /// The HUD is hidden as it does't really affect game balance if HUD elements are larger than they should be.
     /// </remarks>
+    [Ignore("This test is for visual testing, and has no value in being run in standard CI runs.")]
     public partial class TestScenePlayerMaxDimensions : TestSceneAllRulesetPlayers
     {
         // scale textures to 4 times their size.
@@ -66,18 +74,66 @@ namespace osu.Game.Tests.Visual.Gameplay
                 remove { }
             }
 
-            public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
-            {
-                var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
-
-                if (texture != null)
-                    texture.ScaleAdjust /= scale_factor;
-
-                return texture;
-            }
-
             public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => this;
             public IEnumerable<ISkin> AllSources => new[] { this };
+
+            protected override IResourceStore<TextureUpload> CreateTextureLoaderStore(IStorageResourceProvider resources, IResourceStore<byte[]> storage)
+                => new UpscaledTextureLoaderStore(base.CreateTextureLoaderStore(resources, storage));
+
+            private class UpscaledTextureLoaderStore : IResourceStore<TextureUpload>
+            {
+                private readonly IResourceStore<TextureUpload>? textureStore;
+
+                public UpscaledTextureLoaderStore(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 upscale(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(() => upscale(textureUpload), cancellationToken).ConfigureAwait(false);
+                }
+
+                private TextureUpload upscale(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();
+
+                    image.Mutate(i => i.Resize(new Size(textureUpload.Width, textureUpload.Height) * scale_factor));
+                    return new TextureUpload(image);
+                }
+
+                public Stream? GetStream(string name) => textureStore?.GetStream(name);
+
+                public IEnumerable<string> GetAvailableResources() => textureStore?.GetAvailableResources() ?? Array.Empty<string>();
+            }
         }
     }
 }

From 37ec10d4f592ebab514c9a9afc5f9dcb8dce7c2f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 13:49:39 +0900
Subject: [PATCH 2094/2100] Fix `TestSongSelectScrollHandling` not waiting for
 `VolumeOverlay` to load

See https://github.com/ppy/osu/actions/runs/6701786492/job/18210372721.
---
 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 7fa4f8c836..9e743ef336 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Tests.Visual.Navigation
             double scrollPosition = 0;
 
             AddStep("set game volume to max", () => Game.Dependencies.Get<FrameworkConfigManager>().SetValue(FrameworkSetting.VolumeUniversal, 1d));
-            AddUntilStep("wait for volume overlay to hide", () => Game.ChildrenOfType<VolumeOverlay>().Single().State.Value, () => Is.EqualTo(Visibility.Hidden));
+            AddUntilStep("wait for volume overlay to hide", () => Game.ChildrenOfType<VolumeOverlay>().SingleOrDefault()?.State.Value, () => Is.EqualTo(Visibility.Hidden));
             PushAndConfirm(() => songSelect = new TestPlaySongSelect());
             AddUntilStep("wait for song select", () => songSelect.BeatmapSetsLoaded);
             AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());

From 89444d5544aad8c89be4eff311cd6beeedc1c421 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:00:49 +0900
Subject: [PATCH 2095/2100] Fix export test still occasionally failing due to
 file write in progress

https://github.com/ppy/osu/actions/runs/6701591401/job/18209826074

Basically, `File.Move` may not be an atomic operation.
---
 .../Gameplay/TestScenePlayerLocalScoreImport.cs    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 1254aa0639..0dd544bb30 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -214,10 +214,18 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             // Files starting with _ are temporary, created by CreateFileSafely call.
             AddUntilStep("wait for export file", () => filePath = LocalStorage.GetFiles("exports").SingleOrDefault(f => !Path.GetFileName(f).StartsWith("_", StringComparison.Ordinal)), () => Is.Not.Null);
-            AddAssert("filesize is non-zero", () =>
+            AddUntilStep("filesize is non-zero", () =>
             {
-                using (var stream = LocalStorage.GetStream(filePath))
-                    return stream.Length;
+                try
+                {
+                    using (var stream = LocalStorage.GetStream(filePath))
+                        return stream.Length;
+                }
+                catch (IOException)
+                {
+                    // file move may still be in progress.
+                    return 0;
+                }
             }, () => Is.Not.Zero);
         }
 

From 66b84d02cb1631302631d5b16afd31d0d420a13a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:20:11 +0900
Subject: [PATCH 2096/2100] Add note about `TestGameplayExitFlow` failure, and
 ignore for now

See:
https://github.com/ppy/osu/actions/runs/6695995685/job/18194110641
https://github.com/ppy/osu/actions/runs/6700910613/job/18208272419
---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 09624f63b7..16030d568b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -693,7 +693,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        [FlakyTest] // See above
+        [Ignore("Failing too often, needs revisiting in some future.")]
+        // This test is failing even after 10 retries (see https://github.com/ppy/osu/actions/runs/6700910613/job/18208272419)
+        // Something is stopping the ready button from changing states, over multiple runs.
         public void TestGameplayExitFlow()
         {
             Bindable<double>? holdDelay = null;

From bdd3f2847b8a27d1e34657297fdc290deeaf1e88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:26:00 +0900
Subject: [PATCH 2097/2100] Add an extra storyboard sample to avoid
 intermittent failures in `TestStoryboardSamplesStopOnSkip`

Probably CI running slow timing balls.

The point of failure is `waitUntilStoryboardSamplesPlay()`
after already testing the important part of the test (that
the samples stop on skip) so let's give it another possible
point to recover.

See https://github.com/ppy/osu/actions/runs/6698399814/job/18201753701.
---
 .../Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
index a9d4508f70..11dc0f9c30 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: -7000, volume: 20));
             backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: -5000, volume: 20));
             backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: 0, volume: 20));
+            backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: 2000, volume: 20));
         }
 
         [SetUp]

From d379e553da920cfd8cbccca2f5a03786c8627dc6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:31:26 +0900
Subject: [PATCH 2098/2100] Fix back-to-front logging

---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index b072ce191e..29c9381ee4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     alwaysGoingForward &= goingForward;
 
                     if (!goingForward)
-                        Logger.Log($"Backwards time occurred ({currentTime:N1} -> {lastTime:N1})");
+                        Logger.Log($"Backwards time occurred ({lastTime:N1} -> {currentTime:N1})");
 
                     lastTime = currentTime;
                 };

From 7ceced70122d51ffc030074d1f3738645367be59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:47:04 +0900
Subject: [PATCH 2099/2100] Scope `TestPauseWithLargeOffset` to focus on what
 matters See
 https://github.com/ppy/osu/actions/runs/6693917410/job/18186111009

This test is to make sure we don't seek before the original
pause time, so I've exposed that value precisely to avoid
CI woes.
---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 16 ++++++++++------
 .../Screens/Play/MasterGameplayClockContainer.cs | 12 ++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 29c9381ee4..ec3b3e0822 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestPauseWithLargeOffset()
         {
-            double lastTime;
+            double lastStopTime;
             bool alwaysGoingForward = true;
 
             AddStep("force large offset", () =>
@@ -84,20 +84,24 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("add time forward check hook", () =>
             {
-                lastTime = double.MinValue;
+                lastStopTime = double.MinValue;
                 alwaysGoingForward = true;
 
                 Player.OnUpdate += _ =>
                 {
-                    double currentTime = Player.GameplayClockContainer.CurrentTime;
-                    bool goingForward = currentTime >= lastTime - 500;
+                    var masterClock = (MasterGameplayClockContainer)Player.GameplayClockContainer;
+
+                    double currentTime = masterClock.CurrentTime;
+
+                    bool goingForward = currentTime >= (masterClock.LastStopTime ?? lastStopTime);
 
                     alwaysGoingForward &= goingForward;
 
                     if (!goingForward)
-                        Logger.Log($"Backwards time occurred ({lastTime:N1} -> {currentTime:N1})");
+                        Logger.Log($"Went too far backwards (last stop: {lastStopTime:N1} current: {currentTime:N1})");
 
-                    lastTime = currentTime;
+                    if (masterClock.LastStopTime != null)
+                        lastStopTime = masterClock.LastStopTime.Value;
                 };
             });
 
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 1c860e9d4b..54ed7ba626 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Play
         ///
         /// In the future I want to change this.
         /// </summary>
-        private double? actualStopTime;
+        internal double? LastStopTime;
 
         [Resolved]
         private MusicController musicController { get; set; } = null!;
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Play
 
         protected override void StopGameplayClock()
         {
-            actualStopTime = GameplayClock.CurrentTime;
+            LastStopTime = GameplayClock.CurrentTime;
 
             if (IsLoaded)
             {
@@ -127,17 +127,17 @@ namespace osu.Game.Screens.Play
         public override void Seek(double time)
         {
             // Safety in case the clock is seeked while stopped.
-            actualStopTime = null;
+            LastStopTime = null;
 
             base.Seek(time);
         }
 
         protected override void PrepareStart()
         {
-            if (actualStopTime != null)
+            if (LastStopTime != null)
             {
-                Seek(actualStopTime.Value);
-                actualStopTime = null;
+                Seek(LastStopTime.Value);
+                LastStopTime = null;
             }
             else
                 base.PrepareStart();

From 8c067dc584066527badb6a9029f5ef31a932bba8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:53:07 +0900
Subject: [PATCH 2100/2100] Fix mod tests not waiting for presets to finish
 loading

See https://github.com/ppy/osu/actions/runs/6692350567/job/18181352850.
---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 3728fb3f21..f0822ce2a8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -799,8 +799,11 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().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));
+        private void waitForColumnLoad() => AddUntilStep("all column content loaded", () =>
+            modSelectOverlay.ChildrenOfType<ModColumn>().Any()
+            && modSelectOverlay.ChildrenOfType<ModColumn>().All(column => column.IsLoaded && column.ItemsLoaded)
+            && modSelectOverlay.ChildrenOfType<ModPresetColumn>().Any()
+            && modSelectOverlay.ChildrenOfType<ModPresetColumn>().All(column => column.IsLoaded));
 
         private void changeRuleset(int id)
         {